* GSWeb/GSWResourceManager.m

make url prefix dynamic based on [request _applicationURLPrefix]



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30827 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2010-06-22 21:56:48 +00:00
parent 4a964c44e5
commit b8b1e1318e
2 changed files with 15 additions and 5 deletions

View file

@ -1,3 +1,7 @@
2010-06-22 David Wetzel <dave@turbocat.de>
* GSWeb/GSWResourceManager.m
make url prefix dynamic based on [request _applicationURLPrefix]
2010-06-22 David Wetzel <dave@turbocat.de>
* GSWExtensions/Resources/Info-gnustep.plist
delete

View file

@ -318,6 +318,8 @@ NSMutableDictionary *globalPathCache = nil;
/WebObjects/MyApp.woa/0/wr/English.lproj/name
/WebObjects/MyApp.woa/0/wr/testpic.jpg
/WebObjects/MyApp.woa/0/wr/MyFramework/wr/English.lproj/name
TODO: test with true dynamic data in URLs
*/
-(NSString*)urlForResourceNamed:(NSString*)name
@ -325,8 +327,9 @@ NSMutableDictionary *globalPathCache = nil;
languages:(NSArray*)languages
request:(GSWRequest*)request
{
NSString* url=nil;
NSString* path=nil;
NSString * url=nil;
NSString * path=nil;
//GSWContext * context = nil;
if ((languages) && ([languages count])) {
NSEnumerator * langEnumer = [languages objectEnumerator];
@ -346,15 +349,18 @@ NSMutableDictionary *globalPathCache = nil;
language:nil];
}
if (!path) {
return nil;
}
path = [self _cleanPath:path frameworkName:aFrameworkName];
url = [NSString stringWithFormat:@"%@/%@.woa/0/wr%@", [GSWApplication applicationBaseURL],
[GSWApp name], path];
//context = [request _context];
url = [NSString stringWithFormat:@"%@%@%@", [request _applicationURLPrefix],
[[GSWApp class] resourceRequestHandlerKey],
path];
return url;
}