2000-02-13 Manuel Guesdon <mguesdon@sbuilders.com>

* GSWStatisticsStore.m: added comment
	* GSWSubmitButton.m: added log and assert
	* GSWImageButton.m: added log and assert
	* GSWHyperlink.m: added log and assert
	* GSWHTMLStaticElement.m: added log and assert
	* GSWForm.m: added log and assert
	* GSWElement.m: added log and assert
	* GSWConditional.m: added log and assert
	* GSWComponentReference.m: added log and assert
	* GSWComponent.m: added log and assert
	* GSWElement.m: added log and assert
	* GSWElement.h: added debug ivar
	* GSWTextField.m: added log and assert
	* GSWInput.m: added log and assert
	* GSWelementIDString.h/.m: added
		-parentElementIDString
		-copyWithZone:
		-mutableCopyWithZone:


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@6019 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon 2000-02-14 10:57:55 +00:00
parent 9cf4fa4d66
commit 65baa80766
20 changed files with 193 additions and 25 deletions

View file

@ -25,7 +25,6 @@ static char rcsId[] = "$Id$";
#include <gsweb/GSWeb.framework/GSWeb.h> #include <gsweb/GSWeb.framework/GSWeb.h>
//==================================================================== //====================================================================
@implementation GSWComponent @implementation GSWComponent
@ -929,6 +928,7 @@ associationsKeys:(NSArray*)_associationsKeys
#endif #endif
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswcomponents",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswcomponents",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWSaveAppendToResponseElementID(context_);//Debug Only
_template=[self _template]; _template=[self _template];
[response_ appendContentString:[NSString stringWithFormat:@"\n<!-- Start %@ -->\n",[self _templateName]]];//TODO enlever [response_ appendContentString:[NSString stringWithFormat:@"\n<!-- Start %@ -->\n",[self _templateName]]];//TODO enlever
@ -967,6 +967,7 @@ associationsKeys:(NSArray*)_associationsKeys
NSDebugMLLog(@"gswcomponents",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswcomponents",@"ET=%@ id=%@",[self class],[context_ elementID]);
NS_DURING NS_DURING
{ {
GSWAssertCorrectElementID(context_);// Debug Only
_template=[self _template]; _template=[self _template];
[context_ appendZeroElementIDComponent]; [context_ appendZeroElementIDComponent];
element=[[self _template] invokeActionForRequest:request_ element=[[self _template] invokeActionForRequest:request_
@ -991,6 +992,13 @@ associationsKeys:(NSArray*)_associationsKeys
}; };
#endif #endif
if (![context_ _wasActionInvoked] && [[[context_ elementID] parentElementIDString] compare:[context_ senderID]]==NSOrderedDescending)
{
LOGError(@"Action not invoked at the end of %@ (id=%@) senderId=%@",
[self class],
[context_ elementID],
[context_ senderID]);
};
LOGObjectFnStop(); LOGObjectFnStop();
return element; return element;
}; };
@ -1008,6 +1016,8 @@ associationsKeys:(NSArray*)_associationsKeys
GSWElementIDString* debugElementID=[context_ elementID]; GSWElementIDString* debugElementID=[context_ elementID];
#endif #endif
LOGObjectFnStart(); LOGObjectFnStart();
GSWAssertCorrectElementID(context_);// Debug Only
#if !GSWEB_STRICT #if !GSWEB_STRICT
[validationFailureMessages removeAllObjects]; [validationFailureMessages removeAllObjects];
#endif #endif

View file

@ -202,6 +202,7 @@ static char rcsId[] = "$Id$";
#endif #endif
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWSaveAppendToResponseElementID(context_);//Debug Only
_componentPrev=[context_ component]; _componentPrev=[context_ component];
[self pushRefComponentInContext:context_]; [self pushRefComponentInContext:context_];
if ([context_ component]) if ([context_ component])
@ -232,18 +233,13 @@ static char rcsId[] = "$Id$";
int elementsNb=[(GSWElementIDString*)[context_ elementID]elementsNb]; int elementsNb=[(GSWElementIDString*)[context_ elementID]elementsNb];
#endif #endif
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@",[self class],[context_ elementID],[context_ senderID]);
_componentPrev=[context_ component]; _componentPrev=[context_ component];
GSWAssertCorrectElementID(context_);// Debug Only
[self pushRefComponentInContext:context_]; [self pushRefComponentInContext:context_];
if ([context_ component]) if ([context_ component])
{ {
NSString* _senderID=nil; if ([self prefixMatchSenderIDInContext:context_]) //Avoid trying to find action if we are not the good component
NSString* _elementID=nil;
_senderID=[context_ senderID];
_elementID=[context_ elementID];
NSDebugMLLog(@"gswdync",@"_senderID=%@",_senderID);
NSDebugMLLog(@"gswdync",@"_elementID=%@",_elementID);
if ([_senderID hasPrefix:_elementID]) //Avoid trying to find action if we are not the good component
{ {
_component=[context_ component]; _component=[context_ component];
_element=[_component invokeActionForRequest:request_ _element=[_component invokeActionForRequest:request_
@ -273,6 +269,7 @@ static char rcsId[] = "$Id$";
#endif #endif
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWAssertCorrectElementID(context_);// Debug Only
_componentPrev=[context_ component]; _componentPrev=[context_ component];
[self pushRefComponentInContext:context_]; [self pushRefComponentInContext:context_];
if ([context_ component]) if ([context_ component])

View file

@ -25,7 +25,6 @@ static char rcsId[] = "$Id$";
#include <gsweb/GSWeb.framework/GSWeb.h> #include <gsweb/GSWeb.framework/GSWeb.h>
//==================================================================== //====================================================================
@implementation GSWConditional @implementation GSWConditional
@ -95,6 +94,7 @@ static char rcsId[] = "$Id$";
BOOL _doIt=NO; BOOL _doIt=NO;
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWAssertCorrectElementID(context_);// Debug Only
_condition=[self evaluateCondition:condition _condition=[self evaluateCondition:condition
inContext:context_]; inContext:context_];
_negate=[self evaluateCondition:negate _negate=[self evaluateCondition:negate
@ -126,7 +126,8 @@ static char rcsId[] = "$Id$";
BOOL _negate=NO; BOOL _negate=NO;
BOOL _doIt=NO; BOOL _doIt=NO;
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@",[self class],[context_ elementID],[context_ senderID]);
GSWAssertCorrectElementID(context_);// Debug Only
_condition=[self evaluateCondition:condition _condition=[self evaluateCondition:condition
inContext:context_]; inContext:context_];
_negate=[self evaluateCondition:negate _negate=[self evaluateCondition:negate
@ -161,6 +162,7 @@ static char rcsId[] = "$Id$";
BOOL _doIt=NO; BOOL _doIt=NO;
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWSaveAppendToResponseElementID(context_);//Debug Only
_condition=[self evaluateCondition:condition _condition=[self evaluateCondition:condition
inContext:context_]; inContext:context_];
NSDebugMLLog(@"gswdync",@"_condition=%s",_condition ? "YES" : "NO"); NSDebugMLLog(@"gswdync",@"_condition=%s",_condition ? "YES" : "NO");

View file

@ -31,11 +31,34 @@ extern BYTE ElementsMap_gswebElement;
extern BYTE ElementsMap_dynamicElement; extern BYTE ElementsMap_dynamicElement;
extern BYTE ElementsMap_attributeElement; extern BYTE ElementsMap_attributeElement;
//==================================================================== //====================================================================
@interface GSWElement : NSObject @interface GSWElement : NSObject
#ifndef NDEBBUG
{
NSString* _appendToResponseElementID;
};
#endif
#ifndef NDEBBUG
-(void)saveAppendToResponseElementIDInContext:(id)context_;
-(void)assertCorrectElementIDInContext:(id)context_
inCLass:(Class)class_
method:(SEL)method_
file:(const char*)file_
line:(int)line_;
#endif
@end @end
#ifdef NDEBBUG
#define GSWSaveAppendToResponseElementID(context_); {};
#define GSWAssertCorrectElementID(context_); {};
#else
#define GSWSaveAppendToResponseElementID(context_); [self saveAppendToResponseElementIDInContext:context_];
#define GSWAssertCorrectElementID(context_); ([self assertCorrectElementIDInContext:context_ inCLass:[self class] method:_cmd file:__FILE__ line:__LINE__]);
#endif
//==================================================================== //====================================================================
@interface GSWElement (GSWRequestHandling) @interface GSWElement (GSWRequestHandling)
@ -47,6 +70,7 @@ extern BYTE ElementsMap_attributeElement;
-(void)takeValuesFromRequest:(GSWRequest*)request_ -(void)takeValuesFromRequest:(GSWRequest*)request_
inContext:(GSWContext*)context_; inContext:(GSWContext*)context_;
-(BOOL)prefixMatchSenderIDInContext:(GSWContext*)context_;
@end @end
#endif //_GSWElement_h__ #endif //_GSWElement_h__

View file

@ -33,6 +33,45 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
//==================================================================== //====================================================================
@implementation GSWElement @implementation GSWElement
#ifndef NDEBBUG
-(void)saveAppendToResponseElementIDInContext:(id)context_
{
NSString* _elementID=[context_ elementID];
ASSIGN(_appendToResponseElementID,_elementID);
};
-(void)assertCorrectElementIDInContext:(id)context_
inCLass:(Class)class_
method:(SEL)method_
file:(const char*)file_
line:(int)line_
{
if ([_appendToResponseElementID length]>0)
{
NSString* _elementID=[context_ elementID];
BOOL _appendToResponseElementIDIsFirst=NO;
BOOL _elementIDIsFirst=NO;
BOOL _OK=YES;
_appendToResponseElementIDIsFirst=[_appendToResponseElementID length]==0 || [_appendToResponseElementID isEqualToString:@"0"];
_elementIDIsFirst=[_elementID length]==0 || [_elementID isEqualToString:@"0"];
if (_appendToResponseElementIDIsFirst!=_elementIDIsFirst)
{
_OK=[_appendToResponseElementID isEqualToString:_elementID];
};
if (!_OK)
{
NSString* _msg=[NSString stringWithFormat:@"In Class %@ (file %s line %d), id %@ in %@ is not the same than in appendToResponse %@",
NSStringFromClass(class_),
file_,
line_,
[context_ elementID],
NSStringFromSelector(method_),
_appendToResponseElementID];
NSAssert1(_OK,@"%@",_msg);
};
};
};
#endif
@end @end
//==================================================================== //====================================================================
@ -44,6 +83,7 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
-(void)takeValuesFromRequest:(GSWRequest*)request_ -(void)takeValuesFromRequest:(GSWRequest*)request_
inContext:(GSWContext*)context_ inContext:(GSWContext*)context_
{ {
GSWAssertCorrectElementID(context_);// Debug Only
//Does Nothing //Does Nothing
}; };
@ -53,6 +93,8 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
-(GSWElement*)invokeActionForRequest:(GSWRequest*)request_ -(GSWElement*)invokeActionForRequest:(GSWRequest*)request_
inContext:(GSWContext*)context_ inContext:(GSWContext*)context_
{ {
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@",[self class],[context_ elementID],[context_ senderID]);
GSWAssertCorrectElementID(context_);// Debug Only
//Does Nothing //Does Nothing
return nil; return nil;
}; };
@ -63,9 +105,21 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
-(void)appendToResponse:(GSWResponse*)response_ -(void)appendToResponse:(GSWResponse*)response_
inContext:(GSWContext*)context_ inContext:(GSWContext*)context_
{ {
GSWSaveAppendToResponseElementID(context_);//Debug Only
//Does Nothing //Does Nothing
}; };
//--------------------------------------------------------------------
//NDFN
-(BOOL)prefixMatchSenderIDInContext:(GSWContext*)context_
{
NSString* _senderID=[context_ senderID];
NSString* _elementID=[context_ elementID];
NSDebugMLLog(@"gswdync",@"_senderID=%@",_senderID);
NSDebugMLLog(@"gswdync",@"_elementID=%@",_elementID);
return ([_elementID hasPrefix:_senderID] || [_senderID hasPrefix:_elementID]);
};
@end @end

View file

@ -38,6 +38,7 @@
-(void)incrementLastElementIDComponent; -(void)incrementLastElementIDComponent;
-(void)appendZeroElementIDComponent; -(void)appendZeroElementIDComponent;
-(void)appendElementIDComponent:(id)_element; -(void)appendElementIDComponent:(id)_element;
-(NSString*)parentElementIDString;//NDFN
#ifndef NDEBBUG #ifndef NDEBBUG
-(int)elementsNb; -(int)elementsNb;
#endif #endif

View file

@ -27,6 +27,18 @@ static char rcsId[] = "$Id$";
//==================================================================== //====================================================================
@implementation GSWElementIDString @implementation GSWElementIDString
//--------------------------------------------------------------------
-(id)copyWithZone:(NSZone*)zone
{
return [self mutableCopyWithZone:zone];
};
//--------------------------------------------------------------------
-(id)mutableCopyWithZone:(NSZone*)zone
{
return [[[self class] allocWithZone: zone] initWithString: self];
};
@end @end
//==================================================================== //====================================================================
@ -118,6 +130,15 @@ static char rcsId[] = "$Id$";
LOGObjectFnStop(); LOGObjectFnStop();
}; };
//--------------------------------------------------------------------
//NDFN
-(NSString*)parentElementIDString
{
GSWElementIDString* _id=[[self copy] autorelease];
if ([self length]>0)
[_id deleteLastElementIDComponent];
return _id;
};
//-------------------------------------------------------------------- //--------------------------------------------------------------------
#ifndef NDEBBUG #ifndef NDEBBUG
-(int)elementsNb -(int)elementsNb

View file

@ -81,7 +81,7 @@ static char rcsId[] = "$Id$";
//-------------------------------------------------------------------- //--------------------------------------------------------------------
-(void)appendToResponse:(GSWResponse*)response_ -(void)appendToResponse:(GSWResponse*)response_
inContext:(GSWContext*)context_ inContext:(GSWContext*)context_
{ {
[super appendToResponse:response_ [super appendToResponse:response_
inContext:context_]; inContext:context_];
@ -91,6 +91,7 @@ static char rcsId[] = "$Id$";
-(GSWElement*)invokeActionForRequest:(GSWRequest*)request_ -(GSWElement*)invokeActionForRequest:(GSWRequest*)request_
inContext:(GSWContext*)context_ inContext:(GSWContext*)context_
{ {
GSWAssertCorrectElementID(context_);// Debug Only
//Bypass GSWInput //Bypass GSWInput
return nil; return nil;
}; };
@ -102,6 +103,7 @@ static char rcsId[] = "$Id$";
//OK //OK
BOOL _disabled=NO; BOOL _disabled=NO;
LOGObjectFnStartC("GSWFileUpload"); LOGObjectFnStartC("GSWFileUpload");
GSWAssertCorrectElementID(context_);// Debug Only
_disabled=[self disabledInContext:context_]; _disabled=[self disabledInContext:context_];
if (!_disabled) if (!_disabled)
{ {

View file

@ -203,6 +203,9 @@ static char rcsId[] = "$Id$";
#endif #endif
LOGObjectFnStartC("GSWForm"); LOGObjectFnStartC("GSWForm");
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWSaveAppendToResponseElementID(context_);//Debug Only
#if !GSWEB_STRICT #if !GSWEB_STRICT
_disabledInContext=[self disabledInContext:context_]; _disabledInContext=[self disabledInContext:context_];
[context_ setInForm:!_disabledInContext]; [context_ setInForm:!_disabledInContext];
@ -242,14 +245,20 @@ static char rcsId[] = "$Id$";
BOOL _multipleSubmit=NO; BOOL _multipleSubmit=NO;
int i=0; int i=0;
LOGObjectFnStartC("GSWForm"); LOGObjectFnStartC("GSWForm");
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@",[self class],[context_ elementID],[context_ senderID]);
NS_DURING NS_DURING
{ {
GSWAssertCorrectElementID(context_);// Debug Only
_senderID=[context_ senderID]; _senderID=[context_ senderID];
_elementID=[context_ elementID]; _elementID=[context_ elementID];
if ([_senderID hasPrefix:_elementID]) //Avoid trying to find action if we are not the good form if ([self prefixMatchSenderIDInContext:context_]) //Avoid trying to find action if we are not the good component
{ {
_isFormSubmited=[_elementID isEqualToString:_senderID]; _isFormSubmited=[_elementID isEqualToString:_senderID];
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@ _isFormSubmited=%s",
[self class],
[context_ elementID],
[context_ senderID],
(_isFormSubmited ? "YES" : "NO"));
#if !GSWEB_STRICT #if !GSWEB_STRICT
if (_isFormSubmited && [self disabledInContext:context_]) if (_isFormSubmited && [self disabledInContext:context_])
_isFormSubmited=NO; _isFormSubmited=NO;
@ -260,6 +269,11 @@ static char rcsId[] = "$Id$";
[context_ _setFormSubmitted:YES]; [context_ _setFormSubmitted:YES];
_multipleSubmit=[self evaluateCondition:multipleSubmit _multipleSubmit=[self evaluateCondition:multipleSubmit
inContext:context_]; inContext:context_];
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@ _multipleSubmit=%s",
[self class],
[context_ elementID],
[context_ senderID],
(_multipleSubmit ? "YES" : "NO"));
[context_ _setIsMultipleSubmitForm:_multipleSubmit]; [context_ _setIsMultipleSubmitForm:_multipleSubmit];
}; };
[context_ appendZeroElementIDComponent]; [context_ appendZeroElementIDComponent];
@ -276,6 +290,10 @@ static char rcsId[] = "$Id$";
if ([context_ _wasActionInvoked]) if ([context_ _wasActionInvoked])
{ {
[context_ _setIsMultipleSubmitForm:NO]; [context_ _setIsMultipleSubmitForm:NO];
}
else
{
NSDebugMLLog0(@"gswdync",@"formSubmitted but no action was invoked!");
}; };
[context_ setInForm:NO]; [context_ setInForm:NO];
[context_ _setFormSubmitted:NO]; [context_ _setFormSubmitted:NO];
@ -296,6 +314,13 @@ static char rcsId[] = "$Id$";
[localException raise]; [localException raise];
} }
NS_ENDHANDLER; NS_ENDHANDLER;
if (![context_ _wasActionInvoked] && [[context_ elementID] compare:[context_ senderID]]!=NSOrderedAscending)
{
LOGError(@"Action not invoked at the end of %@ (id=%@) senderId=%@",
[self class],
[context_ elementID],
[context_ senderID]);
};
LOGObjectFnStopC("GSWForm"); LOGObjectFnStopC("GSWForm");
return _element; return _element;
}; };
@ -314,11 +339,12 @@ static char rcsId[] = "$Id$";
#endif #endif
LOGObjectFnStartC("GSWForm"); LOGObjectFnStartC("GSWForm");
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWAssertCorrectElementID(context_);// Debug Only
_senderID=[context_ senderID]; _senderID=[context_ senderID];
_elementID=[context_ elementID]; _elementID=[context_ elementID];
NSDebugMLLog(@"gswdync",@"_senderID=%@",_senderID); NSDebugMLLog(@"gswdync",@"_senderID=%@",_senderID);
NSDebugMLLog(@"gswdync",@"_elementID=%@",_elementID); NSDebugMLLog(@"gswdync",@"_elementID=%@",_elementID);
if ([_senderID hasPrefix:_elementID]) //Avoid taking values if we are not the good form if ([self prefixMatchSenderIDInContext:context_]) //Avoid taking values if we are not the good form
{ {
_isFormSubmited=[_elementID isEqualToString:_senderID]; _isFormSubmited=[_elementID isEqualToString:_senderID];
NSDebugMLLog(@"gswdync",@"_isFormSubmited=%d",(int)_isFormSubmited); NSDebugMLLog(@"gswdync",@"_isFormSubmited=%d",(int)_isFormSubmited);

View file

@ -76,6 +76,7 @@ static char rcsId[] = "$Id$";
{ {
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWSaveAppendToResponseElementID(context_);//Debug Only
[response_ appendContentString:string]; [response_ appendContentString:string];
NSDebugMLLog(@"gswdync",@"END ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"END ET=%@ id=%@",[self class],[context_ elementID]);
LOGObjectFnStop(); LOGObjectFnStop();

View file

@ -345,6 +345,7 @@ static char rcsId[] = "$Id$";
//OK //OK
LOGObjectFnStartC("GSWHTMLDynamicElement"); LOGObjectFnStartC("GSWHTMLDynamicElement");
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWSaveAppendToResponseElementID(context_);//Debug Only
if ([elementsMap length]>0) if ([elementsMap length]>0)
{ {
[self appendToResponse:response_ [self appendToResponse:response_
@ -505,7 +506,7 @@ static char rcsId[] = "$Id$";
LOGObjectFnStartC("GSWHTMLDynamicElement"); LOGObjectFnStartC("GSWHTMLDynamicElement");
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
NSDebugMLLog(@"gswdync",@"_senderID=%@",[context_ senderID]); NSDebugMLLog(@"gswdync",@"_senderID=%@",[context_ senderID]);
NSDebugMLLog(@"gswdync",@"_elementID=%@",[context_ elementID]); GSWAssertCorrectElementID(context_);// Debug Only
for(elementN=0;!_element && elementN<[elementsMap length];elementN++) for(elementN=0;!_element && elementN<[elementsMap length];elementN++)
{ {
element=(BYTE)elements[elementN]; element=(BYTE)elements[elementN];
@ -586,8 +587,8 @@ static char rcsId[] = "$Id$";
LOGObjectFnStartC("GSWHTMLDynamicElement"); LOGObjectFnStartC("GSWHTMLDynamicElement");
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
NSDebugMLLog(@"gswdync",@"_senderID=%@",[context_ senderID]); NSDebugMLLog(@"gswdync",@"_senderID=%@",[context_ senderID]);
NSDebugMLLog(@"gswdync",@"_elementID=%@",[context_ elementID]);
NSDebugMLLog(@"gswdync",@"Starting HTMLDyn TV ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"Starting HTMLDyn TV ET=%@ id=%@",[self class],[context_ elementID]);
GSWAssertCorrectElementID(context_);// Debug Only
for(elementN=0;elementN<[elementsMap length];elementN++) for(elementN=0;elementN<[elementsMap length];elementN++)
{ {
element=(BYTE)elements[elementN]; element=(BYTE)elements[elementN];

View file

@ -290,6 +290,7 @@ static char rcsId[] = "$Id$";
GSWRequest* _request=[context_ request]; GSWRequest* _request=[context_ request];
BOOL _isFromClientComponent=[_request isFromClientComponent]; //bis repetitam BOOL _isFromClientComponent=[_request isFromClientComponent]; //bis repetitam
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWSaveAppendToResponseElementID(context_);//Debug Only
if ([elementsMap length]>0) if ([elementsMap length]>0)
{ {
[self appendToResponse:response_ [self appendToResponse:response_
@ -355,7 +356,8 @@ static char rcsId[] = "$Id$";
CONST BYTE* elements=[elementsMap bytes]; CONST BYTE* elements=[elementsMap bytes];
BYTE element=0; BYTE element=0;
int elementsN[3]={0,0,0}; int elementsN[3]={0,0,0};
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@",[self class],[context_ elementID],[context_ senderID]);
GSWAssertCorrectElementID(context_);// Debug Only
for(elementN=0;!_element && elementN<[elementsMap length];elementN++) for(elementN=0;!_element && elementN<[elementsMap length];elementN++)
{ {
element=(BYTE)elements[elementN]; element=(BYTE)elements[elementN];
@ -390,6 +392,7 @@ static char rcsId[] = "$Id$";
int elementsN[3]={0,0,0}; int elementsN[3]={0,0,0};
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWAssertCorrectElementID(context_);// Debug Only
for(elementN=0;elementN<[elementsMap length];elementN++) for(elementN=0;elementN<[elementsMap length];elementN++)
{ {
NSDebugMLLog(@"gswdync",@"elementN=%d",elementN); NSDebugMLLog(@"gswdync",@"elementN=%d",elementN);

View file

@ -226,7 +226,7 @@ static char rcsId[] = "$Id$";
#endif #endif
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
NSDebugMLLog(@"gswdync",@"_elementID=%@",[context_ elementID]); GSWSaveAppendToResponseElementID(context_);//Debug Only
if (disabled) if (disabled)
_disabled=[self evaluateCondition:disabled _disabled=[self evaluateCondition:disabled
inContext:context_]; inContext:context_];
@ -561,11 +561,10 @@ static char rcsId[] = "$Id$";
int elementsNb=[(GSWElementIDString*)[context_ elementID]elementsNb]; int elementsNb=[(GSWElementIDString*)[context_ elementID]elementsNb];
#endif #endif
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]); NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@",[self class],[context_ elementID],[context_ senderID]);
GSWAssertCorrectElementID(context_);// Debug Only
_senderID=[context_ senderID]; _senderID=[context_ senderID];
NSDebugMLLog(@"gswdync",@"_senderID=%@",_senderID);
_elementID=[context_ elementID]; _elementID=[context_ elementID];
NSDebugMLLog(@"gswdync",@"_elementID=%@",_elementID);
if ([_elementID isEqualToString:_senderID]) if ([_elementID isEqualToString:_senderID])
{ {
GSWComponent* _component=[context_ component]; GSWComponent* _component=[context_ component];

View file

@ -287,6 +287,7 @@ static char rcsId[] = "$Id$";
GSWRequest* _request=[context_ request]; GSWRequest* _request=[context_ request];
BOOL _isFromClientComponent=[_request isFromClientComponent]; BOOL _isFromClientComponent=[_request isFromClientComponent];
BOOL _disabledInContext=[self disabledInContext:context_]; BOOL _disabledInContext=[self disabledInContext:context_];
GSWSaveAppendToResponseElementID(context_);//Debug Only
if (_disabledInContext) if (_disabledInContext)
{ {
//TODO //TODO
@ -308,6 +309,7 @@ static char rcsId[] = "$Id$";
inContext:(GSWContext*)context_ inContext:(GSWContext*)context_
{ {
LOGObjectFnStart(); LOGObjectFnStart();
GSWAssertCorrectElementID(context_);// Debug Only
//Does nothing ? //Does nothing ?
LOGObjectFnStop(); LOGObjectFnStop();
}; };
@ -319,6 +321,8 @@ static char rcsId[] = "$Id$";
GSWElement* _element=nil; GSWElement* _element=nil;
BOOL _disabledInContext=NO; BOOL _disabledInContext=NO;
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@",[self class],[context_ elementID],[context_ senderID]);
GSWAssertCorrectElementID(context_);// Debug Only
_disabledInContext=[self disabledInContext:context_]; _disabledInContext=[self disabledInContext:context_];
if (!_disabledInContext) if (!_disabledInContext)
{ {

View file

@ -148,6 +148,7 @@ static char rcsId[] = "$Id$";
//OK //OK
BOOL _disabledInContext=NO; BOOL _disabledInContext=NO;
LOGObjectFnStartC("GSWInput"); LOGObjectFnStartC("GSWInput");
GSWAssertCorrectElementID(context_);// Debug Only
_disabledInContext=[self disabledInContext:context_]; //return 0 _disabledInContext=[self disabledInContext:context_]; //return 0
if (!_disabledInContext) if (!_disabledInContext)
{ {
@ -210,6 +211,7 @@ static char rcsId[] = "$Id$";
//OK //OK
GSWComponent* _component=nil; GSWComponent* _component=nil;
LOGObjectFnStartC("GSWInput"); LOGObjectFnStartC("GSWInput");
GSWSaveAppendToResponseElementID(context_);//Debug Only
_component=[context_ component]; _component=[context_ component];
if (value) if (value)
{ {

View file

@ -55,6 +55,7 @@ static char rcsId[] = "$Id$";
-(void)takeValuesFromRequest:(GSWRequest*)request_ -(void)takeValuesFromRequest:(GSWRequest*)request_
inContext:(GSWContext*)context_ inContext:(GSWContext*)context_
{ {
GSWAssertCorrectElementID(context_);// Debug Only
//Does Nothing and don't call its parent GSWInput ! //Does Nothing and don't call its parent GSWInput !
}; };

View file

@ -616,6 +616,7 @@ static char rcsId[] = "$Id$";
struct rusage _rusage; struct rusage _rusage;
int i=0; int i=0;
LOGObjectFnStart(); LOGObjectFnStart();
//Use NSRealMemoryAvailable ??
for(i=0;i<2;i++) for(i=0;i<2;i++)
{ {
memset(&_rusage,0,sizeof(_rusage)); memset(&_rusage,0,sizeof(_rusage));

View file

@ -84,6 +84,7 @@ static char rcsId[] = "$Id$";
{ {
//OK //OK
LOGObjectFnStart(); LOGObjectFnStart();
GSWSaveAppendToResponseElementID(context_);//Debug Only
[super appendToResponse:response_ [super appendToResponse:response_
inContext:context_]; inContext:context_];
LOGObjectFnStop(); LOGObjectFnStop();
@ -97,8 +98,10 @@ static char rcsId[] = "$Id$";
GSWElement* _element=nil; GSWElement* _element=nil;
BOOL _disabled=NO; BOOL _disabled=NO;
LOGObjectFnStart(); LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@",[self class],[context_ elementID],[context_ senderID]);
NS_DURING NS_DURING
{ {
GSWAssertCorrectElementID(context_);// Debug Only
_disabled=[self disabledInContext:context_]; _disabled=[self disabledInContext:context_];
if (!_disabled) if (!_disabled)
{ {
@ -115,6 +118,10 @@ static char rcsId[] = "$Id$";
NSDebugMLLog(@"gswdync",@"_formValue=%@",_formValue); NSDebugMLLog(@"gswdync",@"_formValue=%@",_formValue);
if (_formValue) if (_formValue)
_invoked=YES; _invoked=YES;
else
{
NSDebugMLLog(@"gswdync",@"[request_ formValueKeys]=%@",[request_ formValueKeys]);
};
} }
else else
_invoked=YES; _invoked=YES;
@ -155,6 +162,13 @@ static char rcsId[] = "$Id$";
[localException raise]; [localException raise];
} }
NS_ENDHANDLER; NS_ENDHANDLER;
if (![context_ _wasActionInvoked] && [[[context_ elementID] parentElementIDString] compare:[context_ senderID]]!=NSOrderedAscending)
{
LOGError(@"Action not invoked at the end of %@ (id=%@) senderId=%@",
[self class],
[context_ elementID],
[context_ senderID]);
};
LOGObjectFnStop(); LOGObjectFnStop();
return _element; return _element;
}; };
@ -164,6 +178,7 @@ static char rcsId[] = "$Id$";
inContext:(GSWContext*)context_ inContext:(GSWContext*)context_
{ {
//Does Nothing ? //Does Nothing ?
GSWAssertCorrectElementID(context_);// Debug Only
}; };
//-------------------------------------------------------------------- //--------------------------------------------------------------------

View file

@ -80,6 +80,7 @@ static char rcsId[] = "$Id$";
//OK //OK
BOOL _disabled=NO; BOOL _disabled=NO;
LOGObjectFnStartC("GSWTextField"); LOGObjectFnStartC("GSWTextField");
GSWAssertCorrectElementID(context_);// Debug Only
_disabled=[self disabledInContext:context_]; _disabled=[self disabledInContext:context_];
if (!_disabled) if (!_disabled)
{ {
@ -105,13 +106,13 @@ static char rcsId[] = "$Id$";
{ {
NSException* _exception=nil; NSException* _exception=nil;
NSString* _valueKeyPath=[value keyPath]; NSString* _valueKeyPath=[value keyPath];
LOGException0(@"EOValidationException"); LOGException(@"EOValidationException _resultValue=%@ _valueKeyPath=%@",_resultValue,_valueKeyPath);
_exception=[NSException exceptionWithName:@"EOValidationException" _exception=[NSException exceptionWithName:@"EOValidationException"
reason:_errorDscr /*_exceptionDscr*/ reason:_errorDscr /*_exceptionDscr*/
userInfo:[NSDictionary userInfo:[NSDictionary
dictionaryWithObjectsAndKeys: dictionaryWithObjectsAndKeys:
@"EOValidatedObjectUserInfoKey",_resultValue, (_resultValue ? _resultValue : @"nil"),@"EOValidatedObjectUserInfoKey",
@"EOValidatedPropertyUserInfoKey",_valueKeyPath, _valueKeyPath,@"EOValidatedPropertyUserInfoKey",
nil,nil]]; nil,nil]];
[_component validationFailedWithException:_exception [_component validationFailedWithException:_exception
value:_resultValue value:_resultValue

View file

@ -39,6 +39,9 @@
#define IsStyle(__value,__style) ((((__value)&(__style))==(__style)) ? YES : NO) #define IsStyle(__value,__style) ((((__value)&(__style))==(__style)) ? YES : NO)
#define IsNumberStyle(__value,__style) (((([__value unsignedIntValue])&(__style))==(__style)) ? YES : NO) #define IsNumberStyle(__value,__style) (((([__value unsignedIntValue])&(__style))==(__style)) ? YES : NO)
#define VOID_RCSID \
static void VoidUseRCSId() { rcsId[0]=0; };
typedef unsigned char BYTE; typedef unsigned char BYTE;
#define allFrameworks tmpAllFrameworks #define allFrameworks tmpAllFrameworks