diff --git a/GSWeb.framework/GSWDebug.h b/GSWeb.framework/GSWDebug.h index ef84d3c..968116d 100644 --- a/GSWeb.framework/GSWDebug.h +++ b/GSWeb.framework/GSWDebug.h @@ -182,13 +182,13 @@ extern void GSWLogAssertGoodFn(CONST char* file,int line,NSObject* object); NSLog(@"%@",fmt2); }} while (0) #define LOGException(format, args...) \ - do { if (GSDebugSet(@"exception") == YES) { \ + do { /*if (GSDebugSet(@"exception") == YES)*/ { \ NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \ NSString *fmt2 = [NSString stringWithFormat:@"*EXCEPTION*: %@",fmt]; \ NSLog(fmt2, ## args); }} while (0) #define LOGException0(format) \ - do { if (GSDebugSet(@"exception") == YES) { \ + do { /*if (GSDebugSet(@"exception") == YES)*/ { \ NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \ NSString *fmt2 = [NSString stringWithFormat:@"*EXCEPTION*: %@",fmt]; \ NSLog(@"%@",fmt2); }} while (0) diff --git a/GSWeb.framework/GSWElement.m b/GSWeb.framework/GSWElement.m index 82a45b3..6d62bfb 100644 --- a/GSWeb.framework/GSWElement.m +++ b/GSWeb.framework/GSWElement.m @@ -42,20 +42,25 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41; @implementation GSWElement #ifndef NDEBBUG +//-------------------------------------------------------------------- -(void)saveAppendToResponseElementIDInContext:(id)context { - NSString* elementID=nil; - LOGObjectFnStartC("GSWElement"); - elementID=[context elementID]; -/* if ([elementID length]==0) - elementID=@"MARKER";*/ - NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ elementID=%@ %p",self,[self definitionName],elementID,elementID); - ASSIGNCOPY(_appendToResponseElementID,elementID); - NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ _appendToResponseElementID=%@ %p",self,[self definitionName],_appendToResponseElementID,_appendToResponseElementID); - GSWAssertIsElementID(context); - LOGObjectFnStopC("GSWElement"); + if(GSDebugSet(@"saveAppendToResponseElementID")) + { + NSString* elementID=nil; + LOGObjectFnStartC("GSWElement"); + elementID=[context elementID]; + /* if ([elementID length]==0) + elementID=@"MARKER";*/ + NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ elementID=%@ %p",self,[self definitionName],elementID,elementID); + ASSIGNCOPY(_appendToResponseElementID,elementID); + NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ _appendToResponseElementID=%@ %p",self,[self definitionName],_appendToResponseElementID,_appendToResponseElementID); + GSWAssertIsElementID(context); + LOGObjectFnStopC("GSWElement"); + }; }; +//-------------------------------------------------------------------- -(void)assertCorrectElementIDInContext:(id)context method:(SEL)method file:(const char*)file @@ -100,6 +105,7 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41; LOGObjectFnStopC("GSWElement"); }; +//-------------------------------------------------------------------- -(void)assertIsElementIDInContext:(id)context method:(SEL)method file:(const char*)file @@ -127,6 +133,7 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41; LOGObjectFnStopC("GSWElement"); }; +//-------------------------------------------------------------------- -(void)logElementInContext:(id)context method:(SEL)method file:(const char*)file @@ -163,11 +170,13 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41; GSWLogC("End Dealloc GSWElement"); } +//-------------------------------------------------------------------- -(NSString*)definitionName { return _definitionName; }; +//-------------------------------------------------------------------- -(void)setDefinitionName:(NSString*)definitionName { NSDebugMLLog(@"gswdync",@"setDefinitionName1 in %p: %p %@", diff --git a/GSWeb.framework/GSWResourceRequestHandler.m b/GSWeb.framework/GSWResourceRequestHandler.m index 85edf7a..561adee 100644 --- a/GSWeb.framework/GSWResourceRequestHandler.m +++ b/GSWeb.framework/GSWResourceRequestHandler.m @@ -95,8 +95,8 @@ RCS_ID("$Id$") inContext:nil]; else { - LOGSeriousError(@"No data for _key %@", - key); + LOGSeriousError(@"No data for key '%@'", + aKey); //TODO }; LOGObjectFnStop();