mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-23 19:51:13 +00:00
manage urlPrefix
o added -urlWithURLPrefix:requestHandlerKey: path:queryString:isSecure:port: o added -urlWithURLPrefix:RequestHandlerKey: path:queryString: o added -completeURLWithURLPrefix:requestHandlerKey: path:queryString:isSecure:port: o added -directActionURLForActionNamed:urlPrefix: queryDictionary: o added -directActionURLForActionNamed:urlPrefix: queryDictionary:pathQueryDictionary: o added -directActionURLForActionNamed:urlPrefix: queryDictionary:isSecure: o added -directActionURLForActionNamed:urlPrefix: queryDictionary:pathQueryDictionary:isSecure: o added -_directActionURLForActionNamed:urlPrefix: queryDictionary:url: o added -_directActionURLForActionNamed:urlPrefix: queryDictionary:pathQueryDictionary:url: git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18353 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon
parent
069f9722f4
commit
a4e1fffdf5
2 changed files with 280 additions and 25 deletions
|
|
@ -102,31 +102,81 @@
|
|||
//====================================================================
|
||||
@interface GSWContext (GSWURLGeneration)
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)queryDictionary;
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)queryDictionary;
|
||||
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary;
|
||||
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary;
|
||||
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
isSecure:(BOOL)isSecure;
|
||||
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
isSecure:(BOOL)isSecure;
|
||||
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
isSecure:(BOOL)isSecure;
|
||||
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
isSecure:(BOOL)isSecure;
|
||||
-(GSWDynamicURLString*)componentActionURL;
|
||||
-(GSWDynamicURLString*)componentActionURLIsSecure:(BOOL)isSecure;
|
||||
|
||||
-(GSWDynamicURLString*)urlWithURLPrefix:(NSString*)urlPrefix
|
||||
requestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
isSecure:(BOOL)isSecure
|
||||
port:(int)port;
|
||||
-(GSWDynamicURLString*)urlWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
isSecure:(BOOL)isSecure
|
||||
port:(int)port;
|
||||
|
||||
-(GSWDynamicURLString*)urlWithURLPrefix:(NSString*)urlPrefix
|
||||
RequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString;
|
||||
|
||||
-(GSWDynamicURLString*)urlWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString;
|
||||
|
||||
//NDFN
|
||||
-(GSWDynamicURLString*)completeURLWithURLPrefix:(NSString*)urlPrefix
|
||||
requestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString;
|
||||
|
||||
//NDFN
|
||||
-(GSWDynamicURLString*)completeURLWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString;
|
||||
|
||||
-(GSWDynamicURLString*)completeURLWithURLPrefix:(NSString*)urlPrefix
|
||||
requestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
isSecure:(BOOL)isSecure
|
||||
port:(int)port;
|
||||
|
||||
-(GSWDynamicURLString*)completeURLWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
|
|
@ -150,10 +200,35 @@
|
|||
-(void)_putAwakeComponentsToSleep;
|
||||
-(BOOL)_generateCompleteURLs;
|
||||
-(BOOL)_generateRelativeURLs;
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
url:(id)anURL;
|
||||
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
isSecure:(BOOL)isSecure
|
||||
url:(id)anURL;
|
||||
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
url:(id)anURL;
|
||||
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
isSecure:(BOOL)isSecure
|
||||
url:(id)anURL;
|
||||
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
isSecure:(BOOL)isSecure
|
||||
url:(id)anURL;
|
||||
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
|
|
|
|||
|
|
@ -366,12 +366,13 @@ static int dontTraceComponentActionURL=0;
|
|||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
{
|
||||
//OK
|
||||
GSWDynamicURLString* url=nil;
|
||||
LOGObjectFnStart();
|
||||
url=[self directActionURLForActionNamed:actionName
|
||||
urlPrefix:urlPrefix
|
||||
queryDictionary:queryDictionary
|
||||
isSecure:NO];
|
||||
LOGObjectFnStop();
|
||||
|
|
@ -381,12 +382,22 @@ static int dontTraceComponentActionURL=0;
|
|||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
{
|
||||
return [self directActionURLForActionNamed:actionName
|
||||
urlPrefix:nil
|
||||
queryDictionary:queryDictionary];
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
{
|
||||
//OK
|
||||
GSWDynamicURLString* url=nil;
|
||||
LOGObjectFnStart();
|
||||
url=[self directActionURLForActionNamed:actionName
|
||||
urlPrefix:urlPrefix
|
||||
queryDictionary:queryDictionary
|
||||
pathQueryDictionary:pathQueryDictionary];
|
||||
LOGObjectFnStop();
|
||||
|
|
@ -395,13 +406,25 @@ static int dontTraceComponentActionURL=0;
|
|||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
{
|
||||
return [self directActionURLForActionNamed:actionName
|
||||
urlPrefix:nil
|
||||
queryDictionary:queryDictionary
|
||||
pathQueryDictionary:pathQueryDictionary];
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
isSecure:(BOOL)isSecure
|
||||
{
|
||||
//OK
|
||||
GSWDynamicURLString* url=nil;
|
||||
LOGObjectFnStart();
|
||||
url=[self directActionURLForActionNamed:actionName
|
||||
urlPrefix:urlPrefix
|
||||
queryDictionary:queryDictionary
|
||||
pathQueryDictionary:nil
|
||||
isSecure:NO];
|
||||
|
|
@ -411,14 +434,26 @@ static int dontTraceComponentActionURL=0;
|
|||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
isSecure:(BOOL)isSecure
|
||||
{
|
||||
return [self directActionURLForActionNamed:actionName
|
||||
urlPrefix:nil
|
||||
queryDictionary:queryDictionary
|
||||
isSecure:isSecure];
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
isSecure:(BOOL)isSecure
|
||||
{
|
||||
//OK
|
||||
GSWDynamicURLString* url=nil;
|
||||
LOGObjectFnStart();
|
||||
url=[self _directActionURLForActionNamed:actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:queryDictionary
|
||||
pathQueryDictionary:pathQueryDictionary
|
||||
isSecure:isSecure
|
||||
|
|
@ -428,6 +463,19 @@ static int dontTraceComponentActionURL=0;
|
|||
return url;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)queryDictionary
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
isSecure:(BOOL)isSecure
|
||||
{
|
||||
return [self directActionURLForActionNamed:actionName
|
||||
urlPrefix:nil
|
||||
queryDictionary:queryDictionary
|
||||
pathQueryDictionary:pathQueryDictionary
|
||||
isSecure:isSecure];
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)componentActionURL
|
||||
{
|
||||
|
|
@ -438,6 +486,7 @@ static int dontTraceComponentActionURL=0;
|
|||
return url;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)componentActionURLIsSecure:(BOOL)isSecure
|
||||
{
|
||||
//TODO: use isSecure
|
||||
|
|
@ -521,13 +570,13 @@ static int dontTraceComponentActionURL=0;
|
|||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)urlWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
isSecure:(BOOL)isSecure
|
||||
port:(int)port
|
||||
-(GSWDynamicURLString*)urlWithURLPrefix:(NSString*)urlPrefix
|
||||
requestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
isSecure:(BOOL)isSecure
|
||||
port:(int)port
|
||||
{
|
||||
//OK
|
||||
GSWDynamicURLString* url=nil;
|
||||
GSWRequest* request=[self request];
|
||||
LOGObjectFnStartCond(dontTraceComponentActionURL==0);
|
||||
|
|
@ -539,13 +588,15 @@ static int dontTraceComponentActionURL=0;
|
|||
if (_generateCompleteURLs
|
||||
|| (isSecure!=[request isSecure])
|
||||
|| (port!=0 && port!=[request urlPort]))
|
||||
url=[self completeURLWithRequestHandlerKey:requestHandlerKey
|
||||
url=[self completeURLWithURLPrefix:urlPrefix
|
||||
requestHandlerKey:requestHandlerKey
|
||||
path:requestHandlerPath
|
||||
queryString:queryString
|
||||
isSecure:isSecure
|
||||
port:port];
|
||||
else
|
||||
url=[request _urlWithRequestHandlerKey:requestHandlerKey
|
||||
url=[request _urlWithURLPrefix:urlPrefix
|
||||
requestHandlerKey:requestHandlerKey
|
||||
path:requestHandlerPath
|
||||
queryString:queryString];
|
||||
NSDebugMLogCond(dontTraceComponentActionURL==0,
|
||||
|
|
@ -558,8 +609,23 @@ static int dontTraceComponentActionURL=0;
|
|||
-(GSWDynamicURLString*)urlWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
isSecure:(BOOL)isSecure
|
||||
port:(int)port
|
||||
{
|
||||
return [self urlWithURLPrefix:nil
|
||||
requestHandlerKey:requestHandlerKey
|
||||
path:requestHandlerPath
|
||||
queryString:queryString
|
||||
isSecure:isSecure
|
||||
port:port];
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)urlWithURLPrefix:(NSString*)urlPrefix
|
||||
RequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
{
|
||||
//OK
|
||||
GSWDynamicURLString* url=nil;
|
||||
GSWRequest* request=[self request];
|
||||
LOGObjectFnStartCond(dontTraceComponentActionURL==0);
|
||||
|
|
@ -580,28 +646,56 @@ static int dontTraceComponentActionURL=0;
|
|||
return url;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)urlWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
{
|
||||
return [self urlWithURLPrefix:nil
|
||||
RequestHandlerKey:requestHandlerKey
|
||||
path:requestHandlerPath
|
||||
queryString:queryString];
|
||||
};
|
||||
|
||||
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
//NDFN
|
||||
-(GSWDynamicURLString*)completeURLWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
-(GSWDynamicURLString*)completeURLWithURLPrefix:(NSString*)urlPrefix
|
||||
requestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
{
|
||||
GSWRequest* request=nil;
|
||||
request=[self request];
|
||||
return [self completeURLWithRequestHandlerKey:requestHandlerKey
|
||||
return [self completeURLWithURLPrefix:urlPrefix
|
||||
requestHandlerKey:requestHandlerKey
|
||||
path:requestHandlerPath
|
||||
queryString:queryString
|
||||
isSecure:[request isSecure]
|
||||
port:[request urlPort]];
|
||||
};
|
||||
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
//NDFN
|
||||
-(GSWDynamicURLString*)completeURLWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
isSecure:(BOOL)isSecure
|
||||
port:(int)port
|
||||
{
|
||||
return [self completeURLWithURLPrefix:nil
|
||||
requestHandlerKey:requestHandlerKey
|
||||
path:requestHandlerPath
|
||||
queryString:queryString];
|
||||
};
|
||||
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)completeURLWithURLPrefix:(NSString*)urlPrefix
|
||||
requestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
isSecure:(BOOL)isSecure
|
||||
port:(int)port
|
||||
{
|
||||
NSString* host=nil;
|
||||
GSWDynamicURLString* url=nil;
|
||||
|
|
@ -629,6 +723,20 @@ static int dontTraceComponentActionURL=0;
|
|||
return url;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(GSWDynamicURLString*)completeURLWithRequestHandlerKey:(NSString*)requestHandlerKey
|
||||
path:(NSString*)requestHandlerPath
|
||||
queryString:(NSString*)queryString
|
||||
isSecure:(BOOL)isSecure
|
||||
port:(int)port
|
||||
{
|
||||
return [self completeURLWithURLPrefix:nil
|
||||
requestHandlerKey:requestHandlerKey
|
||||
path:requestHandlerPath
|
||||
queryString:queryString
|
||||
isSecure:isSecure
|
||||
port:port];
|
||||
};
|
||||
@end
|
||||
|
||||
//====================================================================
|
||||
|
|
@ -722,14 +830,17 @@ static int dontTraceComponentActionURL=0;
|
|||
return previousState;
|
||||
};
|
||||
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
//_url is a semi complete one: line /cgi/WebObjects.exe/ObjCTest3.woa
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
url:(id)anURL
|
||||
{
|
||||
LOGObjectFnStart();
|
||||
anURL=[self _directActionURLForActionNamed:actionName
|
||||
urlPrefix:urlPrefix
|
||||
queryDictionary:dict
|
||||
pathQueryDictionary:nil
|
||||
url:anURL];
|
||||
|
|
@ -740,12 +851,26 @@ static int dontTraceComponentActionURL=0;
|
|||
//--------------------------------------------------------------------
|
||||
//_url is a semi complete one: line /cgi/WebObjects.exe/ObjCTest3.woa
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
url:(id)anURL
|
||||
{
|
||||
return [self _directActionURLForActionNamed:actionName
|
||||
urlPrefix:nil
|
||||
queryDictionary:dict
|
||||
url:anURL];
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
//_url is a semi complete one: line /cgi/WebObjects.exe/ObjCTest3.woa
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
url:(id)anURL
|
||||
{
|
||||
LOGObjectFnStart();
|
||||
anURL=[self _directActionURLForActionNamed:actionName
|
||||
urlPrefix:urlPrefix
|
||||
queryDictionary:dict
|
||||
pathQueryDictionary:pathQueryDictionary
|
||||
isSecure:NO
|
||||
|
|
@ -757,12 +882,28 @@ static int dontTraceComponentActionURL=0;
|
|||
//--------------------------------------------------------------------
|
||||
//_url is a semi complete one: line /cgi/WebObjects.exe/ObjCTest3.woa
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
url:(id)anURL
|
||||
{
|
||||
return [self _directActionURLForActionNamed:actionName
|
||||
urlPrefix:nil
|
||||
queryDictionary:dict
|
||||
pathQueryDictionary:pathQueryDictionary
|
||||
url:anURL];
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
//_url is a semi complete one: line /cgi/WebObjects.exe/ObjCTest3.woa
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
isSecure:(BOOL)isSecure
|
||||
url:(id)anURL
|
||||
{
|
||||
LOGObjectFnStart();
|
||||
anURL=[self _directActionURLForActionNamed:actionName
|
||||
urlPrefix:urlPrefix
|
||||
queryDictionary:dict
|
||||
pathQueryDictionary:nil
|
||||
isSecure:isSecure
|
||||
|
|
@ -774,6 +915,21 @@ static int dontTraceComponentActionURL=0;
|
|||
//--------------------------------------------------------------------
|
||||
//_url is a semi complete one: line /cgi/WebObjects.exe/ObjCTest3.woa
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
isSecure:(BOOL)isSecure
|
||||
url:(id)anURL
|
||||
{
|
||||
return [self _directActionURLForActionNamed:actionName
|
||||
urlPrefix:nil
|
||||
queryDictionary:dict
|
||||
isSecure:isSecure
|
||||
url:anURL];
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
//_url is a semi complete one: line /cgi/WebObjects.exe/ObjCTest3.woa
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
urlPrefix:(NSString*)urlPrefix
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
isSecure:(BOOL)isSecure
|
||||
|
|
@ -836,17 +992,41 @@ static int dontTraceComponentActionURL=0;
|
|||
value];
|
||||
};
|
||||
};
|
||||
anURL=[self urlWithRequestHandlerKey:GSWDirectActionRequestHandlerKey[GSWebNamingConv]
|
||||
path:path
|
||||
queryString:queryString
|
||||
isSecure:isSecure
|
||||
port:0];
|
||||
if (urlPrefix)
|
||||
anURL=[self urlWithURLPrefix:urlPrefix
|
||||
requestHandlerKey:GSWDirectActionRequestHandlerKey[GSWebNamingConv]
|
||||
path:path
|
||||
queryString:queryString
|
||||
isSecure:isSecure
|
||||
port:0];
|
||||
else
|
||||
anURL=[self urlWithRequestHandlerKey:GSWDirectActionRequestHandlerKey[GSWebNamingConv]
|
||||
path:path
|
||||
queryString:queryString
|
||||
isSecure:isSecure
|
||||
port:0];
|
||||
NSDebugMLogCond(dontTraceComponentActionURL==0,
|
||||
@"url=%@",anURL);
|
||||
LOGObjectFnStop();
|
||||
return anURL;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
//_url is a semi complete one: line /cgi/WebObjects.exe/ObjCTest3.woa
|
||||
-(GSWDynamicURLString*)_directActionURLForActionNamed:(NSString*)actionName
|
||||
queryDictionary:(NSDictionary*)dict
|
||||
pathQueryDictionary:(NSDictionary*)pathQueryDictionary
|
||||
isSecure:(BOOL)isSecure
|
||||
url:(id)anURL
|
||||
{
|
||||
return [self _directActionURLForActionNamed:actionName
|
||||
urlPrefix:nil
|
||||
queryDictionary:dict
|
||||
pathQueryDictionary:pathQueryDictionary
|
||||
isSecure:isSecure
|
||||
url:anURL];
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
/** Returns array of languages
|
||||
First try session languages, if none, try self language
|
||||
|
|
|
|||
Loading…
Reference in a new issue