mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-25 04:31:16 +00:00
* GSWExtensionsGSW.framework/GSWLogin.m removed logs * GSWExtensionsGSW.framework/GNUmakefile added ADDITIONAL_OBJCFLAGS = -Werror-implicit-function-declaration * GSWExtensionsGSW.framework/GSWCacheElement.m removed logs, use object_getClassName * GSWExtensionsGSW.framework/GSWValidationFailureComponent.m * GSWExtensionsGSW.framework/GSWTabComponent.m * GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m * GSWExtensionsGSW.framework/GSWSimpleFormComponent.m * GSWeb.framework/GSWApplication.m removed logs, _validateAPI ClassIsKindOfClass -> GSObjCIsKindOf * GSWeb.framework/GSWAction.m include <GNUstepBase/NSObject+GNUstepBase.h> removed logs and unused (commented) code * GSWeb.framework/GSWResourceManager.h removed _validateAPI * GSWeb.framework/GSWImageButton.m added #include <GNUstepBase/NSObject+GNUstepBase.h> removed logs and unused (commented) code * GSWeb.framework/NSString+HTML.h changed int to NSUInteger / NSInteger * GSWeb.framework/GSWResourceManager.m removed logs, _validateAPI * GSWeb.framework/GSWContext.m LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWRequestHandler.m include <GNUstepBase/NSObject+GNUstepBase.h> LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/NSString+HTML.m include <GNUstepBase/NSString+GNUstepBase.h> changed int to NSUInteger use memmove in GSWMemMove macro disabled testStringByConvertingHTML removed logs fixed warnings * GSWeb.framework/GSWMultiKeyDictionary.m removed logs * GSWeb.framework/GSWVBScript.m removed logs * GSWeb.framework/NSNonBlockingFileHandle.m removed logs * GSWeb.framework/GSWStatisticsStore.h removed useless @interface / @end for the same class * GSWeb.framework/GSWLifebeatThread.m removed include <GNUstepBase/GSCategories.h> removed logs * GSWeb.framework/GSWStatisticsStore.m removed logs include <GNUstepBase/NSObject+GNUstepBase.h> include <GNUstepBase/NSString+GNUstepBase.h> implement _purgePathsStatistics, _updatePathsStatisticsWithPaths removed useless @implementation / @end for the same class * GSWeb.framework/GSWCookie.m removed logs * GSWeb.framework/GNUmakefile added ADDITIONAL_OBJCFLAGS = -Werror-implicit-function-declaration * GSWeb.framework/GSWRecording.m removed logs * GSWeb.framework/GSWToggle.m removed logs * GSWeb.framework/GSWMessage.m include <GNUstepBase/NSObject+GNUstepBase.h> globalDefaultEncoding = [NSString defaultCStringEncoding]; (see http://wiki.gnustep.org/index.php/GSWebFAQ ) use NSUInteger for index LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWDefaultAdaptor.m include <GNUstepBase/NSObject+GNUstepBase.h> LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWJavaScript.m * GSWeb.framework/GSWClientSideScript.m removed logs * GSWeb.framework/GSWNestedList.m removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWEmbeddedObject.m LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWRequest.h removed _validateAPI * GSWeb.framework/GSWRequest.m add includes removed _validateAPI removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWUtils.h unsigned int -> NSUInteger * GSWeb.framework/Resources/languages.plist added languages * GSWeb.framework/GSWUtils.m add includes unsigned int -> NSUInteger removed logs * GSWeb.framework/GSWComponentReference.m removed logs * GSWeb.framework/GSWGeometricRegion.m add includes removed logs * GSWeb.framework/GSWKeyValueAssociation.m add includes removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWHiddenField.m removed logs * GSWeb.framework/GSWParam.m add includes removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/NSString+Trimming.h * GSWeb.framework/NSString+Trimming.m removed longValue, ulongValue, longLongValue; removed logs * GSWeb.framework/GSWStaticResourceRequestHandler.m removed logs * GSWeb.framework/GSWURLValuedElementData.m removed logs * GSWeb.framework/GSWDirectAction.m takeValue -> setValue removed logs int -> NSUInteger * GSWeb.framework/GSWComponentDefinition.m add includes removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWAssociation.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs * GSWeb.framework/GSWSession.h * GSWeb.framework/GSWSession.m unsigned int-> NSUInteger add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs David Ayers: pls check sleepInContext! removed _validateAPI, __setContextCounterIncrementingEnabled, __counterIncrementingEnabledFlag * GSWeb.framework/GSWFileUpload.m removed logs * GSWeb.framework/GSWApplet.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWGenericElement.m removed logs GSWeb.framework/GSWTemplateParser.m add includes * GSWeb.framework/GSWTemporaryElement.m removed logs * GSWeb.framework/GSWResponse.m add include removed docStructure checks removed logs * GSWeb.framework/GSWProjectBundle.m add include LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs * GSWeb.framework/GSWWorkerThread.m added - drain removed NSLog * GSWeb.framework/GSWApplication+Defaults.m add include LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs * GSWeb.framework/GSWActiveImage.m * GSWeb.framework/GSWDirectActionRequestHandler.m * GSWeb.framework/GSWConstantValueAssociation.m * GSWeb.framework/NSData+Compress.m removed logs * GSWeb.framework/GSWHTMLStaticElement.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs * GSWeb.framework/GSWServerSessionStore.m removed logs * GSWeb.framework/GSWAdaptor.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWDeployedBundle.m removed logs add includes * GSWeb.framework/GSWSubmitButton.m removed logs * GSWeb.framework/GSWDeclarationParser.m add includes removed logs * GSWeb.framework/GSWBundle.m add includes removed logs clearCache * GSWeb.framework/GSWWOCompatibility.h fixed typo in WOMessage * GSWeb.framework/GSWSessionTimeOut.m removed logs * GSWeb.framework/GSWPopUpButton.m add includes * GSWeb.framework/GSWComponent.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWHTTPIO.m add include * GSWeb.framework/GSWBindingNameAssociation.m takeValue -> setValue * GSWeb.framework/GSWHTMLTemplateParser.m removed logs * GSWeb.framework/GSWResetButton.m removed logs * GSWeb.framework/GSWDebug.h/m disabled log funtions * GSWeb.framework/GSWActionRequestHandler.m add includes removed logs * GSWeb.framework/GSWSwitchComponent.m * GSWeb.framework/GSWSessionTimeOutManager.m removed logs * GSWeb.framework/GSWMailDelivery.m add includes removed logs * GSWeb.framework/GSWDynamicURLString.h * GSWeb.framework/GSWDynamicURLString.m unsigned int -> NSUInteger removed checkURL add includes * GSWeb.framework/GSWProcFS.m removed logs * GSWeb.framework/GSWApplication.h removed _validateAPI * GSWeb.framework/GSWResourceRequestHandler.m add include removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWSessionStore.h removed _validateAPI * GSWeb.framework/GSWSessionStore.m add include removed _validateAPI removed logs * GSWExtensions.framework/GSWLongResponsePage.m * GSWExtensions.framework/GSWExceptionPage.m * GSWExtensions.framework/GSWMetaRefresh.m * GSWExtensions.framework/GSWCollapsibleComponentContent.m removed logs * GSWExtensions.framework/GNUmakefile added ADDITIONAL_OBJCFLAGS = -Werror-implicit-function-declaration * GSWExtensions.framework/GSWStatsPage.m removed logs unsigned int -> NSUInteger * Examples/hello/HelloPage.wo/HelloPage.html * Examples/hello/Main.wo/Main.html * Examples/hello/Hello.m convert to UTF8 The change of LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; will show where we need to implement functionality. Please send bug reports! -- dw git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30584 72102866-910b-0410-8b05-ffd578937521
242 lines
7 KiB
Objective-C
242 lines
7 KiB
Objective-C
/** GSWHTMLTemplateParser.m - <title>GSWeb: Class GSWHTMLTemplateParser</title>
|
|
|
|
Copyright (C) 2004 Free Software Foundation, Inc.
|
|
|
|
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
|
Date: Mar 2004
|
|
|
|
$Revision$
|
|
$Date$
|
|
$Id$
|
|
|
|
<abstract></abstract>
|
|
|
|
This file is part of the GNUstep Web Library.
|
|
|
|
<license>
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
</license>
|
|
**/
|
|
|
|
#include "config.h"
|
|
|
|
RCS_ID("$Id$")
|
|
|
|
#include "GSWeb.h"
|
|
#include "GSWHTMLRawParser.h"
|
|
|
|
//====================================================================
|
|
@implementation GSWHTMLTemplateParser
|
|
|
|
//--------------------------------------------------------------------
|
|
-(id)init
|
|
{
|
|
if ((self=[super init]))
|
|
{
|
|
NSDebugMLog(@"_currentElement=%@",_currentElement);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
-(GSWElement*)parseHTML
|
|
{
|
|
GSWElement* template=nil;
|
|
|
|
if ([_string length])
|
|
{
|
|
GSWHTMLRawParser* htmlRawParser = [GSWHTMLRawParser parserWithDelegate:self
|
|
htmlString:_string];
|
|
|
|
NS_DURING
|
|
{
|
|
[htmlRawParser parseHTML];
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
[[[localException class]
|
|
exceptionWithName:[localException name]
|
|
reason:[NSString stringWithFormat:@"In template named %@: %@",
|
|
_templateName,[localException reason]]
|
|
userInfo:[localException userInfo]]raise];
|
|
}
|
|
NS_ENDHANDLER;
|
|
|
|
if ([_currentElement parentElement])
|
|
{
|
|
[NSException raise:NSInvalidArgumentException
|
|
format:@"In template named %@: Missing dynamic tag end after reaching end of template. Tag name is '%@'. templateInfo: %@",
|
|
_templateName,[_currentElement name],[_currentElement templateInfo]];
|
|
}
|
|
else
|
|
template=[_currentElement template];
|
|
};
|
|
|
|
return template;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(GSWElement*)parse
|
|
{
|
|
GSWElement* template=nil;
|
|
|
|
[self parseDeclarations];
|
|
_currentElement = [GSWTemporaryElement temporaryElement];
|
|
template=[self parseHTML];
|
|
|
|
// If we've found error raise exception
|
|
NSDebugMLog(@"_errorMessages=%@",_errorMessages);
|
|
if ([[self errorMessages]count]>0)
|
|
{
|
|
NSDebugMLog(@"declarationsFilePath=%@",_declarationsFilePath);
|
|
NSDebugMLog(@"errorMessages=%@",[self errorMessages]);
|
|
ExceptionRaise(@"GSWHTMLTemplateParser",@"%@\nDefinitionFiles: %@",
|
|
[self errorMessagesAsText],
|
|
_processedDeclarationsFilePaths);
|
|
};
|
|
|
|
return template;
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
//TEMP should be removed later
|
|
-(GSWElement*)template
|
|
{
|
|
return [self parse];
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Called by parser when it has parsed raw text
|
|
Creates a GSWHTMLBareString element with the text
|
|
**/
|
|
-(void)parser:(GSWBaseParser*)parser
|
|
didParseText:(NSString*)text
|
|
{
|
|
GSWHTMLBareString* element=nil;
|
|
|
|
element = [GSWHTMLBareString elementWithString:text];
|
|
|
|
[_currentElement addChildElement:element];
|
|
|
|
}
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Called by parser when it has opened a dynamic tag
|
|
Creates a GSWTemporaryElement element, waiting for tag end
|
|
**/
|
|
-(void) parser:(GSWBaseParser*)parser
|
|
didParseOpeningDynamicTagOfType:(GSWHTMLRawParserTagType)tagType
|
|
withProperties:(NSDictionary*)tagProperties
|
|
templateInfo:(NSString*)templateInfo
|
|
{
|
|
_currentElement = [GSWTemporaryElement temporaryElementOfType:tagType
|
|
withProperties:tagProperties
|
|
templateInfo:templateInfo
|
|
parent:_currentElement];
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Called by parser when it has closed a dynamic tag
|
|
Creates a dynamic element from current temporary element element
|
|
**/
|
|
|
|
// templateInfo: (line: 5 column: 31)
|
|
|
|
-(void) parser:(GSWBaseParser*)parser
|
|
didParseClosingDynamicTagOfType:(GSWHTMLRawParserTagType)tagType
|
|
withTemplateInfo:(NSString*)templateInfo
|
|
{
|
|
GSWTemporaryElement* parent=nil;
|
|
|
|
parent=[_currentElement parentElement];
|
|
|
|
if(!parent)
|
|
{
|
|
[NSException raise:NSInvalidArgumentException
|
|
format:@"Unmatched dynamic tag end. %@.",
|
|
templateInfo];
|
|
}
|
|
else
|
|
{
|
|
NS_DURING
|
|
{
|
|
GSWElement* element = nil;
|
|
element = [_currentElement dynamicElementWithDeclarations:_declarations
|
|
languages:_languages];
|
|
NSDebugMLog(@"element=%@",element);
|
|
|
|
NSAssert2(element,@"No element for %@ with declarations %@",_currentElement,_declarations);
|
|
|
|
[parent addChildElement:element];
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
NSDebugMLog(@"Exception: %@",localException);
|
|
if ([localException isKindOfClass:[GSWDeclarationFormatException class]]
|
|
&& [(GSWDeclarationFormatException*)localException canDelay])
|
|
{
|
|
[self addErrorMessageFormat:@"In template named %@: %@",
|
|
_templateName,[localException description]];
|
|
}
|
|
else
|
|
{
|
|
[[[localException class]
|
|
exceptionWithName:[localException name]
|
|
reason:[NSString stringWithFormat:@"In template named %@: %@",
|
|
_templateName,[localException reason]]
|
|
userInfo:[localException userInfo]]raise];
|
|
};
|
|
}
|
|
NS_ENDHANDLER;
|
|
|
|
_currentElement = parent;
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Called by parser when it has parsed a comment
|
|
Creates a GSWHTMLComment with the comment text
|
|
**/
|
|
-(void) parser:(GSWBaseParser*)parser
|
|
didParseComment:(NSString*)text
|
|
{
|
|
GSWHTMLComment* element=nil;
|
|
|
|
element = [GSWHTMLComment elementWithString:text];
|
|
|
|
[_currentElement addChildElement:element];
|
|
|
|
}
|
|
|
|
// those are here because a protocol forces us to implement them -- dw
|
|
|
|
- (id) retain
|
|
{
|
|
return [super retain];
|
|
}
|
|
|
|
- (oneway void)release
|
|
{
|
|
return [super release];
|
|
}
|
|
|
|
- (id)autorelease
|
|
{
|
|
return [super autorelease];
|
|
}
|
|
|
|
@end
|
|
|