diff --git a/ChangeLog b/ChangeLog index 471cab8..cb803e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-11-01 Manuel Guesdon + + * GSWeb.framework/GSWApplication.m: removed a trace + * GSWeb.framework/GSWTemplateParserXML.m: fix XML + properties key case bug + * GSWeb.framework/GSWElementIDString.[hm]: changed + implementation to conform to NSString cluster. + 2000-11-01 Mirko Viviani * GSWeb.framework/GSWApplication.m (GSWApplicationMain): fixed path diff --git a/GSWeb.framework/GSWApplication.m b/GSWeb.framework/GSWApplication.m index 986f8c3..52590a0 100644 --- a/GSWeb.framework/GSWApplication.m +++ b/GSWeb.framework/GSWApplication.m @@ -769,7 +769,6 @@ int GSWApplicationMain(NSString* _applicationClassName, NSString* _path=nil; LOGObjectFnStart(); NSDebugMLLog(@"bundles",@"[GSWResourceManager _applicationGSWBundle]:%@",[GSWResourceManager _applicationGSWBundle]); - GSWLogDumpObject([GSWResourceManager _applicationGSWBundle],2); _path=[[GSWResourceManager _applicationGSWBundle] path]; //return : H:\Wotests\ObjCTest3 NSDebugMLLog(@"low",@"_path:%@",_path); LOGObjectFnStop(); diff --git a/GSWeb.framework/GSWElementIDString.h b/GSWeb.framework/GSWElementIDString.h index a9e749e..d13b68e 100644 --- a/GSWeb.framework/GSWElementIDString.h +++ b/GSWeb.framework/GSWElementIDString.h @@ -26,13 +26,16 @@ #ifndef _GSWElementIDString_h__ #define _GSWElementIDString_h__ - +/* //==================================================================== @interface GSWElementIDString : NSMutableString @end - +*/ //==================================================================== +/* @interface GSWElementIDString (GSWElementIDStringGSW) +*/ +@interface NSMutableString (GSWElementIDStringGSW) -(void)deleteAllElementIDComponents; -(void)deleteLastElementIDComponent; -(void)incrementLastElementIDComponent; @@ -44,6 +47,8 @@ #endif @end +#define GSWElementIDString NSMutableString + #endif //_GSWElementIDString_h__ diff --git a/GSWeb.framework/GSWElementIDString.m b/GSWeb.framework/GSWElementIDString.m index d57f9e3..79f4799 100644 --- a/GSWeb.framework/GSWElementIDString.m +++ b/GSWeb.framework/GSWElementIDString.m @@ -25,9 +25,10 @@ static char rcsId[] = "$Id$"; #include +#undef GSWElementIDString +/* //==================================================================== @implementation GSWElementIDString - //-------------------------------------------------------------------- -(id)copyWithZone:(NSZone*)zone { @@ -39,10 +40,11 @@ static char rcsId[] = "$Id$"; { return [[[self class] allocWithZone: zone] initWithString: self]; }; -@end +@end +*/ //==================================================================== -@implementation GSWElementIDString (GSWElementIDStringGSW) +@implementation NSMutableString (GSWElementIDStringGSW) //-------------------------------------------------------------------- -(void)deleteAllElementIDComponents diff --git a/GSWeb.framework/GSWTemplateParserXML.m b/GSWeb.framework/GSWTemplateParserXML.m index bf2417b..ee1a940 100644 --- a/GSWeb.framework/GSWTemplateParserXML.m +++ b/GSWeb.framework/GSWTemplateParserXML.m @@ -643,7 +643,7 @@ text [Type:XML_TEXT_NODE] [{}] #### }; //if (currentNode->type==XML_ELEMENT_NODE) { - nodeAttributes=[currentNode propertiesAsDictionary]; + nodeAttributes=[currentNode propertiesAsDictionaryWithKeyTransformationSel:@selector(lowercaseString)]; nodeNameAttribute=[nodeAttributes objectForKey:@"name"]; NSDebugMLog(@"node=%p nodeAttributes=%@",currentNode,nodeAttributes); NSDebugMLog(@"node=%p nodeNameAttribute=%@",currentNode,nodeNameAttribute);