mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-05-30 08:41:24 +00:00
2002-01-26 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWSwitchComponent.m: o logs o corected bug: use GSWComponentName__Key[] * GSWeb.framework/GSWSession.m: o logs * GSWExtensions.framework/GSWExtensions.m: o added better formatting * GSWExtensions.framework/GSWExtensions.gswc/GSWExtensions.HTML: o added better formatting * GSWExtensions.framework/French.lproj/GSWExtensions.gswc/GSWExtensions.HTML: o added better formatting * GSWExtensionsGSW.framework/GSWLogin.m: o added -login exception cataching to add exception verbosity. * GSWeb.framework/GSWDynamicElement.m/.h: o logs o added ivar _definitionName and associated methods * GSWeb.framework/GSWElement.m/.h: o added ivar -definitionName * GSWeb.framework/GSWTemplateParserANTLR.m: o set dynamic element definition name * GSWeb.framework/GSWTemplateParserXML.m: o set dynamic element definition name * GSWeb.framework/GSWConditional.m: o logs * GSWeb.framework/GSWComponent.m: o logs o remove GDL2 code in -valueForBinding: and setValue:forBinding: I don't see a reason for this code and it may make a loop * GSWeb.framework/GSWAssociation.m: o logs o Fix in validateValue:forKeyPath: test & call * GSWeb.framework/GSWDisplayGroup.m: o logs * GSWeb.framework/GSWBundle.m: o logs * GSWeb.framework/GSWImageButton.m: o logs (element definition name) * GSWeb.framework/GSWForm.m: o logs (element definition name) o stop invokeActionForRequest:inContext: when the current Id is after senderID * GSWeb.framework: GSWElementIDString.m o added -compare:options:range: * GSWeb.framework: GSWHTMLDynamicElement.m o stop invokeActionForRequest:inContext: when the current Id is after senderID * GSWeb.framework: GSWHTMLStaticElement.m o stop invokeActionForRequest:inContext: when the current Id is after senderID * GSWExtensions.framework/WebServerResources: o converted .gif to .png * GSWeb.framework/GSWUtils.m: o removed members in NSUserDefaults description git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@12219 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon
parent
bb8d9887cd
commit
7976caba68
50 changed files with 1121 additions and 619 deletions
|
|
@ -490,7 +490,7 @@ static char rcsId[] = "$Id$";
|
|||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWElement*)invokeActionForRequest:(GSWRequest*)request_
|
||||
inContext:(GSWContext*)context_
|
||||
inContext:(GSWContext*)context_
|
||||
{
|
||||
//???
|
||||
GSWElement* _element=nil;
|
||||
|
|
@ -500,6 +500,8 @@ static char rcsId[] = "$Id$";
|
|||
BYTE element=0;
|
||||
int elementsN[4]={0,0,0,0};
|
||||
BOOL inChildren=NO;
|
||||
BOOL searchIsOver=NO;
|
||||
NSString* _senderID=nil;
|
||||
#ifndef NDEBUG
|
||||
NSString* debugElementID=nil;
|
||||
#endif
|
||||
|
|
@ -507,62 +509,76 @@ static char rcsId[] = "$Id$";
|
|||
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"_senderID=%@",[context_ senderID]);
|
||||
GSWAssertCorrectElementID(context_);// Debug Only
|
||||
for(elementN=0;!_element && elementN<[elementsMap length];elementN++)
|
||||
{
|
||||
element=(BYTE)elements[elementN];
|
||||
if (element==ElementsMap_dynamicElement)
|
||||
{
|
||||
if (!inChildren)
|
||||
{
|
||||
_senderID=[context_ senderID];
|
||||
for(elementN=0;!_element && !searchIsOver && elementN<[elementsMap length];elementN++)
|
||||
{
|
||||
element=(BYTE)elements[elementN];
|
||||
if (element==ElementsMap_dynamicElement)
|
||||
{
|
||||
if (!inChildren)
|
||||
{
|
||||
#ifndef NDEBUG
|
||||
debugElementID=[context_ elementID];
|
||||
debugElementID=[context_ elementID];
|
||||
#endif
|
||||
[context_ appendZeroElementIDComponent];
|
||||
inChildren=YES;
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
if (inChildren)
|
||||
{
|
||||
[context_ deleteLastElementIDComponent];
|
||||
inChildren=NO;
|
||||
[context_ appendZeroElementIDComponent];
|
||||
inChildren=YES;
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
if (inChildren)
|
||||
{
|
||||
[context_ deleteLastElementIDComponent];
|
||||
inChildren=NO;
|
||||
#ifndef NDEBUG
|
||||
if (![debugElementID isEqualToString:[context_ elementID]])
|
||||
{
|
||||
NSDebugMLLog(@"gswdync",@"ERROR class=%@ debugElementID=%@ [context_ elementID]=%@",[self class],debugElementID,[context_ elementID]);
|
||||
|
||||
};
|
||||
if (![debugElementID isEqualToString:[context_ elementID]])
|
||||
{
|
||||
NSDebugMLLog(@"gswdync",@"ERROR class=%@ debugElementID=%@ [context_ elementID]=%@",
|
||||
[self class],
|
||||
debugElementID,
|
||||
[context_ elementID]);
|
||||
|
||||
};
|
||||
#endif
|
||||
};
|
||||
};
|
||||
|
||||
if (element==ElementsMap_htmlBareString)
|
||||
elementsN[0]++;
|
||||
else if (element==ElementsMap_gswebElement)
|
||||
elementsN[1]++;
|
||||
else if (element==ElementsMap_dynamicElement)
|
||||
{
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[[_dynamicChildren objectAtIndex:elementsN[2]] class],[context_ elementID]);
|
||||
_element=[[_dynamicChildren objectAtIndex:elementsN[2]] invokeActionForRequest:request_
|
||||
inContext:context_];
|
||||
[context_ incrementLastElementIDComponent];
|
||||
elementsN[2]++;
|
||||
}
|
||||
else if (element==ElementsMap_attributeElement)
|
||||
elementsN[3]++;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
if (element==ElementsMap_htmlBareString)
|
||||
elementsN[0]++;
|
||||
else if (element==ElementsMap_gswebElement)
|
||||
elementsN[1]++;
|
||||
else if (element==ElementsMap_dynamicElement)
|
||||
{
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",
|
||||
[[_dynamicChildren objectAtIndex:elementsN[2]] class],
|
||||
[context_ elementID]);
|
||||
_element=[[_dynamicChildren objectAtIndex:elementsN[2]] invokeActionForRequest:request_
|
||||
inContext:context_];
|
||||
//if (![context_ _wasFormSubmitted] && [[context_ elementID] compare:_senderID]==NSOrderedDescending)
|
||||
if (![context_ _wasFormSubmitted] && [[context_ elementID] isSearchOverForSenderID:_senderID])
|
||||
{
|
||||
NSDebugMLLog(@"gswdync",@"id=%@ senderid=%@ => search is over",
|
||||
[context_ elementID],
|
||||
_senderID);
|
||||
searchIsOver=YES;
|
||||
};
|
||||
[context_ incrementLastElementIDComponent];
|
||||
elementsN[2]++;
|
||||
}
|
||||
else if (element==ElementsMap_attributeElement)
|
||||
elementsN[3]++;
|
||||
};
|
||||
if (inChildren)
|
||||
{
|
||||
[context_ deleteLastElementIDComponent];
|
||||
{
|
||||
[context_ deleteLastElementIDComponent];
|
||||
#ifndef NDEBUG
|
||||
if (![debugElementID isEqualToString:[context_ elementID]])
|
||||
{
|
||||
NSDebugMLLog(@"gswdync",@"ERROR class=%@ debugElementID=%@ [context_ elementID]=%@",[self class],debugElementID,[context_ elementID]);
|
||||
|
||||
};
|
||||
if (![debugElementID isEqualToString:[context_ elementID]])
|
||||
{
|
||||
NSDebugMLLog(@"gswdync",@"ERROR class=%@ debugElementID=%@ [context_ elementID]=%@",[self class],debugElementID,[context_ elementID]);
|
||||
|
||||
};
|
||||
#endif
|
||||
};
|
||||
};
|
||||
NSDebugMLLog(@"gswdync",@"_senderID=%@",[context_ senderID]);
|
||||
NSDebugMLLog(@"gswdync",@"_elementID=%@",[context_ elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"END ET=%@ id=%@",[self class],[context_ elementID]);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue