gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-24 04:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

o added _otherPathQueryAssociations

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18178 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon 2003-11-24 12:05:48 +00:00
parent 2dd6a63e44
commit 2f58783821
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
GSWeb.framework/GSWHTMLURLValuedElement.h
View file

@ -43,6 +43,7 @@
GSWAssociation* _pageSetVarAssociationsDynamic; GSWAssociation* _pageSetVarAssociationsDynamic;
GSWAssociation* _cidStore; GSWAssociation* _cidStore;
GSWAssociation* _cidKey; GSWAssociation* _cidKey;
NSDictionary* _otherPathQueryAssociations;
// } // }
GSWAssociation* _filename; GSWAssociation* _filename;
GSWAssociation* _framework; GSWAssociation* _framework;
@ -58,11 +59,9 @@
-(id)initWithName:(NSString*)aName -(id)initWithName:(NSString*)aName
associations:(NSDictionary*)associations associations:(NSDictionary*)associations
contentElements:(NSArray*)elements; contentElements:(NSArray*)elements;
-(void)dealloc;
-(NSString*)valueAttributeName; -(NSString*)valueAttributeName;
-(NSString*)urlAttributeName; -(NSString*)urlAttributeName;
-(NSString*)description;
@end @end
@interface GSWHTMLURLValuedElement (GSWHTMLURLValuedElementA) @interface GSWHTMLURLValuedElement (GSWHTMLURLValuedElementA)

12
GSWeb.framework/GSWHTMLURLValuedElement.m
View file

@ -139,6 +139,14 @@ RCS_ID("$Id$")
removePrefix:YES])); removePrefix:YES]));
if ([_otherQueryAssociations count]==0) if ([_otherQueryAssociations count]==0)
DESTROY(_otherQueryAssociations); DESTROY(_otherQueryAssociations);
if (!WOStrictFlag)
{
ASSIGN(_otherPathQueryAssociations,([associations extractObjectsForKeysWithPrefix:@"!"
removePrefix:YES]));
if ([_otherPathQueryAssociations count]==0)
DESTROY(_otherPathQueryAssociations);
};
}; };
if ((self=[super initWithName:[self elementName]//NEW if ((self=[super initWithName:[self elementName]//NEW
@ -167,6 +175,7 @@ RCS_ID("$Id$")
DESTROY(_directActionName); DESTROY(_directActionName);
DESTROY(_queryDictionary); DESTROY(_queryDictionary);
DESTROY(_otherQueryAssociations); DESTROY(_otherQueryAssociations);
DESTROY(_otherPathQueryAssociations);
DESTROY(_cidStore);//GSWeb only DESTROY(_cidStore);//GSWeb only
DESTROY(_cidKey);//GSWeb only DESTROY(_cidKey);//GSWeb only
[super dealloc]; [super dealloc];
@ -510,6 +519,7 @@ NS_DURING
LOGObjectFnStart(); LOGObjectFnStart();
actionString=[self computeActionStringWithActionClassAssociation:_actionClass actionString=[self computeActionStringWithActionClassAssociation:_actionClass
directActionNameAssociation:_directActionName directActionNameAssociation:_directActionName
otherPathQueryAssociations:_otherPathQueryAssociations
inContext:aContext]; inContext:aContext];
LOGObjectFnStop(); LOGObjectFnStop();
return actionString; return actionString;
@ -550,7 +560,7 @@ NS_DURING
-(NSString*)addCIDElement:(NSDictionary*)cidElement -(NSString*)addCIDElement:(NSDictionary*)cidElement
forKey:(NSString*)cidKeyValue forKey:(NSString*)cidKeyValue
forCIDStore:(GSWAssociation*)cidStore forCIDStore:(GSWAssociation*)cidStore
inContext:(GSWContext*)aContext inContext:(GSWContext*)aContext
{ {
NSString* newURL=nil; NSString* newURL=nil;