* GSWeb.framework/GSWHTMLRawParser.m

([GSWHTMLRawParser _skipQuotedStringWithQuote:index:stopIndex:]):
        Use decimal instead of object format specifier.  Reformat.

        * GSWeb.framework/GSWTemplateParser.m:
        ([GSWTemplateParser parseDeclarations]): Test
        _declarationsFilePath before inserting it into a mutable set.
        Reformat.

        * GSWeb.framework/GSWDefaultAdaptor.m
        ([GSWDefaultAdaptor announceNewConnection:]):  Fix for
        WorkerThreadCount 0.

        * GSWeb.framework/GSWResourceManager.m
        ([GSWResourceManager _applicationGSWBundle]): Use self instead
        of NSClassFromString to obtain correct class for WO namespace.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@19001 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2004-04-02 11:06:46 +00:00
parent c1de12d63b
commit 1168aa1c1e
5 changed files with 35 additions and 8 deletions

View file

@ -1,3 +1,22 @@
2004-04-02 David Ayers <d.ayers@inode.at>
* GSWeb.framework/GSWHTMLRawParser.m
([GSWHTMLRawParser _skipQuotedStringWithQuote:index:stopIndex:]):
Use decimal instead of object format specifier. Reformat.
* GSWeb.framework/GSWTemplateParser.m:
([GSWTemplateParser parseDeclarations]): Test
_declarationsFilePath before inserting it into a mutable set.
Reformat.
* GSWeb.framework/GSWDefaultAdaptor.m
([GSWDefaultAdaptor announceNewConnection:]): Fix for
WorkerThreadCount 0.
* GSWeb.framework/GSWResourceManager.m
([GSWResourceManager _applicationGSWBundle]): Use self instead of
NSClassFromString to obtain correct class for WO namespace.
2004-03-26 David Ayers <d.ayers@inode.at>
* GSWAdaptors/common/GSWTemplates.c (GSWTemplate_GetTemplate):

View file

@ -411,7 +411,8 @@ int allow_severity = LOG_INFO;
@"[waitingThreads count]=%d [threads count]=%d",
[_waitingThreads count],
[_threads count]);
if ([_threads count]<_workerThreadCount)
if ([_threads count]<_workerThreadCount
|| _isMultiThreadEnabled == NO)
{
[_threads addObject:newThread];
NSDebugLockMLLog(@"trace",@"isMultiThreadEnabled=%d",

View file

@ -285,11 +285,13 @@ An exception is raised if the end quote is not found,...
{
if (*indexPtr>stopIndex)
[NSException raise:NSInvalidArgumentException
format:@"Found end of string before end quote when skipping quoted string starting at %@.",
format:@"Found end of string before end quote when "
@"skipping quoted string starting at %d.",
[self currentLineIndex]];
else
[NSException raise:NSInvalidArgumentException
format:@"Didn't found end quote when skipping quoted string starting at %@. Found '%c' instead",
format:@"Didn't find end quote when skipping quoted "
@"string starting at %d. Found '%c' instead",
[self currentLineIndex],(char)_uniBuf[_index]];
};

View file

@ -1591,8 +1591,7 @@ bundle if none is found
NSDebugMLLog(@"resmanager",@"globalAppGSWBundle=%@",globalAppGSWBundle);
//???
{
NSBundle* resourceManagerBundle=[NSBundle bundleForClass:
NSClassFromString(@"GSWResourceManager")];
NSBundle* resourceManagerBundle = [NSBundle bundleForClass: self];
NSDebugMLLog(@"resmanager",@"resourceManagerBundle bundlePath=%@",[resourceManagerBundle bundlePath]);
globalMimePListPathName=[resourceManagerBundle pathForResource:@"MIME"
ofType:@"plist"]; //TODO should return /usr/GNUstep/Libraries/GNUstepWeb/GSWeb.framework/Resources/MIME.plist

View file

@ -602,7 +602,8 @@ RCS_ID("$Id$")
LOGObjectFnStart();
if (!_declarations)
{
NSDebugMLLog(@"GSWTemplateParser",@"_declarationsFilePath=%@",_declarationsFilePath);
NSDebugMLLog(@"GSWTemplateParser",@"_declarationsFilePath=%@",
_declarationsFilePath);
if ([_declarationsString length]==0)
{
ASSIGN(_declarations,[NSDictionary dictionary]);
@ -612,9 +613,14 @@ RCS_ID("$Id$")
NSDictionary* declarations=nil;
DESTROY(_processedDeclarationsFilePaths);
ASSIGN(_processedDeclarationsFilePaths,[NSMutableSet setWithObject:_declarationsFilePath]);
ASSIGN(_processedDeclarationsFilePaths,
(_declarationsFilePath
? [NSMutableSet setWithObject:_declarationsFilePath]
: [NSMutableSet set]));
NSDebugMLLog(@"GSWTemplateParser",@"ParseDeclarations path=%@: declarationsString:%@\n",_declarationsFilePath,_declarationsString);
NSDebugMLLog(@"GSWTemplateParser",
@"ParseDeclarations path=%@: declarationsString:%@\n",
_declarationsFilePath,_declarationsString);
declarations = [self parseDeclarationsString:_declarationsString
named:_templateName
inFrameworkNamed:_frameworkName];