mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-23 11:41:20 +00:00
o replaced -definitionName call by -declarationName
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@19047 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon
parent
eceaed407b
commit
8d43c1b7cd
8 changed files with 62 additions and 69 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/** GSWComponentContent.m - <title>GSWeb: Class GSWComponentContent</title>
|
||||
|
||||
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
||||
Date: Jan 1999
|
||||
|
|
@ -50,8 +50,8 @@ RCS_ID("$Id$")
|
|||
int elementsNb=[(GSWElementIDString*)[aContext elementID]elementsNb];
|
||||
#endif
|
||||
LOGObjectFnStart();
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ id=%@",
|
||||
[self class],[self definitionName],[aContext elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ id=%@",
|
||||
[self class],[self declarationName],[aContext elementID]);
|
||||
GSWSaveAppendToResponseElementID(aContext);//Debug Only
|
||||
component=[aContext component];
|
||||
childTemplate=[component _childTemplate];
|
||||
|
|
@ -60,8 +60,8 @@ RCS_ID("$Id$")
|
|||
[childTemplate appendToResponse:response
|
||||
inContext:aContext];
|
||||
[aContext _setCurrentComponent:component];
|
||||
NSDebugMLLog(@"gswdync",@"END ET=%@ defName=%@ id=%@",
|
||||
[self class],[self definitionName],[aContext elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"END ET=%@ declarationName=%@ id=%@",
|
||||
[self class],[self declarationName],[aContext elementID]);
|
||||
#ifndef NDEBBUG
|
||||
NSAssert(elementsNb==[(GSWElementIDString*)[aContext elementID]elementsNb],
|
||||
@"GSWComponentContent appendToResponse: bad elementID");
|
||||
|
|
@ -82,8 +82,8 @@ RCS_ID("$Id$")
|
|||
int elementsNb=[(GSWElementIDString*)[aContext elementID]elementsNb];
|
||||
#endif
|
||||
LOGObjectFnStart();
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ id=%@",
|
||||
[self class],[self definitionName],[aContext elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ id=%@",
|
||||
[self class],[self declarationName],[aContext elementID]);
|
||||
component=[aContext component];
|
||||
NSDebugMLLog(@"gswdync",@"component=%@",component);
|
||||
childTemplate=[component _childTemplate];
|
||||
|
|
@ -99,8 +99,8 @@ RCS_ID("$Id$")
|
|||
[element class],
|
||||
element);
|
||||
[aContext _setCurrentComponent:component];
|
||||
NSDebugMLLog(@"gswdync",@"END ET=%@ defName=%@ id=%@",
|
||||
[self class],[self definitionName],[aContext elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"END ET=%@ declarationName=%@ id=%@",
|
||||
[self class],[self declarationName],[aContext elementID]);
|
||||
#ifndef NDEBBUG
|
||||
NSAssert(elementsNb==[(GSWElementIDString*)[aContext elementID]elementsNb],
|
||||
@"GSWComponentContent invokeActionForRequest: bad elementID");
|
||||
|
|
@ -121,8 +121,8 @@ RCS_ID("$Id$")
|
|||
int elementsNb=[(GSWElementIDString*)[aContext elementID]elementsNb];
|
||||
#endif
|
||||
LOGObjectFnStart();
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ id=%@",
|
||||
[self class],[self definitionName],[aContext elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ id=%@",
|
||||
[self class],[self declarationName],[aContext elementID]);
|
||||
GSWAssertCorrectElementID(aContext);// Debug Only
|
||||
component=[aContext component];
|
||||
childTemplate=[component _childTemplate];
|
||||
|
|
@ -131,8 +131,8 @@ RCS_ID("$Id$")
|
|||
[childTemplate takeValuesFromRequest:request
|
||||
inContext:aContext];
|
||||
[aContext _setCurrentComponent:component];
|
||||
NSDebugMLLog(@"gswdync",@"END ET=%@ defName=%@ id=%@",
|
||||
[self class],[self definitionName],[aContext elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"END ET=%@ declarationName=%@ id=%@",
|
||||
[self class],[self declarationName],[aContext elementID]);
|
||||
#ifndef NDEBBUG
|
||||
NSAssert(elementsNb==[(GSWElementIDString*)[aContext elementID]elementsNb],
|
||||
@"GSWComponentContent takeValuesFromRequest: bad elementID");
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* GSWComponentReference.m - <title>GSWeb: Class GSWComponentReference</title>
|
||||
|
||||
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
||||
Date: Jan 1999
|
||||
|
|
@ -215,8 +215,8 @@ RCS_ID("$Id$")
|
|||
LOGObjectFnStart();
|
||||
GSWStartElement(context);
|
||||
GSWSaveAppendToResponseElementID(context);
|
||||
[response appendDebugCommentContentString:[NSString stringWithFormat:@"defName=%@ ID=%@ name=%@",
|
||||
[self definitionName],
|
||||
[response appendDebugCommentContentString:[NSString stringWithFormat:@"declarationName=%@ ID=%@ name=%@",
|
||||
[self declarationName],
|
||||
[context elementID],
|
||||
_name]];
|
||||
componentPrev=[context component];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/** GSWContext.m - <title>GSWeb: Class GSWContext</title>
|
||||
|
||||
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
||||
Date: Jan 1999
|
||||
|
|
@ -335,12 +335,12 @@ static int dontTraceComponentActionURL=0;
|
|||
_docStructureElements=[NSMutableSet new];
|
||||
memset(ptab,'\t',elementIDNb);
|
||||
ptab[elementIDNb]='\0';
|
||||
string=[NSString stringWithFormat:@"%s %@ Element %p Class %@ defName=%@\n",
|
||||
string=[NSString stringWithFormat:@"%s %@ Element %p Class %@ declarationName=%@\n",
|
||||
ptab,
|
||||
[self elementID],
|
||||
element,
|
||||
[element class],
|
||||
[element definitionName]];
|
||||
[element declarationName]];
|
||||
if (![_docStructureElements containsObject:string])
|
||||
{
|
||||
[_docStructure appendString:string];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/** GSWElement.m - <title>GSWeb: Class GSWElement</title>
|
||||
|
||||
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
||||
Date: Jan 1999
|
||||
|
|
@ -176,13 +176,6 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
|
|||
return _declarationName;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
//TODO: obsolete: remove it
|
||||
-(NSString*)definitionName
|
||||
{
|
||||
return _declarationName;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(void)setDeclarationName:(NSString*)declarationName
|
||||
{
|
||||
|
|
|
|||
|
|
@ -262,8 +262,8 @@ RCS_ID("$Id$")
|
|||
LOGObjectFnStartC("GSWForm");
|
||||
GSWStartElement(context);
|
||||
GSWSaveAppendToResponseElementID(context);
|
||||
[response appendDebugCommentContentString:[NSString stringWithFormat:@"defName=%@ ID=%@",
|
||||
[self definitionName],
|
||||
[response appendDebugCommentContentString:[NSString stringWithFormat:@"declarationName=%@ ID=%@",
|
||||
[self declarationName],
|
||||
[context elementID]]];
|
||||
|
||||
if (!WOStrictFlag)
|
||||
|
|
@ -322,9 +322,9 @@ RCS_ID("$Id$")
|
|||
if ([self prefixMatchSenderIDInContext:context]) //Avoid trying to find action if we are not the good component
|
||||
{
|
||||
isFormSubmited=[elementID isEqualToString:senderID];
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ \n id=%@ \nsenderId=%@ \nisFormSubmited=%s",
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ \n id=%@ \nsenderId=%@ \nisFormSubmited=%s",
|
||||
[self class],
|
||||
[self definitionName],
|
||||
[self declarationName],
|
||||
elementID,
|
||||
senderID,
|
||||
(isFormSubmited ? "YES" : "NO"));
|
||||
|
|
@ -337,9 +337,9 @@ RCS_ID("$Id$")
|
|||
[context _setFormSubmitted:YES];
|
||||
multipleSubmitValue=[self evaluateCondition:_multipleSubmit
|
||||
inContext:context];
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ \n id=%@ \nsenderId=%@ \nmultipleSubmit=%s",
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ \n id=%@ \nsenderId=%@ \nmultipleSubmit=%s",
|
||||
[self class],
|
||||
[self definitionName],
|
||||
[self declarationName],
|
||||
elementID,
|
||||
senderID,
|
||||
(multipleSubmitValue ? "YES" : "NO"));
|
||||
|
|
@ -360,9 +360,9 @@ RCS_ID("$Id$")
|
|||
|
||||
if (isFormSubmited)
|
||||
{
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ \n id=%@ \nsenderId=%@ \nmultipleSubmit=%s \n[context _wasActionInvoked]=%d",
|
||||
NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ \n id=%@ \nsenderId=%@ \nmultipleSubmit=%s \n[context _wasActionInvoked]=%d",
|
||||
[self class],
|
||||
[self definitionName],
|
||||
[self declarationName],
|
||||
elementID,
|
||||
senderID,
|
||||
(multipleSubmitValue ? "YES" : "NO"),
|
||||
|
|
@ -402,9 +402,9 @@ RCS_ID("$Id$")
|
|||
|
||||
if (![context _wasActionInvoked] && [elementID isSearchOverForSenderID:senderID])
|
||||
{
|
||||
LOGError(@"Action not invoked at the end of %@ (def name=%@) (id=%@) senderId=%@",
|
||||
LOGError(@"Action not invoked at the end of %@ (declarationName=%@) (id=%@) senderId=%@",
|
||||
[self class],
|
||||
[self definitionName],
|
||||
[self declarationName],
|
||||
elementID,
|
||||
senderID);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/** GSWHyperlink.m - <title>GSWeb: Class GSWHyperlink</title>
|
||||
|
||||
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
||||
Date: Jan 1999
|
||||
|
|
@ -796,8 +796,8 @@ RCS_ID("$Id$")
|
|||
NSDebugMLLog(@"gswdync",@"GSWHTMLURLValuedElement invoke element=%@",element);
|
||||
NSDebugMLLog(@"gswdync",@"senderID=%@",[context senderID]);
|
||||
NSDebugMLLog(@"gswdync",@"elementID=%@",[context elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"END ET=%@ definition name=%@ id=%@",
|
||||
[self class],[self definitionName],[context elementID]);
|
||||
NSDebugMLLog(@"gswdync",@"END ET=%@ declarationName=%@ id=%@",
|
||||
[self class],[self declarationName],[context elementID]);
|
||||
#ifndef NDEBBUG
|
||||
NSAssert(elementsNb==[(GSWElementIDString*)[context elementID]elementsNb],@"GSWHyperlink invokeActionForRequest: bad elementID");
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -228,8 +228,8 @@ RCS_ID("$Id$")
|
|||
[response _appendContentAsciiString:@" type=image"];
|
||||
|
||||
name=[self nameInContext:context];
|
||||
NSDebugMLLog(@"gswdync",@"definition name=%@ name=%@",
|
||||
[self definitionName],name);
|
||||
NSDebugMLLog(@"gswdync",@"declarationName=%@ name=%@",
|
||||
[self declarationName],name);
|
||||
[response _appendContentAsciiString:@" name=\""];
|
||||
|
||||
[response appendContentHTMLAttributeValue:name];
|
||||
|
|
@ -415,8 +415,8 @@ RCS_ID("$Id$")
|
|||
senderID=[context senderID];
|
||||
NSDebugMLog(@"senderID=%@",senderID);
|
||||
elementID=[context elementID];
|
||||
NSDebugMLog(@"definition name=%@ elementID=%@",
|
||||
[self definitionName],elementID);
|
||||
NSDebugMLog(@"declarationName=%@ elementID=%@",
|
||||
[self declarationName],elementID);
|
||||
if ([elementID isEqualToString:senderID])
|
||||
{
|
||||
//TODO
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/** GSWSwitchComponent.m - <title>GSWeb: Class GSWSwitchComponent</title>
|
||||
|
||||
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
||||
Date: Jan 1999
|
||||
|
|
@ -49,34 +49,34 @@ RCS_ID("$Id$")
|
|||
template:nil]))
|
||||
{
|
||||
NSMutableDictionary* tmpAssociations=[NSMutableDictionary dictionaryWithDictionary:associations];
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): tmpAssociations=%@",
|
||||
self,[self definitionName],tmpAssociations);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): GSWComponentName__Key=%@",
|
||||
self,[self definitionName],GSWComponentName__Key[GSWebNamingConv]);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): tmpAssociations=%@",
|
||||
self,[self declarationName],tmpAssociations);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): GSWComponentName__Key=%@",
|
||||
self,[self declarationName],GSWComponentName__Key[GSWebNamingConv]);
|
||||
[tmpAssociations removeObjectForKey:GSWComponentName__Key[GSWebNamingConv]];
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName__Key=%@",
|
||||
self,[self definitionName],componentName__Key);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName__Key=%@",
|
||||
self,[self declarationName],componentName__Key);
|
||||
[tmpAssociations removeObjectForKey:componentName__Key];
|
||||
|
||||
_componentName = [[associations objectForKey:GSWComponentName__Key[GSWebNamingConv]
|
||||
withDefaultObject:[_componentName autorelease]] retain];
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName=%@",
|
||||
self,[self definitionName],_componentName);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName=%@",
|
||||
self,[self declarationName],_componentName);
|
||||
if (!_componentName)
|
||||
{
|
||||
_componentName = [[associations objectForKey:componentName__Key
|
||||
withDefaultObject:[_componentName autorelease]] retain];
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName=%@",
|
||||
self,[self definitionName],_componentName);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName=%@",
|
||||
self,[self declarationName],_componentName);
|
||||
}
|
||||
|
||||
ASSIGN(_componentAttributes,[NSDictionary dictionaryWithDictionary:tmpAssociations]);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentAttributes=%@",
|
||||
self,[self definitionName],_componentAttributes);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentAttributes=%@",
|
||||
self,[self declarationName],_componentAttributes);
|
||||
|
||||
ASSIGN(_template,templateElement);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): template=%@",
|
||||
self,[self definitionName],_template);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): template=%@",
|
||||
self,[self declarationName],_template);
|
||||
|
||||
_componentCache=[NSMutableDictionary new];
|
||||
};
|
||||
|
|
@ -193,13 +193,13 @@ if the component has already been created, it get it from the cache; otherwise,
|
|||
GSWComponent* component=nil;
|
||||
LOGObjectFnStartC("GSWSwitchComponent");
|
||||
component=[aContext component];
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName=%@ parent=%@",
|
||||
self,[self definitionName],_componentName,[component parent]);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName=%@ parent=%@",
|
||||
self,[self declarationName],_componentName,[component parent]);
|
||||
if ([aName length]==0)
|
||||
{
|
||||
ExceptionRaise(@"GSWSwitchComponent",
|
||||
@"ComponentName is null. componentNameKey='%@' definitionName=%@ currentComponentName=%@",
|
||||
_componentName,[self definitionName],[component name]);
|
||||
@"ComponentName is null. componentNameKey='%@' declarationName=%@ currentComponentName=%@",
|
||||
_componentName,[self declarationName],[component name]);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -219,8 +219,8 @@ if the component has already been created, it get it from the cache; otherwise,
|
|||
else
|
||||
{
|
||||
ExceptionRaise(@"GSWSwitchComponent",
|
||||
@"GSWSwitchComponent %p (defName=%@): Creation failed for element named:%@",
|
||||
self,[self definitionName],aName);
|
||||
@"GSWSwitchComponent %p (declarationName=%@): Creation failed for element named:%@",
|
||||
self,[self declarationName],aName);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -236,11 +236,11 @@ if the component has already been created, it get it from the cache; otherwise,
|
|||
NSString* componentNameValue=nil;
|
||||
LOGObjectFnStartC("GSWSwitchComponent");
|
||||
component=[aContext component];
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName=%@",
|
||||
self,[self definitionName],_componentName);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName=%@",
|
||||
self,[self declarationName],_componentName);
|
||||
componentNameValue=[_componentName valueInComponent:component];
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentNameValue=%@",
|
||||
self,[self definitionName],componentNameValue);
|
||||
NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentNameValue=%@",
|
||||
self,[self declarationName],componentNameValue);
|
||||
LOGObjectFnStopC("GSWSwitchComponent");
|
||||
return componentNameValue;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue