gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-04-23 15:33:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2003-05-14 Manuel Guesdon <mguesdon@orange-concept.com>

Browse source 
* GSWeb.framework/GSWResourceManager.m:
		o added warning in ISOLanguagesFromGSLanguages
		o asserts
	* GSWeb.framework/GSWApplication.m:
		o assert adaptor name length>0 in
		   -adaptorWithName:arguments: and in -_initAdaptorsWithUserDefaults:


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@16717 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Manuel Guesdon 2003-05-14 08:08:57 +00:00
parent 3ad6c87b68
commit 7654257195
3 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2003-05-14 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWResourceManager.m:
o added warning in ISOLanguagesFromGSLanguages
o asserts
* GSWeb.framework/GSWApplication.m:
o assert adaptor name length>0 in
-adaptorWithName:arguments: and in -_initAdaptorsWithUserDefaults:
2003-04-19 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWAdaptors/Apache/mod_gsweb.c:
o added debug logs

9
GSWeb.framework/GSWApplication.m
View file

@ -1032,11 +1032,14 @@ selfLockn,
{
GSWAdaptor* adaptor=nil;
NSDictionary* args=nil;
NSString* adaptorName=nil;
LOGObjectFnStart();
NSDebugMLLog(@"options",@"userDefault=%@",userDefaults);
args=[self _argsDictionaryWithUserDefaults:userDefaults];
NSDebugMLLog(@"options",@"args=%@",args);
adaptor=[self adaptorWithName:[userDefaults objectForKey:GSWOPT_Adaptor[GSWebNamingConv]]
adaptorName=[userDefaults objectForKey:GSWOPT_Adaptor[GSWebNamingConv]];
NSAssert([adaptorName length]>0,@"No adaptor name");
adaptor=[self adaptorWithName:adaptorName
arguments:args];
if (_adaptors)
ASSIGN(_adaptors,[_adaptors arrayByAddingObject:adaptor]);
@ -1808,6 +1811,7 @@ selfLockn,
LOGObjectFnStart();
NSDebugMLLog(@"application",@"adaptor name:%@",name);
gswadaptorClass=[GSWAdaptor class];
NSAssert([name length]>0,@"No adaptor name");
adaptorClass=NSClassFromString(name);
NSAssert1(adaptorClass,@"No adaptor named '%@'",name);
if (adaptorClass)
@ -4019,6 +4023,9 @@ selfLockn,
NSBundle* mainBundle=[self mainBundle];
NSString* bundlePath=[mainBundle bundlePath];
NSString* path=[bundlePath stringGoodPath];
NSAssert(mainBundle,@"No mainBundle");
NSAssert(bundlePath,@"No bundlePath");
NSAssert(path,@"No path");
NSDebugMLLog(@"application",@"bundlePath:%@",bundlePath);
NSDebugMLLog(@"application",@"path:%@",path);
NSDebugMLLog(@"application",@"mainBundle:%@",mainBundle);

18
GSWeb.framework/GSWResourceManager.m
View file

@ -63,7 +63,6 @@ NSString* localNotFoundMarker=@"NOTFOUND";
//NSDebugMLLog(@"resmanager",@"mainBundle:%@",mainBundle);
bundlePath=[mainBundle bundlePath];
//NSDebugMLLog(@"resmanager",@"bundlePath:%@",bundlePath);
printf("bundlePath:%s",[bundlePath lossyCString]);
deployedBundle=(GSWDeployedBundle*)[GSWDeployedBundle bundleWithPath:bundlePath];
//NSDebugMLLog(@"resmanager",@"deployedBundle:%@",deployedBundle);
@ -1530,6 +1529,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
+(NSArray*)GSLanguagesFromISOLanguages:(NSArray*)ISOLanguages
{
NSArray* GSLanguages=nil;
LOGClassFnStart();
if (ISOLanguages)
{
NSMutableArray* array=[NSMutableArray array];
@ -1549,6 +1549,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
};
GSLanguages=[NSArray arrayWithArray:array];
}
LOGClassFnStop();
return GSLanguages;
};
@ -1564,6 +1565,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
+(NSArray*)ISOLanguagesFromGSLanguages:(NSArray*)GSLanguages
{
NSArray* ISOLanguages=nil;
LOGClassFnStart();
if (GSLanguages)
{
NSMutableArray* array=[NSMutableArray array];
@ -1574,10 +1576,17 @@ NSString* localNotFoundMarker=@"NOTFOUND";
{
GSLanguage=[GSLanguages objectAtIndex:i];
ISOLanguage=[self ISOLanguageFromGSLanguage:GSLanguage];
[array addObject:ISOLanguage];
NSDebugMLog(@"ISOLanguage=%@",ISOLanguage);
if (ISOLanguage)
[array addObject:ISOLanguage];
else
{
LOGError(@"Unknown language: %@\nKnown languages are : %@",GSLanguage,localGS2ISOLanguages);
};
};
ISOLanguages=[NSArray arrayWithArray:array];
}
LOGClassFnStop();
return ISOLanguages;
};
//--------------------------------------------------------------------
@ -1633,11 +1642,12 @@ NSString* localNotFoundMarker=@"NOTFOUND";
if (tmpMimeTypes)
{
NSEnumerator* enumerator = [tmpMimeTypes keyEnumerator];
id key;
id value;
id key=nil;
id value=nil;
while ((key = [enumerator nextObject]))
{
value=[tmpMimeTypes objectForKey:key];
NSAssert(value,@"No value");
value=[value lowercaseString];
key=[key lowercaseString];
NSAssert(key,@"No key");