* GSWeb.framework/GSWTemplateParser.m ([GSWTemplateParser

-definitions]): compilable with gcc < 3
* GSWeb.framework/GSWHyperlink.m ([GSWHyperlink
-computeQueryDictionaryInContext:]): likewise.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15192 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Mirko Viviani 2002-12-02 15:56:59 +00:00
parent 9419cbccdc
commit 41de9e8610
3 changed files with 19 additions and 5 deletions

View file

@ -1,3 +1,10 @@
2002-12-02 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* GSWeb.framework/GSWTemplateParser.m ([GSWTemplateParser
-definitions]): compilable with gcc < 3
* GSWeb.framework/GSWHyperlink.m ([GSWHyperlink
-computeQueryDictionaryInContext:]): likewise.
2002-11-27 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb/GSWApplication.m:

View file

@ -528,13 +528,16 @@ static char rcsId[] = "$Id$";
{
NSEnumerator *enumerator = nil;
NSDictionary* queryDictionaryValue=[_queryDictionary valueInComponent:component];
id oaKey;
NSAssert3(!queryDictionaryValue || [queryDictionaryValue isKindOfClass:[NSDictionary class]],
@"queryDictionary value is not a dictionary but a %@. association was: %@. queryDictionaryValue is:",
[queryDictionaryValue class],
_queryDictionary,
queryDictionaryValue);
enumerator = [queryDictionaryValue keyEnumerator];
id oaKey=nil;
while ((oaKey = [enumerator nextObject]))
{
id oaValue=[queryDictionaryValue objectForKey:oaKey];

View file

@ -363,12 +363,16 @@ static char rcsId[] = "$Id$";
}
else
{
NSDictionary *tmpDefinitions;
DESTROY(_processedDefinitionFilePaths);
ASSIGN(_processedDefinitionFilePaths,[NSMutableSet setWithObject:_definitionFilePath]);
NSDictionary* tmpDefinitions=[self parseDefinitionsString:_definitionsString
named:_templateName
inFrameworkNamed:_frameworkName
processedFiles:_processedDefinitionFilePaths];
tmpDefinitions = [self parseDefinitionsString:_definitionsString
named:_templateName
inFrameworkNamed:_frameworkName
processedFiles:_processedDefinitionFilePaths];
if (tmpDefinitions)
ASSIGN(_definitions,[NSDictionary dictionaryWithDictionary:tmpDefinitions]);
};