mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-23 03: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
345 lines
11 KiB
Objective-C
345 lines
11 KiB
Objective-C
/** GSWTemporaryElement.m - <title>GSWeb: Class GSWTemporaryElement</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"
|
|
|
|
//====================================================================
|
|
@implementation GSWTemporaryElement
|
|
|
|
//--------------------------------------------------------------------
|
|
+(GSWTemporaryElement*)temporaryElement
|
|
{
|
|
return [[[self alloc]init]autorelease];
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
+(GSWTemporaryElement*)temporaryElementOfType:(GSWHTMLRawParserTagType)tagType
|
|
withProperties:(NSDictionary*)properties
|
|
templateInfo:(NSString*)templateInfo
|
|
parent:(GSWTemporaryElement*)parent
|
|
{
|
|
return [[[self alloc]initWithType:tagType
|
|
withProperties:properties
|
|
templateInfo:templateInfo
|
|
parent:parent]autorelease];
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(id)initWithType:(GSWHTMLRawParserTagType)tagType
|
|
withProperties:(NSDictionary*)properties
|
|
templateInfo:(NSString*)templateInfo
|
|
parent:(GSWTemporaryElement*)parent
|
|
{
|
|
if ((self=[self init]))
|
|
{
|
|
_parent=parent;
|
|
ASSIGNCOPY(_properties,properties);
|
|
ASSIGNCOPY(_templateInfo,templateInfo);
|
|
};
|
|
|
|
return self;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)dealloc
|
|
{
|
|
DESTROY(_properties);
|
|
DESTROY(_children);
|
|
DESTROY(_templateInfo);
|
|
[super dealloc];
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(NSString*)description
|
|
{
|
|
return [NSString stringWithFormat:@"<%s %p: properties=%@ parent=%p children count=%d templateInfo=%@>",
|
|
object_getClassName(self),
|
|
(void*)self,
|
|
_properties,
|
|
_parent,
|
|
[_children count],
|
|
_templateInfo];
|
|
};
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
/** adds element to children **/
|
|
-(void)addChildElement:(GSWElement*)element
|
|
{
|
|
|
|
if (!_children)
|
|
_children=[NSMutableArray new];
|
|
[_children addObject:element];
|
|
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Returns parent element **/
|
|
-(GSWTemporaryElement*)parentElement
|
|
{
|
|
return _parent;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Returns template information **/
|
|
-(NSString*)templateInfo
|
|
{
|
|
return _templateInfo;
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Create a GSWElement representing child elements tree
|
|
**/
|
|
-(GSWElement*)template
|
|
{
|
|
GSWElement* template = nil;
|
|
NSMutableArray* elementChildren=nil;
|
|
int childrenCount=0;
|
|
|
|
// Is there children ?
|
|
childrenCount=[_children count];
|
|
if (childrenCount>0)
|
|
{
|
|
// Only one ? So we don't have to make 'complex' processing
|
|
if (childrenCount==1)
|
|
{
|
|
elementChildren=_children;
|
|
}
|
|
else
|
|
{
|
|
// More than one child: try to concatenate BareStrings
|
|
NSMutableString* bareStringText=nil;
|
|
int i=0;
|
|
|
|
for(i=0;i<childrenCount;i++)
|
|
{
|
|
GSWElement* element=[_children objectAtIndex:i];
|
|
if ([element isKindOfClass:[GSWHTMLBareString class]])// Concatenate BareStrings
|
|
{
|
|
if (bareStringText)
|
|
{
|
|
[bareStringText appendString:[(GSWHTMLBareString*)element string]];
|
|
element=nil;
|
|
}
|
|
else if (i+1<childrenCount
|
|
&& [[_children objectAtIndex:i+1] isKindOfClass:[GSWHTMLBareString class]])
|
|
{
|
|
bareStringText=[NSMutableString stringWithString:[(GSWHTMLBareString*)element string]];
|
|
element=nil;
|
|
};
|
|
}
|
|
else
|
|
{
|
|
if([bareStringText length]>0)
|
|
{
|
|
GSWHTMLBareString* bareString = [GSWHTMLBareString elementWithString:bareStringText];
|
|
[bareStringText setString:@""];
|
|
if (!elementChildren)
|
|
elementChildren=(NSMutableArray*)[NSMutableArray array];
|
|
[elementChildren addObject:bareString];
|
|
};
|
|
};
|
|
if (element)
|
|
{
|
|
if (!elementChildren)
|
|
elementChildren=(NSMutableArray*)[NSMutableArray array];
|
|
[elementChildren addObject:element];
|
|
};
|
|
};
|
|
};
|
|
|
|
if ([elementChildren count]==1)
|
|
{
|
|
template=[elementChildren lastObject];
|
|
}
|
|
else
|
|
{
|
|
template=[GSWHTMLStaticGroup elementWithContentElements:elementChildren];
|
|
};
|
|
};
|
|
|
|
return template;
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Return Element Name, taken from properties
|
|
nil if none is found
|
|
**/
|
|
-(NSString*)name
|
|
{
|
|
NSString* name=nil;
|
|
|
|
|
|
name=[_properties objectForKey:@"name"];
|
|
|
|
|
|
return name;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Returns real dynamic element using declarations to find element type
|
|
Raise an exception if element name is not found or if no declaration is
|
|
found for that element
|
|
**/
|
|
-(GSWElement*)dynamicElementWithDeclarations:(NSDictionary*)declarations
|
|
languages:(NSArray*)languages
|
|
{
|
|
GSWElement* element=nil;
|
|
GSWElement* template = nil;
|
|
NSString* name=nil;
|
|
GSWDeclaration* elementDeclaration=nil;
|
|
|
|
// First, get children template
|
|
template = [self template];
|
|
|
|
// Get element name
|
|
name=[self name];
|
|
|
|
if (!name)
|
|
{
|
|
[GSWDeclarationFormatException raise:GSWDFEMissingElementName
|
|
format:@"No element name for dynamic tag %@. %@",
|
|
self,_templateInfo];
|
|
}
|
|
else
|
|
{
|
|
elementDeclaration = [declarations objectForKey:name];
|
|
|
|
if (!elementDeclaration)
|
|
{
|
|
[GSWDeclarationFormatException raise:GSWDFEMissingDeclarationForElement
|
|
format:@"No declaration for element named '%@'. Declarations: %@. %@",
|
|
name,[declarations allKeys],_templateInfo];
|
|
}
|
|
else
|
|
{
|
|
element=[self _elementWithDeclaration:elementDeclaration
|
|
name:name
|
|
properties:_properties
|
|
template:template
|
|
languages:languages];
|
|
};
|
|
};
|
|
|
|
|
|
return element;
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
/** Returns real dynamic element using declaration
|
|
May raise exception if element can't be created
|
|
**/
|
|
-(GSWElement*)_elementWithDeclaration:(GSWDeclaration*)declaration
|
|
name:(NSString*)name
|
|
properties:(NSDictionary*)properties
|
|
template:(GSWElement*)template
|
|
languages:(NSArray*)languages
|
|
{
|
|
GSWElement* element = nil;
|
|
|
|
if (!declaration)
|
|
{
|
|
[GSWDeclarationFormatException raise:GSWDFEMissingDeclarationForElement
|
|
format:@"No declaration for element named '%@'. %@",
|
|
name,_templateInfo];
|
|
}
|
|
else
|
|
{
|
|
Class elementClass = Nil;
|
|
NSString* elementType=[declaration type];
|
|
|
|
if (elementType != nil) {
|
|
elementClass = NSClassFromString(elementType);
|
|
}
|
|
|
|
if ((elementType == nil) || (elementClass == Nil)) //[elementType length]==0
|
|
{
|
|
[GSWDeclarationFormatException raise:GSWDFEMissingClassNameForElement
|
|
format:@"No class name for element named '%@' with declaration: %@. %@",
|
|
name,declaration,_templateInfo];
|
|
}
|
|
else
|
|
{
|
|
NSDictionary* associations = nil;
|
|
|
|
associations=[declaration associations];
|
|
if ([properties count]>0)
|
|
{
|
|
NSEnumerator* _propertiesEnum = [properties keyEnumerator];
|
|
NSMutableDictionary* addedAssoc=nil;
|
|
NSString* key=nil;
|
|
NSString* value=nil;
|
|
while ((key = [_propertiesEnum nextObject]))
|
|
{
|
|
if (![key isEqualToString:@"name"] && ![associations objectForKey:key])
|
|
{
|
|
if (!addedAssoc)
|
|
addedAssoc=(NSMutableDictionary*)[NSMutableDictionary dictionary];
|
|
value=[properties objectForKey:key];
|
|
[addedAssoc setObject:[GSWAssociation associationWithValue:value]
|
|
forKey:key];
|
|
};
|
|
};
|
|
if (addedAssoc)
|
|
{
|
|
associations=[associations dictionaryByAddingEntriesFromDictionary:addedAssoc];
|
|
};
|
|
};
|
|
|
|
// Create element
|
|
element=[GSWApp dynamicElementWithName:elementType
|
|
associations:associations
|
|
template:template
|
|
languages:languages];
|
|
if (element)
|
|
{
|
|
[element setDeclarationName:[declaration name]];
|
|
}
|
|
else
|
|
{
|
|
[GSWDeclarationFormatException raise:GSWDFEElementCreationFailed
|
|
format:@"Can't create element named '%@' with declaration: %@. %@",
|
|
name,declaration,_templateInfo];
|
|
};
|
|
};
|
|
};
|
|
|
|
return element;
|
|
}
|
|
|
|
|
|
@end
|
|
|