mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-23 19:51:13 +00:00
o added _otherPathQueryAssociations
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18178 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
2dd6a63e44
commit
2f58783821
2 changed files with 12 additions and 3 deletions
|
@ -43,6 +43,7 @@
|
|||
GSWAssociation* _pageSetVarAssociationsDynamic;
|
||||
GSWAssociation* _cidStore;
|
||||
GSWAssociation* _cidKey;
|
||||
NSDictionary* _otherPathQueryAssociations;
|
||||
// }
|
||||
GSWAssociation* _filename;
|
||||
GSWAssociation* _framework;
|
||||
|
@ -58,11 +59,9 @@
|
|||
-(id)initWithName:(NSString*)aName
|
||||
associations:(NSDictionary*)associations
|
||||
contentElements:(NSArray*)elements;
|
||||
-(void)dealloc;
|
||||
|
||||
-(NSString*)valueAttributeName;
|
||||
-(NSString*)urlAttributeName;
|
||||
-(NSString*)description;
|
||||
@end
|
||||
|
||||
@interface GSWHTMLURLValuedElement (GSWHTMLURLValuedElementA)
|
||||
|
|
|
@ -139,6 +139,14 @@ RCS_ID("$Id$")
|
|||
removePrefix:YES]));
|
||||
if ([_otherQueryAssociations count]==0)
|
||||
DESTROY(_otherQueryAssociations);
|
||||
|
||||
if (!WOStrictFlag)
|
||||
{
|
||||
ASSIGN(_otherPathQueryAssociations,([associations extractObjectsForKeysWithPrefix:@"!"
|
||||
removePrefix:YES]));
|
||||
if ([_otherPathQueryAssociations count]==0)
|
||||
DESTROY(_otherPathQueryAssociations);
|
||||
};
|
||||
};
|
||||
|
||||
if ((self=[super initWithName:[self elementName]//NEW
|
||||
|
@ -167,6 +175,7 @@ RCS_ID("$Id$")
|
|||
DESTROY(_directActionName);
|
||||
DESTROY(_queryDictionary);
|
||||
DESTROY(_otherQueryAssociations);
|
||||
DESTROY(_otherPathQueryAssociations);
|
||||
DESTROY(_cidStore);//GSWeb only
|
||||
DESTROY(_cidKey);//GSWeb only
|
||||
[super dealloc];
|
||||
|
@ -510,6 +519,7 @@ NS_DURING
|
|||
LOGObjectFnStart();
|
||||
actionString=[self computeActionStringWithActionClassAssociation:_actionClass
|
||||
directActionNameAssociation:_directActionName
|
||||
otherPathQueryAssociations:_otherPathQueryAssociations
|
||||
inContext:aContext];
|
||||
LOGObjectFnStop();
|
||||
return actionString;
|
||||
|
@ -550,7 +560,7 @@ NS_DURING
|
|||
|
||||
-(NSString*)addCIDElement:(NSDictionary*)cidElement
|
||||
forKey:(NSString*)cidKeyValue
|
||||
forCIDStore:(GSWAssociation*)cidStore
|
||||
forCIDStore:(GSWAssociation*)cidStore
|
||||
inContext:(GSWContext*)aContext
|
||||
{
|
||||
NSString* newURL=nil;
|
||||
|
|
Loading…
Reference in a new issue