diff --git a/GSWeb.framework/GSWRequest.h b/GSWeb.framework/GSWRequest.h index ebad9cc..e3021ed 100644 --- a/GSWeb.framework/GSWRequest.h +++ b/GSWeb.framework/GSWRequest.h @@ -196,6 +196,13 @@ Cf RFC 2616 (http://www.rfc-editor.org/rfc/rfc2616.txt) queryString:(NSString*)queryString isSecure:(BOOL)isSecure port:(int)port; + +/** urlPrefix will prefix url (before the /GSWeb) **/ +-(GSWDynamicURLString*)_urlWithURLPrefix:(NSString*)urlPrefix + requestHandlerKey:(NSString*)key + path:(NSString*)path + queryString:(NSString*)queryString; + -(GSWDynamicURLString*)_urlWithRequestHandlerKey:(NSString*)key path:(NSString*)path queryString:(NSString*)queryString; diff --git a/GSWeb.framework/GSWRequest.m b/GSWeb.framework/GSWRequest.m index 0612bce..c79bf28 100644 --- a/GSWeb.framework/GSWRequest.m +++ b/GSWeb.framework/GSWRequest.m @@ -1480,22 +1480,36 @@ RCS_ID("$Id$") }; //-------------------------------------------------------------------- --(GSWDynamicURLString*)_urlWithRequestHandlerKey:(NSString*)key - path:(NSString*)path - queryString:(NSString*)queryString +/** urlPrefix will prefix url (before the /GSWeb) **/ +-(GSWDynamicURLString*)_urlWithURLPrefix:(NSString*)urlPrefix + requestHandlerKey:(NSString*)key + path:(NSString*)path + queryString:(NSString*)queryString { - //OK GSWDynamicURLString* url=[self _applicationURLPrefix]; + if (urlPrefix) + [url setURLPrefix:[NSString stringWithFormat:@"%@%@", + urlPrefix,[url urlPrefix]]]; [url setURLRequestHandlerKey:key]; [url setURLRequestHandlerPath:path]; [url setURLQueryString:queryString]; return url; }; +//-------------------------------------------------------------------- +-(GSWDynamicURLString*)_urlWithRequestHandlerKey:(NSString*)key + path:(NSString*)path + queryString:(NSString*)queryString +{ + return [self _urlWithURLPrefix:nil + requestHandlerKey:key + path:path + queryString:queryString]; +}; + //-------------------------------------------------------------------- -(GSWDynamicURLString*)_applicationURLPrefix { - //OK GSWDynamicURLString* applicationURLPrefix=[[_uri copy] autorelease]; [applicationURLPrefix setURLRequestHandlerKey:nil]; [applicationURLPrefix setURLRequestHandlerPath:nil];