2002-07-04 11:01:56 +00:00
|
|
|
/** GSWTemplateParser.m - <title>GSWeb: Class GSWTemplateParser</title>
|
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
|
|
|
Date: Mar 1999
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2002-07-04 11:01:56 +00:00
|
|
|
$Revision$
|
|
|
|
$Date$
|
2002-12-06 14:28:27 +00:00
|
|
|
$Id$
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2002-07-04 11:01:56 +00:00
|
|
|
<abstract></abstract>
|
|
|
|
|
|
|
|
This file is part of the GNUstep Web Library.
|
|
|
|
|
|
|
|
<license>
|
2000-01-22 12:49:49 +00:00
|
|
|
This library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with this library; if not, write to the Free
|
|
|
|
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
2002-07-04 11:01:56 +00:00
|
|
|
</license>
|
|
|
|
**/
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2003-03-21 14:32:57 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
RCS_ID("$Id$")
|
2003-02-01 19:07:25 +00:00
|
|
|
|
2003-01-22 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/Makefile.postamble:
o use $(LN_S) -f in install-WO-headers
o added $(MKDIRS) $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR);
* GSWExtensionsGSW.framework/Makefile.postamble: use $(LN_S) -f in install-WO-headers
2003-01-20 David Ayers <d.ayers@inode.at>
* Makefile.postamble
o added support for make gswnames=(gsw,wo,all) (corrected
typo)
o reinserted support for $(INSTALL_ROOT_DIR)
* config.h.in
o added HAVE_GDL2
* configure
o added support for --with-gswnames=(gsw,wo,all)
o set LIBWRAP during configure
o added config.mak.in as configurable file
* configure.ac
o (see configure)
* config.mak: removed (replaced by config.mak.in)
* config.mak.in: new file
o added support for make gswnames=(gsw,wo,all)
* gsweb.make.in
o add GSANTLR as auxiliary lib
o add gsweb libs to AUXILIARY_GSW_LIBS
o include correct extensions for GSW/WO-libs
* gsweb_wo.make: new file
* GSWeb/GSWConfig.h
o changed support for GSWEB_WONAMES
o conditionally import file GSWWOCompatiblity
here instead of in GSWeb.h
* GSWeb/GNUMakefile
o added support for make gswnames=(gsw,wo,all)
o ensure each lib gets built with its own object files
o removed deactivated framework extension determination code
o removed reference to unused files:
GSWeb.m, GSWWOCompatibility.m
o added references to new files:
GSWExtenstions.h, GSWExtWOCompatibility.h
o added support to create WO header files
* GSWeb/Makefile.postamble
o changed support to install WO header files according to
make gswnames=(gsw,wo,all)
o remove Makefile.preamble during distclean
* GSWeb/Makefile.preamble.in
o fixed typo
* GSWeb/GSWeb.h
o moved GSW/WO-Name-mapping to GSWWOCompatibility.h
o replaced inclusions of
<GSWeb/file.h> with "file.h"
* GSWeb/GSWeb.m: removed
* GSWeb/GSWWOCompatibility.h
o changed GSWEB_WONAMES handling
o removed hybrid namespace WO subclasses
o moved & reorganized GSW/WO-Name-mapping from GSWeb.h
o inlucluded missing GSW/WO-Name-mappings
* GSWeb/GSWWOCompatibility.m: removed
* GSWeb/*.m
o replaced inclusions of
<GSWeb/file.h> with "file.h"
* GSWeb/GSWApplication.m
o remove special GSW/WO handling of WOApp
* GSWeb/WebObject/WO*: removed
* GSWeb/WebObject/WebObjects
o replaced inclusions of
<GSWeb/file.h> with "file.h"
* GSWExtensions/GNUMakefile
o added support for make gswnames=(gsw,wo,all)
o ensure each lib gets built with its own object files
o removed deactivated framework extension determination code
o added references to new files:
GSWExtenstions.h, GSWExtWOCompatibility.h
o added support to create WO header files
* GSWExtensions/Makefile.preamble
o let gnustep make figure whether to link agains debug libs
o added support for make gswnames=(gsw,wo,all)
* GSWExtensions/Makefile.postamble
o changed support to install WO header files according to
make gswnames=(gsw,wo,all)
* GSWExtensions/*.m
o replaced inclusions of
<GSWeb/GSWeb.h> with "GSWExtWOCompatibility.h"
o replaces inclusions of
<GSWExtensions/file.h> with "file.h"
* GSWExtensions/GSWExtensions.h: new file
* GSWExtensions/WOExtensions.h: new file
* GSWExtensions/GSWExtWOCompatibility.h: new file
* GSWExtensionsGSW/GNUMakefile
o added support for make gswnames=(gsw,wo,all)
o ensure each lib gets built with its own object files
o removed deactivated framework extension determination code
o added references to new file GSWExtGSWWOCompatibility.h
o added support to create WO header files
* GSWExtensionsGSW/Makefile.pramble
o let gnustep make figure whether to link agains debug libs
o added support for make gswnames=(gsw,wo,all)
o removed GSWExtensions from ADDITIONAL_LIB_DIRS
* GSWExtensionsGSW/*.m
o replaced inclusions of
<GSWeb/GSWeb.h> with "GSWExtGSWWOCompatibility.h"
* GSWExtensions/GSWExtGSWWOCompatibility.h: new file
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15675 72102866-910b-0410-8b05-ffd578937521
2003-01-22 12:24:26 +00:00
|
|
|
#include "GSWeb.h"
|
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
//====================================================================
|
|
|
|
@implementation GSWTemplateParser
|
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
//--------------------------------------------------------------------
|
2000-10-04 22:19:43 +00:00
|
|
|
+(void)initialize
|
|
|
|
{
|
|
|
|
if (self == [GSWTemplateParser class])
|
|
|
|
{
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
//--------------------------------------------------------------------
|
2002-10-12 11:27:50 +00:00
|
|
|
+(GSWTemplateParserType)templateParserTypeFromString:(NSString*)string
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-10-12 11:27:50 +00:00
|
|
|
GSWTemplateParserType type=0;
|
2004-03-25 08:35:25 +00:00
|
|
|
if ([string caseInsensitiveCompare:GSWOPTValue_DefaultTemplateParser_RawHTML] == NSOrderedSame)
|
|
|
|
type=GSWTemplateParserType_RawHTML;
|
|
|
|
else if ([string caseInsensitiveCompare:GSWOPTValue_DefaultTemplateParser_XMLHTML] == NSOrderedSame)
|
2004-04-06 11:17:41 +00:00
|
|
|
{
|
|
|
|
NSWarnLog(@"XMLHTL parser is no more handled. Using RawHTML one");
|
|
|
|
type=GSWTemplateParserType_RawHTML;
|
|
|
|
}
|
2002-10-12 11:27:50 +00:00
|
|
|
else if ([string caseInsensitiveCompare:GSWOPTValue_DefaultTemplateParser_XMLHTMLNoOmittedTags] == NSOrderedSame)
|
2004-04-06 11:17:41 +00:00
|
|
|
{
|
|
|
|
NSWarnLog(@"XMLHTMLNoOmittedTags parser is no more handled. Using RawHTML one");
|
|
|
|
type=GSWTemplateParserType_RawHTML;
|
|
|
|
}
|
2002-10-12 11:27:50 +00:00
|
|
|
else if ([string caseInsensitiveCompare:GSWOPTValue_DefaultTemplateParser_XML] == NSOrderedSame)
|
2004-04-06 11:17:41 +00:00
|
|
|
{
|
|
|
|
NSWarnLog(@"XML parser is no more handled. Using RawHTML one");
|
|
|
|
type=GSWTemplateParserType_RawHTML;
|
|
|
|
}
|
2002-10-12 11:27:50 +00:00
|
|
|
else if ([string caseInsensitiveCompare:GSWOPTValue_DefaultTemplateParser_ANTLR] == NSOrderedSame)
|
2004-04-06 11:17:41 +00:00
|
|
|
{
|
|
|
|
NSWarnLog(@"ANTLR parser is no more handled. Using RawHTML one");
|
|
|
|
type=GSWTemplateParserType_RawHTML;
|
|
|
|
}
|
2002-10-12 11:27:50 +00:00
|
|
|
else
|
2004-03-25 08:35:25 +00:00
|
|
|
type=GSWTemplateParserType_RawHTML;
|
|
|
|
NSDebugMLog(@"templateParserTypeFromString:%@ ==> %d",string,type);
|
2002-10-12 11:27:50 +00:00
|
|
|
return type;
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
//--------------------------------------------------------------------
|
2002-10-12 11:27:50 +00:00
|
|
|
+(GSWTemplateParserType)defaultTemplateParserType
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-10-12 11:27:50 +00:00
|
|
|
return [self templateParserTypeFromString:[GSWApplication defaultTemplateParser]];
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2004-01-18 13:06:12 +00:00
|
|
|
+(GSWElement*)templateWithHTMLString:(NSString *)HTMLString
|
2004-03-25 08:35:25 +00:00
|
|
|
declarationString:(NSString *)declarationsString
|
|
|
|
languages:(NSArray *)languages
|
2004-01-18 13:06:12 +00:00
|
|
|
{
|
|
|
|
return [self templateNamed: nil
|
2004-03-25 08:35:25 +00:00
|
|
|
inFrameworkNamed: nil
|
|
|
|
withParserType: [self defaultTemplateParserType]
|
|
|
|
parserClassName: nil
|
|
|
|
withString: HTMLString
|
|
|
|
encoding: GSUndefinedEncoding
|
|
|
|
fromPath: nil
|
|
|
|
declarationsString: declarationsString
|
|
|
|
languages: languages
|
|
|
|
declarationsPath: nil];
|
2004-01-18 13:06:12 +00:00
|
|
|
}
|
|
|
|
|
2004-04-06 11:17:41 +00:00
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
+(GSWElement*)templateNamed:(NSString*)aName
|
|
|
|
inFrameworkNamed:(NSString*)aFrameworkName
|
2002-10-12 11:27:50 +00:00
|
|
|
withParserType:(GSWTemplateParserType)parserType
|
|
|
|
parserClassName:(NSString*)parserClassName
|
2000-10-04 22:19:43 +00:00
|
|
|
withString:(NSString*)HTMLString
|
2002-08-04 18:00:11 +00:00
|
|
|
encoding:(NSStringEncoding)anEncoding
|
2000-10-04 22:19:43 +00:00
|
|
|
fromPath:(NSString*)HTMLPath
|
2004-03-25 08:35:25 +00:00
|
|
|
declarationsString:(NSString*)declarationsString
|
2002-08-04 18:00:11 +00:00
|
|
|
languages:(NSArray*)someLanguages
|
2004-03-25 08:35:25 +00:00
|
|
|
declarationsPath:(NSString*)aDeclarationsPath
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2000-10-04 22:19:43 +00:00
|
|
|
GSWElement* resultTemplate=nil;
|
|
|
|
Class parserClass=Nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGClassFnStart();
|
2004-03-25 08:35:25 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",@"aDeclarationsPath=%@",aDeclarationsPath);
|
2000-10-04 22:19:43 +00:00
|
|
|
if (parserClassName)
|
|
|
|
{
|
|
|
|
parserClass=NSClassFromString(parserClassName);
|
|
|
|
NSAssert1(parserClass,@"No Parser class named %@",parserClassName);
|
|
|
|
};
|
2002-08-04 18:00:11 +00:00
|
|
|
resultTemplate=[self templateNamed:aName
|
|
|
|
inFrameworkNamed:aFrameworkName
|
2002-10-12 11:27:50 +00:00
|
|
|
withParserType:(GSWTemplateParserType)parserType
|
|
|
|
parserClass:parserClass
|
2000-10-04 22:19:43 +00:00
|
|
|
withString:HTMLString
|
2002-08-04 18:00:11 +00:00
|
|
|
encoding:anEncoding
|
2000-10-04 22:19:43 +00:00
|
|
|
fromPath:HTMLPath
|
2004-03-25 08:35:25 +00:00
|
|
|
declarationsString:declarationsString
|
2002-08-04 18:00:11 +00:00
|
|
|
languages:someLanguages
|
2004-03-25 08:35:25 +00:00
|
|
|
declarationsPath:aDeclarationsPath];
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGClassFnStop();
|
2000-10-04 22:19:43 +00:00
|
|
|
return resultTemplate;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
+(GSWElement*)templateNamed:(NSString*)aName
|
|
|
|
inFrameworkNamed:(NSString*)aFrameworkName
|
2002-10-12 11:27:50 +00:00
|
|
|
withParserType:(GSWTemplateParserType)parserType
|
|
|
|
parserClass:(Class)parserClass
|
2000-10-04 22:19:43 +00:00
|
|
|
withString:(NSString*)HTMLString
|
2002-08-04 18:00:11 +00:00
|
|
|
encoding:(NSStringEncoding)anEncoding
|
2000-10-04 22:19:43 +00:00
|
|
|
fromPath:(NSString*)HTMLPath
|
2004-04-06 11:17:41 +00:00
|
|
|
declarationsString:(NSString*)declarationsString
|
2002-08-04 18:00:11 +00:00
|
|
|
languages:(NSArray*)someLanguages
|
2004-04-06 11:17:41 +00:00
|
|
|
declarationsPath:(NSString*)aDeclarationsPath
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2000-10-04 22:19:43 +00:00
|
|
|
GSWElement* resultTemplate=nil;
|
|
|
|
GSWTemplateParser* templateParser=nil;
|
2002-10-12 11:27:50 +00:00
|
|
|
Class finalParserClass=Nil;
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGClassFnStart();
|
2004-04-06 11:17:41 +00:00
|
|
|
|
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"template named:%@ frameworkName:%@ declarationsString=%@",
|
|
|
|
aName,aFrameworkName,declarationsString);
|
|
|
|
|
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"aDeclarationsPath=%@",aDeclarationsPath);
|
|
|
|
|
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"parserClass:%@ parserType:%d",
|
|
|
|
parserClass,parserType);
|
|
|
|
|
2002-10-12 11:27:50 +00:00
|
|
|
if (parserClass)
|
|
|
|
finalParserClass=parserClass;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (parserType==GSWTemplateParserType_Default)
|
|
|
|
parserType=[self defaultTemplateParserType];
|
|
|
|
switch(parserType)
|
|
|
|
{
|
|
|
|
case GSWTemplateParserType_XMLHTML:
|
|
|
|
case GSWTemplateParserType_XMLHTMLNoOmittedTags:
|
2004-04-06 11:17:41 +00:00
|
|
|
NSWarnLog(@"XMLHTML parser is no more handled. Using RawHTML one");
|
|
|
|
finalParserClass=[GSWHTMLTemplateParser class];
|
2002-10-12 11:27:50 +00:00
|
|
|
break;
|
|
|
|
case GSWTemplateParserType_XML:
|
2004-04-06 11:17:41 +00:00
|
|
|
NSWarnLog(@"XML parser is no more handled. Using RawHTML one");
|
|
|
|
finalParserClass=[GSWHTMLTemplateParser class];
|
2002-10-12 11:27:50 +00:00
|
|
|
break;
|
|
|
|
case GSWTemplateParserType_ANTLR:
|
2004-04-06 11:17:41 +00:00
|
|
|
NSWarnLog(@"ANTLR parser is no more handled. Using RawHTML one");
|
|
|
|
finalParserClass=[GSWHTMLTemplateParser class];
|
|
|
|
break;
|
2004-03-25 08:35:25 +00:00
|
|
|
case GSWTemplateParserType_RawHTML:
|
|
|
|
finalParserClass=[GSWHTMLTemplateParser class];
|
2002-10-12 11:27:50 +00:00
|
|
|
break;
|
|
|
|
default:
|
2004-03-25 08:35:25 +00:00
|
|
|
finalParserClass=[GSWHTMLTemplateParser class];
|
2002-10-12 11:27:50 +00:00
|
|
|
break;
|
|
|
|
};
|
|
|
|
};
|
2004-03-25 08:35:25 +00:00
|
|
|
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"finalParserClass:%@ parserType:%d",
|
|
|
|
finalParserClass,parserType);
|
|
|
|
|
2002-10-12 11:27:50 +00:00
|
|
|
NSAssert2(finalParserClass,@"No Final Parser class: parserClass:%@ parserType:%d",
|
|
|
|
parserClass,parserType);
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2002-10-12 11:27:50 +00:00
|
|
|
templateParser=[[[finalParserClass alloc] initWithTemplateName:aName
|
|
|
|
inFrameworkName:aFrameworkName
|
|
|
|
withString:HTMLString
|
|
|
|
encoding:anEncoding
|
|
|
|
fromPath:HTMLPath
|
2004-03-25 08:35:25 +00:00
|
|
|
withDeclarationsString:declarationsString
|
|
|
|
fromPath:aDeclarationsPath
|
2002-10-12 11:27:50 +00:00
|
|
|
forLanguages:someLanguages] autorelease];
|
2000-10-04 22:19:43 +00:00
|
|
|
if (templateParser)
|
2002-10-12 11:27:50 +00:00
|
|
|
{
|
|
|
|
resultTemplate=[templateParser template];
|
|
|
|
};
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGClassFnStop();
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2000-10-04 22:19:43 +00:00
|
|
|
return resultTemplate;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(id)initWithTemplateName:(NSString*)aName
|
|
|
|
inFrameworkName:(NSString*)aFrameworkName
|
2000-10-04 22:19:43 +00:00
|
|
|
withString:(NSString*)HTMLString
|
2002-08-04 18:00:11 +00:00
|
|
|
encoding:(NSStringEncoding)anEncoding
|
2000-10-04 22:19:43 +00:00
|
|
|
fromPath:(NSString*)HTMLPath
|
2004-03-25 08:35:25 +00:00
|
|
|
withDeclarationsString:(NSString*)declarationsString
|
|
|
|
fromPath:(NSString*)aDeclarationsPath
|
2002-08-04 18:00:11 +00:00
|
|
|
forLanguages:(NSArray*)someLanguages
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2000-10-04 22:19:43 +00:00
|
|
|
if ((self=[self init]))
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_templateName,aName);
|
|
|
|
ASSIGN(_frameworkName,aFrameworkName);
|
2000-10-04 22:19:43 +00:00
|
|
|
ASSIGN(_string,HTMLString);
|
2002-08-04 18:00:11 +00:00
|
|
|
_stringEncoding=anEncoding;
|
2000-10-04 22:19:43 +00:00
|
|
|
ASSIGN(_stringPath,HTMLPath);
|
2004-03-25 08:35:25 +00:00
|
|
|
ASSIGN(_declarationsString,declarationsString);
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_languages,someLanguages);
|
2004-03-25 08:35:25 +00:00
|
|
|
ASSIGN(_declarationsFilePath,aDeclarationsPath);
|
2000-10-04 22:19:43 +00:00
|
|
|
};
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(void)dealloc
|
|
|
|
{
|
|
|
|
DESTROY(_templateName);
|
|
|
|
DESTROY(_frameworkName);
|
|
|
|
DESTROY(_string);
|
|
|
|
DESTROY(_stringPath);
|
2004-03-25 08:35:25 +00:00
|
|
|
DESTROY(_declarationsString);
|
2000-10-04 22:19:43 +00:00
|
|
|
DESTROY(_languages);
|
2004-03-25 08:35:25 +00:00
|
|
|
DESTROY(_declarationsFilePath);
|
|
|
|
DESTROY(_processedDeclarationsFilePaths);
|
2000-10-04 22:19:43 +00:00
|
|
|
DESTROY(_template);
|
2004-03-25 08:35:25 +00:00
|
|
|
DESTROY(_declarations);
|
2002-11-18 11:14:55 +00:00
|
|
|
DESTROY(_errorMessages);
|
2000-10-04 22:19:43 +00:00
|
|
|
[super dealloc];
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)logPrefix
|
|
|
|
{
|
2003-01-22 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/Makefile.postamble:
o use $(LN_S) -f in install-WO-headers
o added $(MKDIRS) $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR);
* GSWExtensionsGSW.framework/Makefile.postamble: use $(LN_S) -f in install-WO-headers
2003-01-20 David Ayers <d.ayers@inode.at>
* Makefile.postamble
o added support for make gswnames=(gsw,wo,all) (corrected
typo)
o reinserted support for $(INSTALL_ROOT_DIR)
* config.h.in
o added HAVE_GDL2
* configure
o added support for --with-gswnames=(gsw,wo,all)
o set LIBWRAP during configure
o added config.mak.in as configurable file
* configure.ac
o (see configure)
* config.mak: removed (replaced by config.mak.in)
* config.mak.in: new file
o added support for make gswnames=(gsw,wo,all)
* gsweb.make.in
o add GSANTLR as auxiliary lib
o add gsweb libs to AUXILIARY_GSW_LIBS
o include correct extensions for GSW/WO-libs
* gsweb_wo.make: new file
* GSWeb/GSWConfig.h
o changed support for GSWEB_WONAMES
o conditionally import file GSWWOCompatiblity
here instead of in GSWeb.h
* GSWeb/GNUMakefile
o added support for make gswnames=(gsw,wo,all)
o ensure each lib gets built with its own object files
o removed deactivated framework extension determination code
o removed reference to unused files:
GSWeb.m, GSWWOCompatibility.m
o added references to new files:
GSWExtenstions.h, GSWExtWOCompatibility.h
o added support to create WO header files
* GSWeb/Makefile.postamble
o changed support to install WO header files according to
make gswnames=(gsw,wo,all)
o remove Makefile.preamble during distclean
* GSWeb/Makefile.preamble.in
o fixed typo
* GSWeb/GSWeb.h
o moved GSW/WO-Name-mapping to GSWWOCompatibility.h
o replaced inclusions of
<GSWeb/file.h> with "file.h"
* GSWeb/GSWeb.m: removed
* GSWeb/GSWWOCompatibility.h
o changed GSWEB_WONAMES handling
o removed hybrid namespace WO subclasses
o moved & reorganized GSW/WO-Name-mapping from GSWeb.h
o inlucluded missing GSW/WO-Name-mappings
* GSWeb/GSWWOCompatibility.m: removed
* GSWeb/*.m
o replaced inclusions of
<GSWeb/file.h> with "file.h"
* GSWeb/GSWApplication.m
o remove special GSW/WO handling of WOApp
* GSWeb/WebObject/WO*: removed
* GSWeb/WebObject/WebObjects
o replaced inclusions of
<GSWeb/file.h> with "file.h"
* GSWExtensions/GNUMakefile
o added support for make gswnames=(gsw,wo,all)
o ensure each lib gets built with its own object files
o removed deactivated framework extension determination code
o added references to new files:
GSWExtenstions.h, GSWExtWOCompatibility.h
o added support to create WO header files
* GSWExtensions/Makefile.preamble
o let gnustep make figure whether to link agains debug libs
o added support for make gswnames=(gsw,wo,all)
* GSWExtensions/Makefile.postamble
o changed support to install WO header files according to
make gswnames=(gsw,wo,all)
* GSWExtensions/*.m
o replaced inclusions of
<GSWeb/GSWeb.h> with "GSWExtWOCompatibility.h"
o replaces inclusions of
<GSWExtensions/file.h> with "file.h"
* GSWExtensions/GSWExtensions.h: new file
* GSWExtensions/WOExtensions.h: new file
* GSWExtensions/GSWExtWOCompatibility.h: new file
* GSWExtensionsGSW/GNUMakefile
o added support for make gswnames=(gsw,wo,all)
o ensure each lib gets built with its own object files
o removed deactivated framework extension determination code
o added references to new file GSWExtGSWWOCompatibility.h
o added support to create WO header files
* GSWExtensionsGSW/Makefile.pramble
o let gnustep make figure whether to link agains debug libs
o added support for make gswnames=(gsw,wo,all)
o removed GSWExtensions from ADDITIONAL_LIB_DIRS
* GSWExtensionsGSW/*.m
o replaced inclusions of
<GSWeb/GSWeb.h> with "GSWExtGSWWOCompatibility.h"
* GSWExtensions/GSWExtGSWWOCompatibility.h: new file
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15675 72102866-910b-0410-8b05-ffd578937521
2003-01-22 12:24:26 +00:00
|
|
|
return [NSString stringWithFormat:@"%@:Template Parser for template named %@ in framework %@ \nat %@ - ",
|
|
|
|
NSStringFromClass(isa),
|
2000-10-04 22:19:43 +00:00
|
|
|
_templateName,
|
|
|
|
_frameworkName,
|
|
|
|
_stringPath];
|
|
|
|
};
|
|
|
|
|
2002-11-18 11:14:55 +00:00
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(void)addErrorMessage:(NSString*)errorMessage
|
|
|
|
{
|
|
|
|
if (!_errorMessages)
|
|
|
|
_errorMessages=(NSMutableArray*)[NSMutableArray new];
|
|
|
|
[_errorMessages addObject:[NSString stringWithFormat:@"%@%@",
|
|
|
|
[self logPrefix],
|
|
|
|
errorMessage]];
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(void)addErrorMessageFormat:(NSString*)format
|
|
|
|
arguments:(va_list)arguments
|
|
|
|
{
|
|
|
|
NSString* string=[NSString stringWithFormat:format
|
|
|
|
arguments:arguments];
|
|
|
|
[self addErrorMessage:string];
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(void)addErrorMessageFormat:(NSString*)format,...
|
|
|
|
{
|
2004-05-16 15:57:09 +00:00
|
|
|
va_list ap;
|
2002-11-18 11:14:55 +00:00
|
|
|
va_start(ap,format);
|
|
|
|
[self addErrorMessageFormat:format
|
|
|
|
arguments:ap];
|
|
|
|
va_end(ap);
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSMutableArray*)errorMessages
|
|
|
|
{
|
|
|
|
return _errorMessages;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)errorMessagesAsText
|
|
|
|
{
|
|
|
|
return [[self errorMessages]componentsJoinedByString:@"\n"];
|
|
|
|
};
|
|
|
|
|
2000-10-04 22:19:43 +00:00
|
|
|
//--------------------------------------------------------------------
|
2004-04-06 11:17:41 +00:00
|
|
|
/** parse the template if it's not done and returns it
|
|
|
|
May raise exception
|
|
|
|
**/
|
2000-10-04 22:19:43 +00:00
|
|
|
-(GSWElement*)template
|
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if (!_template)
|
|
|
|
{
|
|
|
|
NSArray* elements=nil;
|
2004-03-25 08:35:25 +00:00
|
|
|
NSDictionary* declarations=nil;
|
|
|
|
declarations=[self declarations];
|
|
|
|
if (!declarations)
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
|
|
|
ExceptionRaise(@"GSWTemplateParser",
|
2004-03-25 08:35:25 +00:00
|
|
|
@"%@ Can't get declarations",
|
2000-10-04 22:19:43 +00:00
|
|
|
[self logPrefix]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
NSMutableArray* _classes=[NSMutableArray array];
|
|
|
|
BOOL createClassesOk=NO;
|
2004-03-25 08:35:25 +00:00
|
|
|
NSEnumerator* _enum = [declarationsElements objectEnumerator];
|
2000-10-04 22:19:43 +00:00
|
|
|
id _obj=nil;
|
|
|
|
NSString* _className=nil;
|
2004-03-25 08:35:25 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",@"template named:%@ declarationsElements=%@",aName,declarationsElements);
|
2000-10-04 22:19:43 +00:00
|
|
|
while ((_obj = [_enum nextObject]))
|
|
|
|
{
|
|
|
|
_className=[_obj className];
|
|
|
|
if (_className)
|
|
|
|
[_classes addObject:_className];
|
|
|
|
};
|
|
|
|
createClassesOk=YES;/[GSWApplication createUnknownComponentClasses:_classes superClassName:@"GSWComponent"];
|
|
|
|
if (createClassesOk)
|
|
|
|
{
|
|
|
|
*/
|
|
|
|
NS_DURING
|
|
|
|
{
|
|
|
|
elements=[self templateElements];
|
|
|
|
}
|
|
|
|
NS_HANDLER
|
|
|
|
{
|
|
|
|
LOGError(@"%@ Parse failed! Exception:%@",
|
|
|
|
[self logPrefix],
|
|
|
|
localException);
|
|
|
|
localException=ExceptionByAddingUserInfoObjectFrameInfo(localException,
|
|
|
|
@"%@ - In [htmlParser document] Parse failed!",
|
|
|
|
[self logPrefix]);
|
|
|
|
[localException retain];
|
|
|
|
[localException autorelease];
|
|
|
|
[localException raise];
|
|
|
|
}
|
|
|
|
NS_ENDHANDLER;
|
|
|
|
if (elements)
|
|
|
|
{
|
2001-10-25 Manuel Guesdon <mguesdon@orange-concept.com>
Applied patch from Turbocat (www.turbocat.de): GSWPatch_04-JUL_2001.diff
except GSWeb.framework/GSWInput.m/.h one (have to verify coherence of it)
* GSWAdaptors/common/GSWApp.c/.h: Added GSWAppInfo
* GSWAdaptors/common/GSWAppConnectNSSocket.c: Changes on includes
* GSWAdaptors/common/GSWLoadBalancing.h: Added parameter to GSWLoadBalancing_Find*
* GSWAdaptors/common/GSWLoadBalancing.c: added p_pURLComponents parameter,
o management of AppInfo
* GSWAdaptors/common/GSWAppRequest.c: managing refused connections
* GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswd: misspelling correction
* GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.html: Various Changes
* GSWExtensions.framework/GSWStatsPage.m: changes in login/password validation
o -awake added
* GSWeb.framework/GSWApplication.m/.h: Manage refusing new sessions
* GSWeb.framework/GSWBundle.m: debug traces commented
* GSWeb.framework/GSWComponent.m: implementation of ensureAwakeInContext:
* GSWeb.framework/GSWAssociation.m: special case for returned value of type GSMutableArray (Why ?)
* GSWeb.framework/GSWComponentRequestHandler.m: comments added
* GSWeb.framework/GSWDefaultAdaptorThread.m: added debug traces
* GSWeb.framework/GSWDirectActionRequestHandler.m: replaced GSWDirectAction by DirectAction
* GSWeb.framework/GSWDisplayGroup.m: initialize _baseIndex,
o correct misspelled names,
o added -description,
o use delegate in _changedInEditingContext:, _invalidatedAllObjectsInStore:,
o changes in -deleteObjectAtIndex:,
* GSWeb.framework/GSWFileUpload.m: different handling of _fileDatasCount,
handle bug in omniweb-browser
* GSWeb.framework/GSWHyperlink.m: added ensureAwakeInContext: call
* GSWeb.framework/GSWImageButton.m: added ensureAwakeInContext: call
* GSWeb.framework/GSWPopUpButton.m:
o use [response_ appendContentString:_noSelectionStringValue] instead of
[response_ appendContentHTMLString:_noSelectionStringValue]
o handle no displayString case
o use [response_ appendContentString:_displayStringValue] instead of
[response_ appendContentHTMLString:_displayStringValue]
* GSWeb.framework/GSWConfig.h: set GSWOPTVALUE_AutoOpenInBrowser to NO
* GSWeb.framework/GSWElementIDString.m: comment some debug traces
* GSWeb.framework/GSWHTMLStaticGroup.m/.h: added support of documentType
* GSWeb.framework/GSWHTMLURLValuedElement.m: addeded debug trace
* GSWeb.framework/GSWKeyValueAssociation.m: use NSStringFromClass([retValue class])
instead of [retValue class] for log
* GSWeb.framework/GSWRequest.m/.h: added -(NSDictionary*)headers;
o added test on _contentType in _contentType
o autorelease _dict in -uriElements
* GSWeb.framework/GSWResponse.m/.h: added -setHeaders: and -headers
o Added GSWResponse (GSWResponseRefused)
o return self in -generateResponse
* GSWeb.framework/GSWServerSessionStore.m/.h: added @interface GSWServerSessionStore (GSWServerSessionStoreInfo)
o added refusing session management
* GSWeb.framework/GSWSession.m:
o in -terminate forces to call removeSessionWithID in GSWServerSessionStore to dealloc it
* GSWeb.framework/GSWSessionTimeOutManager.m/.h: replace NSMutableOrderedArray* sessionOrderedTimeOuts;
by NSMutableArray* sessionOrderedTimeOuts;
o added traces
o added GSWSessionTimeOutManager (GSWSessionRefused)
* GSWeb.framework/GSWSubmitButton.m: raise exception if no element is returned
* GSWeb.framework/GSWTemplateParser.m: added doctype management
* GSWeb.framework/GSWUtils.h: added if defined for __NetBSD__
* GSWeb.framework/GSWWOCompatibility.m/.h: added WOGenericContainer, WOImageButton, WOHyperlink
* GSWeb.framework/attach.m: added if defined for __NetBSD__
* GSWeb.framework/stacktrace.m: added if defined for __NetBSD__
* GSWeb.framework/GSWTemplateParserXML.m: traces commented
o test XML node content before adding it
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m
o changes in -getIVarNamed: and in setIVarNamed:withValue: (use of sel+imp, tests on parameters)
* GSWAdaptors/common/GSWHTTPResponse.c: change in GSWHTTPResponse_GetResponse()
o debug traces removed
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@11251 72102866-910b-0410-8b05-ffd578937521
2001-10-26 08:50:52 +00:00
|
|
|
NSRange docTypeRangeStart=NSMakeRange(NSNotFound,0);
|
|
|
|
NSRange docTypeRangeEnd=NSMakeRange(NSNotFound,0);
|
|
|
|
|
2000-10-04 22:19:43 +00:00
|
|
|
_template=[[GSWHTMLStaticGroup alloc]initWithContentElements:elements];
|
2004-03-25 08:35:25 +00:00
|
|
|
[_template setDeclarationName:[NSString stringWithFormat:@"Template - %@",_templateName]];
|
2004-04-06 11:17:41 +00:00
|
|
|
|
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"template %p=%@",_template,_template);
|
2001-10-25 Manuel Guesdon <mguesdon@orange-concept.com>
Applied patch from Turbocat (www.turbocat.de): GSWPatch_04-JUL_2001.diff
except GSWeb.framework/GSWInput.m/.h one (have to verify coherence of it)
* GSWAdaptors/common/GSWApp.c/.h: Added GSWAppInfo
* GSWAdaptors/common/GSWAppConnectNSSocket.c: Changes on includes
* GSWAdaptors/common/GSWLoadBalancing.h: Added parameter to GSWLoadBalancing_Find*
* GSWAdaptors/common/GSWLoadBalancing.c: added p_pURLComponents parameter,
o management of AppInfo
* GSWAdaptors/common/GSWAppRequest.c: managing refused connections
* GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswd: misspelling correction
* GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.html: Various Changes
* GSWExtensions.framework/GSWStatsPage.m: changes in login/password validation
o -awake added
* GSWeb.framework/GSWApplication.m/.h: Manage refusing new sessions
* GSWeb.framework/GSWBundle.m: debug traces commented
* GSWeb.framework/GSWComponent.m: implementation of ensureAwakeInContext:
* GSWeb.framework/GSWAssociation.m: special case for returned value of type GSMutableArray (Why ?)
* GSWeb.framework/GSWComponentRequestHandler.m: comments added
* GSWeb.framework/GSWDefaultAdaptorThread.m: added debug traces
* GSWeb.framework/GSWDirectActionRequestHandler.m: replaced GSWDirectAction by DirectAction
* GSWeb.framework/GSWDisplayGroup.m: initialize _baseIndex,
o correct misspelled names,
o added -description,
o use delegate in _changedInEditingContext:, _invalidatedAllObjectsInStore:,
o changes in -deleteObjectAtIndex:,
* GSWeb.framework/GSWFileUpload.m: different handling of _fileDatasCount,
handle bug in omniweb-browser
* GSWeb.framework/GSWHyperlink.m: added ensureAwakeInContext: call
* GSWeb.framework/GSWImageButton.m: added ensureAwakeInContext: call
* GSWeb.framework/GSWPopUpButton.m:
o use [response_ appendContentString:_noSelectionStringValue] instead of
[response_ appendContentHTMLString:_noSelectionStringValue]
o handle no displayString case
o use [response_ appendContentString:_displayStringValue] instead of
[response_ appendContentHTMLString:_displayStringValue]
* GSWeb.framework/GSWConfig.h: set GSWOPTVALUE_AutoOpenInBrowser to NO
* GSWeb.framework/GSWElementIDString.m: comment some debug traces
* GSWeb.framework/GSWHTMLStaticGroup.m/.h: added support of documentType
* GSWeb.framework/GSWHTMLURLValuedElement.m: addeded debug trace
* GSWeb.framework/GSWKeyValueAssociation.m: use NSStringFromClass([retValue class])
instead of [retValue class] for log
* GSWeb.framework/GSWRequest.m/.h: added -(NSDictionary*)headers;
o added test on _contentType in _contentType
o autorelease _dict in -uriElements
* GSWeb.framework/GSWResponse.m/.h: added -setHeaders: and -headers
o Added GSWResponse (GSWResponseRefused)
o return self in -generateResponse
* GSWeb.framework/GSWServerSessionStore.m/.h: added @interface GSWServerSessionStore (GSWServerSessionStoreInfo)
o added refusing session management
* GSWeb.framework/GSWSession.m:
o in -terminate forces to call removeSessionWithID in GSWServerSessionStore to dealloc it
* GSWeb.framework/GSWSessionTimeOutManager.m/.h: replace NSMutableOrderedArray* sessionOrderedTimeOuts;
by NSMutableArray* sessionOrderedTimeOuts;
o added traces
o added GSWSessionTimeOutManager (GSWSessionRefused)
* GSWeb.framework/GSWSubmitButton.m: raise exception if no element is returned
* GSWeb.framework/GSWTemplateParser.m: added doctype management
* GSWeb.framework/GSWUtils.h: added if defined for __NetBSD__
* GSWeb.framework/GSWWOCompatibility.m/.h: added WOGenericContainer, WOImageButton, WOHyperlink
* GSWeb.framework/attach.m: added if defined for __NetBSD__
* GSWeb.framework/stacktrace.m: added if defined for __NetBSD__
* GSWeb.framework/GSWTemplateParserXML.m: traces commented
o test XML node content before adding it
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m
o changes in -getIVarNamed: and in setIVarNamed:withValue: (use of sel+imp, tests on parameters)
* GSWAdaptors/common/GSWHTTPResponse.c: change in GSWHTTPResponse_GetResponse()
o debug traces removed
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@11251 72102866-910b-0410-8b05-ffd578937521
2001-10-26 08:50:52 +00:00
|
|
|
|
|
|
|
docTypeRangeStart=[_string rangeOfString:@"<!DOCTYPE"];
|
|
|
|
if (docTypeRangeStart.length) {
|
|
|
|
docTypeRangeEnd=[_string rangeOfString:@">"];
|
|
|
|
if (docTypeRangeEnd.length) {
|
|
|
|
if (docTypeRangeStart.location < docTypeRangeEnd.location)
|
|
|
|
{
|
2003-03-21 14:32:57 +00:00
|
|
|
[(GSWHTMLStaticGroup*)_template setDocumentTypeString:
|
|
|
|
[_string substringFromRange:
|
|
|
|
NSMakeRange(docTypeRangeStart.location,
|
|
|
|
docTypeRangeEnd.location - docTypeRangeStart.location + 1)]];
|
2001-10-25 Manuel Guesdon <mguesdon@orange-concept.com>
Applied patch from Turbocat (www.turbocat.de): GSWPatch_04-JUL_2001.diff
except GSWeb.framework/GSWInput.m/.h one (have to verify coherence of it)
* GSWAdaptors/common/GSWApp.c/.h: Added GSWAppInfo
* GSWAdaptors/common/GSWAppConnectNSSocket.c: Changes on includes
* GSWAdaptors/common/GSWLoadBalancing.h: Added parameter to GSWLoadBalancing_Find*
* GSWAdaptors/common/GSWLoadBalancing.c: added p_pURLComponents parameter,
o management of AppInfo
* GSWAdaptors/common/GSWAppRequest.c: managing refused connections
* GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswd: misspelling correction
* GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.html: Various Changes
* GSWExtensions.framework/GSWStatsPage.m: changes in login/password validation
o -awake added
* GSWeb.framework/GSWApplication.m/.h: Manage refusing new sessions
* GSWeb.framework/GSWBundle.m: debug traces commented
* GSWeb.framework/GSWComponent.m: implementation of ensureAwakeInContext:
* GSWeb.framework/GSWAssociation.m: special case for returned value of type GSMutableArray (Why ?)
* GSWeb.framework/GSWComponentRequestHandler.m: comments added
* GSWeb.framework/GSWDefaultAdaptorThread.m: added debug traces
* GSWeb.framework/GSWDirectActionRequestHandler.m: replaced GSWDirectAction by DirectAction
* GSWeb.framework/GSWDisplayGroup.m: initialize _baseIndex,
o correct misspelled names,
o added -description,
o use delegate in _changedInEditingContext:, _invalidatedAllObjectsInStore:,
o changes in -deleteObjectAtIndex:,
* GSWeb.framework/GSWFileUpload.m: different handling of _fileDatasCount,
handle bug in omniweb-browser
* GSWeb.framework/GSWHyperlink.m: added ensureAwakeInContext: call
* GSWeb.framework/GSWImageButton.m: added ensureAwakeInContext: call
* GSWeb.framework/GSWPopUpButton.m:
o use [response_ appendContentString:_noSelectionStringValue] instead of
[response_ appendContentHTMLString:_noSelectionStringValue]
o handle no displayString case
o use [response_ appendContentString:_displayStringValue] instead of
[response_ appendContentHTMLString:_displayStringValue]
* GSWeb.framework/GSWConfig.h: set GSWOPTVALUE_AutoOpenInBrowser to NO
* GSWeb.framework/GSWElementIDString.m: comment some debug traces
* GSWeb.framework/GSWHTMLStaticGroup.m/.h: added support of documentType
* GSWeb.framework/GSWHTMLURLValuedElement.m: addeded debug trace
* GSWeb.framework/GSWKeyValueAssociation.m: use NSStringFromClass([retValue class])
instead of [retValue class] for log
* GSWeb.framework/GSWRequest.m/.h: added -(NSDictionary*)headers;
o added test on _contentType in _contentType
o autorelease _dict in -uriElements
* GSWeb.framework/GSWResponse.m/.h: added -setHeaders: and -headers
o Added GSWResponse (GSWResponseRefused)
o return self in -generateResponse
* GSWeb.framework/GSWServerSessionStore.m/.h: added @interface GSWServerSessionStore (GSWServerSessionStoreInfo)
o added refusing session management
* GSWeb.framework/GSWSession.m:
o in -terminate forces to call removeSessionWithID in GSWServerSessionStore to dealloc it
* GSWeb.framework/GSWSessionTimeOutManager.m/.h: replace NSMutableOrderedArray* sessionOrderedTimeOuts;
by NSMutableArray* sessionOrderedTimeOuts;
o added traces
o added GSWSessionTimeOutManager (GSWSessionRefused)
* GSWeb.framework/GSWSubmitButton.m: raise exception if no element is returned
* GSWeb.framework/GSWTemplateParser.m: added doctype management
* GSWeb.framework/GSWUtils.h: added if defined for __NetBSD__
* GSWeb.framework/GSWWOCompatibility.m/.h: added WOGenericContainer, WOImageButton, WOHyperlink
* GSWeb.framework/attach.m: added if defined for __NetBSD__
* GSWeb.framework/stacktrace.m: added if defined for __NetBSD__
* GSWeb.framework/GSWTemplateParserXML.m: traces commented
o test XML node content before adding it
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m
o changes in -getIVarNamed: and in setIVarNamed:withValue: (use of sel+imp, tests on parameters)
* GSWAdaptors/common/GSWHTTPResponse.c: change in GSWHTTPResponse_GetResponse()
o debug traces removed
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@11251 72102866-910b-0410-8b05-ffd578937521
2001-10-26 08:50:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2000-10-04 22:19:43 +00:00
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2000-10-04 22:19:43 +00:00
|
|
|
LOGObjectFnStop();
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2000-10-04 22:19:43 +00:00
|
|
|
return _template;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2000-10-04 22:19:43 +00:00
|
|
|
-(NSArray*)templateElements
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2000-10-04 22:19:43 +00:00
|
|
|
[self subclassResponsibility: _cmd];
|
|
|
|
return nil;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2004-04-06 11:17:41 +00:00
|
|
|
/** returns declarations from includedFilePath included from
|
|
|
|
declaration file in framework named frameworkName
|
|
|
|
|
|
|
|
Method for GSWDeclarationParserPragmaDelegate protocol
|
|
|
|
**/
|
2004-03-25 08:35:25 +00:00
|
|
|
-(NSDictionary*)includedDeclarationsFromFilePath:(NSString*)includedFilePath
|
|
|
|
fromFrameworkNamed:(NSString*)frameworkName
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
2004-03-25 08:35:25 +00:00
|
|
|
NSDictionary* declarations=nil;
|
2000-10-04 22:19:43 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
NSString* declarationFrameworkName=nil;
|
|
|
|
NSString* declarationFileName=nil;
|
2002-08-04 18:00:11 +00:00
|
|
|
GSWResourceManager* resourceManager=nil;
|
|
|
|
NSString* path=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
int iLanguage=0;
|
2002-10-12 11:27:50 +00:00
|
|
|
BOOL isPathAlreadyProcessed=NO;
|
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-10-12 11:27:50 +00:00
|
|
|
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"Template includedDeclarationsFromFilePath:%@",
|
|
|
|
includedFilePath);
|
2002-10-12 11:27:50 +00:00
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
resourceManager=[GSWApp resourceManager];
|
2004-03-25 08:35:25 +00:00
|
|
|
|
|
|
|
declarationFileName=[includedFilePath lastPathComponent];
|
|
|
|
declarationFrameworkName=[includedFilePath stringByDeletingLastPathComponent];
|
|
|
|
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"Template includedDeclarationsFromFilePath: '%@' declarationFileName=%@",
|
2004-03-25 08:35:25 +00:00
|
|
|
includedFilePath,declarationFileName);
|
2004-04-06 11:17:41 +00:00
|
|
|
|
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"Template includedDeclarationsFromFilePath: '%@' declarationFrameworkName=%@",
|
2004-03-25 08:35:25 +00:00
|
|
|
includedFilePath,declarationFrameworkName);
|
|
|
|
|
|
|
|
if ([declarationFrameworkName length]==0)
|
|
|
|
{
|
|
|
|
declarationFrameworkName=frameworkName;
|
|
|
|
if ([declarationFrameworkName length]==0)
|
|
|
|
{
|
|
|
|
declarationFrameworkName=_frameworkName;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"declarationFrameworkName=%@",
|
|
|
|
declarationFrameworkName);
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
for(iLanguage=0;iLanguage<=[_languages count] && !path;iLanguage++)
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
2004-03-25 08:35:25 +00:00
|
|
|
NSString* language=nil;
|
|
|
|
int iName=0;
|
2000-10-04 22:19:43 +00:00
|
|
|
if (iLanguage<[_languages count])
|
2002-08-04 18:00:11 +00:00
|
|
|
language=[_languages objectAtIndex:iLanguage];
|
2000-10-04 22:19:43 +00:00
|
|
|
else
|
2002-08-04 18:00:11 +00:00
|
|
|
language=nil;
|
|
|
|
for(iName=0;!path && iName<2;iName++)
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
2004-03-25 08:35:25 +00:00
|
|
|
NSString* resourceName=nil;
|
|
|
|
NSString* completeResourceName=nil;
|
|
|
|
resourceName=[declarationFileName stringByAppendingString:
|
|
|
|
GSWPagePSuffix[GSWebNamingConvForRound(iName)]];
|
|
|
|
completeResourceName=[declarationFileName stringByAppendingString:
|
|
|
|
GSWComponentDeclarationsPSuffix[GSWebNamingConvForRound(iName)]];
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"resourceName=%@ completeResourceName=%@ declarationFileName=%@",
|
2002-08-04 18:00:11 +00:00
|
|
|
resourceName,
|
2004-03-25 08:35:25 +00:00
|
|
|
completeResourceName,
|
|
|
|
declarationFileName);
|
2004-04-06 11:17:41 +00:00
|
|
|
|
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"Search %@ Language=%@",resourceName,language);
|
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
path=[resourceManager pathForResourceNamed:resourceName
|
2004-03-25 08:35:25 +00:00
|
|
|
inFramework:declarationFrameworkName
|
2002-08-04 18:00:11 +00:00
|
|
|
language:language];
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"Search In Page Component: language=%@ path=%@ _processedDeclarationsFilePaths=%@",
|
2002-08-04 18:00:11 +00:00
|
|
|
language,
|
|
|
|
path,
|
2004-03-25 08:35:25 +00:00
|
|
|
_processedDeclarationsFilePaths);
|
2002-08-04 18:00:11 +00:00
|
|
|
if (path)
|
2001-03-11 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWWOCompatibility.h/.m: added
* GSWeb.framework/GNUmakefile: added GSWWOCompatibility.h/.m
* GSWeb.framework/GSWApplication.h/m: added WOApplicationMain, handle WO/GSWeb names
* GSWeb.framework/GSWContext.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWConstants.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWDynamicURLString.m: handle WO/GSWeb names
* GSWeb.framework/GSWProjectBundle.m/.h: handle WO/GSWeb names, suppress warnings
* GSWeb.framework/GSWSession.m: handle WO/GSWeb names
* GSWeb.framework/GSWRequest.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParser.m: handle WO/GSWeb names,
added tag counts to help errors hunt
* GSWeb.framework/GSWBundle.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWResourceManager.m: handle WO/GSWeb names
* GSWeb.framework/GSWURLValuedElementData.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectAction.m: handle WO/GSWeb names
* GSWeb.framework/GSWForm.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWHyperlink.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWResourceRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectActionRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWActiveImage.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWBindingNameAssociation.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWBrowser.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponent.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWHTMLURLValuedElement.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWImageButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWInput.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWPopUpButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWString.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWAssociation.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBox.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBoxList.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentDefinition.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButton.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButtonList.m: handle WO/GSWeb names
* GSWeb.framework/GSWText.m: handle WO/GSWeb names
* GSWeb.framework/GSWTextField.m: handle WO/GSWeb names
* GSWeb.framework/GSWDeployedBundle.m: warnings
* GSWeb.framework/GSWeb.h: added include GSWeb/GSWSessionTimeOut.h, GSWWOCompatibility.h
* GSWeb.framework/GSWAdaptor.m: traces
* GSWeb.framework/GSWDefaultAdaptor.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWDefaultAdaptorThread.m/.h: handle WO/GSWeb names
* GSWeb.framework/NSNonBlockingFileHandle.m: added traces
* GSWeb.framework/GSWTemplateParserANTLR.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParserXML.m: handle WO/GSWeb names
added tag count to help errors hunt
remove "Tag gsweb invalid" message
handle unicode strings in node content traces
remove html and body tags if they are not present in the template
* GSWeb.framework/GSWTemplateParseXML.h: added ivar _isHTMLTag, _isBodyTag
* GSWeb.framework/GSWSessionTimeOutManager.m: dealloc sessionOrderedTimeOuts instead
of deallocating 2 times sessionTimeOuts
* GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch, Encode french characters
* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch
* GSWHTMLBareString.m: handle unicode strings in description
* GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html:
Encode french characters, Tag Mismatch
* GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html:
Encode french characters
* GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html:
Encode french characters
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html:
Tag Mismatch
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd:
added convertHTMLEntities for strings
* GSWeb.framework/GSWRepetition.m: added traces, fix "count" property bug, standardize ivars
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m: added traces, handle underscored ivars search
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@9332 72102866-910b-0410-8b05-ffd578937521
2001-03-11 17:15:44 +00:00
|
|
|
{
|
2004-03-25 08:35:25 +00:00
|
|
|
path=[path stringByAppendingPathComponent:completeResourceName];
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",@"Found %@ Language=%@ : %@",resourceName,language,path);
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
if ([_processedDeclarationsFilePaths containsObject:path])
|
2001-03-11 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWWOCompatibility.h/.m: added
* GSWeb.framework/GNUmakefile: added GSWWOCompatibility.h/.m
* GSWeb.framework/GSWApplication.h/m: added WOApplicationMain, handle WO/GSWeb names
* GSWeb.framework/GSWContext.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWConstants.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWDynamicURLString.m: handle WO/GSWeb names
* GSWeb.framework/GSWProjectBundle.m/.h: handle WO/GSWeb names, suppress warnings
* GSWeb.framework/GSWSession.m: handle WO/GSWeb names
* GSWeb.framework/GSWRequest.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParser.m: handle WO/GSWeb names,
added tag counts to help errors hunt
* GSWeb.framework/GSWBundle.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWResourceManager.m: handle WO/GSWeb names
* GSWeb.framework/GSWURLValuedElementData.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectAction.m: handle WO/GSWeb names
* GSWeb.framework/GSWForm.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWHyperlink.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWResourceRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectActionRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWActiveImage.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWBindingNameAssociation.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWBrowser.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponent.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWHTMLURLValuedElement.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWImageButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWInput.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWPopUpButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWString.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWAssociation.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBox.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBoxList.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentDefinition.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButton.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButtonList.m: handle WO/GSWeb names
* GSWeb.framework/GSWText.m: handle WO/GSWeb names
* GSWeb.framework/GSWTextField.m: handle WO/GSWeb names
* GSWeb.framework/GSWDeployedBundle.m: warnings
* GSWeb.framework/GSWeb.h: added include GSWeb/GSWSessionTimeOut.h, GSWWOCompatibility.h
* GSWeb.framework/GSWAdaptor.m: traces
* GSWeb.framework/GSWDefaultAdaptor.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWDefaultAdaptorThread.m/.h: handle WO/GSWeb names
* GSWeb.framework/NSNonBlockingFileHandle.m: added traces
* GSWeb.framework/GSWTemplateParserANTLR.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParserXML.m: handle WO/GSWeb names
added tag count to help errors hunt
remove "Tag gsweb invalid" message
handle unicode strings in node content traces
remove html and body tags if they are not present in the template
* GSWeb.framework/GSWTemplateParseXML.h: added ivar _isHTMLTag, _isBodyTag
* GSWeb.framework/GSWSessionTimeOutManager.m: dealloc sessionOrderedTimeOuts instead
of deallocating 2 times sessionTimeOuts
* GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch, Encode french characters
* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch
* GSWHTMLBareString.m: handle unicode strings in description
* GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html:
Encode french characters, Tag Mismatch
* GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html:
Encode french characters
* GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html:
Encode french characters
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html:
Tag Mismatch
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd:
added convertHTMLEntities for strings
* GSWeb.framework/GSWRepetition.m: added traces, fix "count" property bug, standardize ivars
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m: added traces, handle underscored ivars search
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@9332 72102866-910b-0410-8b05-ffd578937521
2001-03-11 17:15:44 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",@"path=%@ already processed",path);
|
|
|
|
path=nil;
|
2002-10-12 11:27:50 +00:00
|
|
|
isPathAlreadyProcessed=YES;
|
2002-08-04 18:00:11 +00:00
|
|
|
if (language)
|
2001-03-11 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWWOCompatibility.h/.m: added
* GSWeb.framework/GNUmakefile: added GSWWOCompatibility.h/.m
* GSWeb.framework/GSWApplication.h/m: added WOApplicationMain, handle WO/GSWeb names
* GSWeb.framework/GSWContext.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWConstants.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWDynamicURLString.m: handle WO/GSWeb names
* GSWeb.framework/GSWProjectBundle.m/.h: handle WO/GSWeb names, suppress warnings
* GSWeb.framework/GSWSession.m: handle WO/GSWeb names
* GSWeb.framework/GSWRequest.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParser.m: handle WO/GSWeb names,
added tag counts to help errors hunt
* GSWeb.framework/GSWBundle.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWResourceManager.m: handle WO/GSWeb names
* GSWeb.framework/GSWURLValuedElementData.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectAction.m: handle WO/GSWeb names
* GSWeb.framework/GSWForm.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWHyperlink.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWResourceRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectActionRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWActiveImage.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWBindingNameAssociation.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWBrowser.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponent.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWHTMLURLValuedElement.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWImageButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWInput.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWPopUpButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWString.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWAssociation.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBox.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBoxList.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentDefinition.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButton.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButtonList.m: handle WO/GSWeb names
* GSWeb.framework/GSWText.m: handle WO/GSWeb names
* GSWeb.framework/GSWTextField.m: handle WO/GSWeb names
* GSWeb.framework/GSWDeployedBundle.m: warnings
* GSWeb.framework/GSWeb.h: added include GSWeb/GSWSessionTimeOut.h, GSWWOCompatibility.h
* GSWeb.framework/GSWAdaptor.m: traces
* GSWeb.framework/GSWDefaultAdaptor.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWDefaultAdaptorThread.m/.h: handle WO/GSWeb names
* GSWeb.framework/NSNonBlockingFileHandle.m: added traces
* GSWeb.framework/GSWTemplateParserANTLR.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParserXML.m: handle WO/GSWeb names
added tag count to help errors hunt
remove "Tag gsweb invalid" message
handle unicode strings in node content traces
remove html and body tags if they are not present in the template
* GSWeb.framework/GSWTemplateParseXML.h: added ivar _isHTMLTag, _isBodyTag
* GSWeb.framework/GSWSessionTimeOutManager.m: dealloc sessionOrderedTimeOuts instead
of deallocating 2 times sessionTimeOuts
* GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch, Encode french characters
* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch
* GSWHTMLBareString.m: handle unicode strings in description
* GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html:
Encode french characters, Tag Mismatch
* GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html:
Encode french characters
* GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html:
Encode french characters
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html:
Tag Mismatch
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd:
added convertHTMLEntities for strings
* GSWeb.framework/GSWRepetition.m: added traces, fix "count" property bug, standardize ivars
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m: added traces, handle underscored ivars search
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@9332 72102866-910b-0410-8b05-ffd578937521
2001-03-11 17:15:44 +00:00
|
|
|
iLanguage=[_languages count]-1;//For directly go to no language search so we don't include (for exemple) an English file for a french file
|
|
|
|
};
|
|
|
|
};
|
2002-08-04 18:00:11 +00:00
|
|
|
if (!path)
|
2001-03-11 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWWOCompatibility.h/.m: added
* GSWeb.framework/GNUmakefile: added GSWWOCompatibility.h/.m
* GSWeb.framework/GSWApplication.h/m: added WOApplicationMain, handle WO/GSWeb names
* GSWeb.framework/GSWContext.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWConstants.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWDynamicURLString.m: handle WO/GSWeb names
* GSWeb.framework/GSWProjectBundle.m/.h: handle WO/GSWeb names, suppress warnings
* GSWeb.framework/GSWSession.m: handle WO/GSWeb names
* GSWeb.framework/GSWRequest.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParser.m: handle WO/GSWeb names,
added tag counts to help errors hunt
* GSWeb.framework/GSWBundle.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWResourceManager.m: handle WO/GSWeb names
* GSWeb.framework/GSWURLValuedElementData.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectAction.m: handle WO/GSWeb names
* GSWeb.framework/GSWForm.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWHyperlink.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWResourceRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectActionRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWActiveImage.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWBindingNameAssociation.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWBrowser.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponent.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWHTMLURLValuedElement.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWImageButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWInput.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWPopUpButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWString.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWAssociation.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBox.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBoxList.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentDefinition.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButton.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButtonList.m: handle WO/GSWeb names
* GSWeb.framework/GSWText.m: handle WO/GSWeb names
* GSWeb.framework/GSWTextField.m: handle WO/GSWeb names
* GSWeb.framework/GSWDeployedBundle.m: warnings
* GSWeb.framework/GSWeb.h: added include GSWeb/GSWSessionTimeOut.h, GSWWOCompatibility.h
* GSWeb.framework/GSWAdaptor.m: traces
* GSWeb.framework/GSWDefaultAdaptor.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWDefaultAdaptorThread.m/.h: handle WO/GSWeb names
* GSWeb.framework/NSNonBlockingFileHandle.m: added traces
* GSWeb.framework/GSWTemplateParserANTLR.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParserXML.m: handle WO/GSWeb names
added tag count to help errors hunt
remove "Tag gsweb invalid" message
handle unicode strings in node content traces
remove html and body tags if they are not present in the template
* GSWeb.framework/GSWTemplateParseXML.h: added ivar _isHTMLTag, _isBodyTag
* GSWeb.framework/GSWSessionTimeOutManager.m: dealloc sessionOrderedTimeOuts instead
of deallocating 2 times sessionTimeOuts
* GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch, Encode french characters
* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch
* GSWHTMLBareString.m: handle unicode strings in description
* GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html:
Encode french characters, Tag Mismatch
* GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html:
Encode french characters
* GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html:
Encode french characters
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html:
Tag Mismatch
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd:
added convertHTMLEntities for strings
* GSWeb.framework/GSWRepetition.m: added traces, fix "count" property bug, standardize ivars
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m: added traces, handle underscored ivars search
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@9332 72102866-910b-0410-8b05-ffd578937521
2001-03-11 17:15:44 +00:00
|
|
|
{
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"Direct Search %@ Language=%@",
|
|
|
|
completeResourceName,language);
|
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
path=[resourceManager pathForResourceNamed:completeResourceName
|
|
|
|
inFramework:declarationFrameworkName
|
|
|
|
language:language];
|
2002-08-04 18:00:11 +00:00
|
|
|
if (path)
|
2001-03-11 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWWOCompatibility.h/.m: added
* GSWeb.framework/GNUmakefile: added GSWWOCompatibility.h/.m
* GSWeb.framework/GSWApplication.h/m: added WOApplicationMain, handle WO/GSWeb names
* GSWeb.framework/GSWContext.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWConstants.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWDynamicURLString.m: handle WO/GSWeb names
* GSWeb.framework/GSWProjectBundle.m/.h: handle WO/GSWeb names, suppress warnings
* GSWeb.framework/GSWSession.m: handle WO/GSWeb names
* GSWeb.framework/GSWRequest.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParser.m: handle WO/GSWeb names,
added tag counts to help errors hunt
* GSWeb.framework/GSWBundle.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWResourceManager.m: handle WO/GSWeb names
* GSWeb.framework/GSWURLValuedElementData.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectAction.m: handle WO/GSWeb names
* GSWeb.framework/GSWForm.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWHyperlink.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWResourceRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectActionRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWActiveImage.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWBindingNameAssociation.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWBrowser.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponent.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWHTMLURLValuedElement.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWImageButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWInput.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWPopUpButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWString.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWAssociation.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBox.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBoxList.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentDefinition.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButton.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButtonList.m: handle WO/GSWeb names
* GSWeb.framework/GSWText.m: handle WO/GSWeb names
* GSWeb.framework/GSWTextField.m: handle WO/GSWeb names
* GSWeb.framework/GSWDeployedBundle.m: warnings
* GSWeb.framework/GSWeb.h: added include GSWeb/GSWSessionTimeOut.h, GSWWOCompatibility.h
* GSWeb.framework/GSWAdaptor.m: traces
* GSWeb.framework/GSWDefaultAdaptor.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWDefaultAdaptorThread.m/.h: handle WO/GSWeb names
* GSWeb.framework/NSNonBlockingFileHandle.m: added traces
* GSWeb.framework/GSWTemplateParserANTLR.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParserXML.m: handle WO/GSWeb names
added tag count to help errors hunt
remove "Tag gsweb invalid" message
handle unicode strings in node content traces
remove html and body tags if they are not present in the template
* GSWeb.framework/GSWTemplateParseXML.h: added ivar _isHTMLTag, _isBodyTag
* GSWeb.framework/GSWSessionTimeOutManager.m: dealloc sessionOrderedTimeOuts instead
of deallocating 2 times sessionTimeOuts
* GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch, Encode french characters
* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch
* GSWHTMLBareString.m: handle unicode strings in description
* GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html:
Encode french characters, Tag Mismatch
* GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html:
Encode french characters
* GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html:
Encode french characters
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html:
Tag Mismatch
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd:
added convertHTMLEntities for strings
* GSWeb.framework/GSWRepetition.m: added traces, fix "count" property bug, standardize ivars
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m: added traces, handle underscored ivars search
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@9332 72102866-910b-0410-8b05-ffd578937521
2001-03-11 17:15:44 +00:00
|
|
|
{
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"Direct Found %@ Language=%@ : %@",
|
|
|
|
completeResourceName,language,path);
|
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
if ([_processedDeclarationsFilePaths containsObject:path])
|
2001-03-11 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWWOCompatibility.h/.m: added
* GSWeb.framework/GNUmakefile: added GSWWOCompatibility.h/.m
* GSWeb.framework/GSWApplication.h/m: added WOApplicationMain, handle WO/GSWeb names
* GSWeb.framework/GSWContext.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWConstants.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWDynamicURLString.m: handle WO/GSWeb names
* GSWeb.framework/GSWProjectBundle.m/.h: handle WO/GSWeb names, suppress warnings
* GSWeb.framework/GSWSession.m: handle WO/GSWeb names
* GSWeb.framework/GSWRequest.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParser.m: handle WO/GSWeb names,
added tag counts to help errors hunt
* GSWeb.framework/GSWBundle.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWResourceManager.m: handle WO/GSWeb names
* GSWeb.framework/GSWURLValuedElementData.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectAction.m: handle WO/GSWeb names
* GSWeb.framework/GSWForm.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWHyperlink.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWResourceRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectActionRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWActiveImage.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWBindingNameAssociation.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWBrowser.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponent.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWHTMLURLValuedElement.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWImageButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWInput.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWPopUpButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWString.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWAssociation.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBox.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBoxList.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentDefinition.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButton.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButtonList.m: handle WO/GSWeb names
* GSWeb.framework/GSWText.m: handle WO/GSWeb names
* GSWeb.framework/GSWTextField.m: handle WO/GSWeb names
* GSWeb.framework/GSWDeployedBundle.m: warnings
* GSWeb.framework/GSWeb.h: added include GSWeb/GSWSessionTimeOut.h, GSWWOCompatibility.h
* GSWeb.framework/GSWAdaptor.m: traces
* GSWeb.framework/GSWDefaultAdaptor.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWDefaultAdaptorThread.m/.h: handle WO/GSWeb names
* GSWeb.framework/NSNonBlockingFileHandle.m: added traces
* GSWeb.framework/GSWTemplateParserANTLR.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParserXML.m: handle WO/GSWeb names
added tag count to help errors hunt
remove "Tag gsweb invalid" message
handle unicode strings in node content traces
remove html and body tags if they are not present in the template
* GSWeb.framework/GSWTemplateParseXML.h: added ivar _isHTMLTag, _isBodyTag
* GSWeb.framework/GSWSessionTimeOutManager.m: dealloc sessionOrderedTimeOuts instead
of deallocating 2 times sessionTimeOuts
* GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch, Encode french characters
* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch
* GSWHTMLBareString.m: handle unicode strings in description
* GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html:
Encode french characters, Tag Mismatch
* GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html:
Encode french characters
* GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html:
Encode french characters
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html:
Tag Mismatch
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd:
added convertHTMLEntities for strings
* GSWeb.framework/GSWRepetition.m: added traces, fix "count" property bug, standardize ivars
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m: added traces, handle underscored ivars search
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@9332 72102866-910b-0410-8b05-ffd578937521
2001-03-11 17:15:44 +00:00
|
|
|
{
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"path=%@ already processed",path);
|
2002-08-04 18:00:11 +00:00
|
|
|
path=nil;
|
2002-10-12 11:27:50 +00:00
|
|
|
isPathAlreadyProcessed=YES;
|
2002-08-04 18:00:11 +00:00
|
|
|
if (language)
|
2001-03-11 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWWOCompatibility.h/.m: added
* GSWeb.framework/GNUmakefile: added GSWWOCompatibility.h/.m
* GSWeb.framework/GSWApplication.h/m: added WOApplicationMain, handle WO/GSWeb names
* GSWeb.framework/GSWContext.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWConstants.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWDynamicURLString.m: handle WO/GSWeb names
* GSWeb.framework/GSWProjectBundle.m/.h: handle WO/GSWeb names, suppress warnings
* GSWeb.framework/GSWSession.m: handle WO/GSWeb names
* GSWeb.framework/GSWRequest.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParser.m: handle WO/GSWeb names,
added tag counts to help errors hunt
* GSWeb.framework/GSWBundle.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWResourceManager.m: handle WO/GSWeb names
* GSWeb.framework/GSWURLValuedElementData.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectAction.m: handle WO/GSWeb names
* GSWeb.framework/GSWForm.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWHyperlink.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWResourceRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectActionRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWActiveImage.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWBindingNameAssociation.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWBrowser.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponent.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWHTMLURLValuedElement.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWImageButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWInput.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWPopUpButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWString.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWAssociation.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBox.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBoxList.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentDefinition.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButton.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButtonList.m: handle WO/GSWeb names
* GSWeb.framework/GSWText.m: handle WO/GSWeb names
* GSWeb.framework/GSWTextField.m: handle WO/GSWeb names
* GSWeb.framework/GSWDeployedBundle.m: warnings
* GSWeb.framework/GSWeb.h: added include GSWeb/GSWSessionTimeOut.h, GSWWOCompatibility.h
* GSWeb.framework/GSWAdaptor.m: traces
* GSWeb.framework/GSWDefaultAdaptor.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWDefaultAdaptorThread.m/.h: handle WO/GSWeb names
* GSWeb.framework/NSNonBlockingFileHandle.m: added traces
* GSWeb.framework/GSWTemplateParserANTLR.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParserXML.m: handle WO/GSWeb names
added tag count to help errors hunt
remove "Tag gsweb invalid" message
handle unicode strings in node content traces
remove html and body tags if they are not present in the template
* GSWeb.framework/GSWTemplateParseXML.h: added ivar _isHTMLTag, _isBodyTag
* GSWeb.framework/GSWSessionTimeOutManager.m: dealloc sessionOrderedTimeOuts instead
of deallocating 2 times sessionTimeOuts
* GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch, Encode french characters
* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch
* GSWHTMLBareString.m: handle unicode strings in description
* GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html:
Encode french characters, Tag Mismatch
* GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html:
Encode french characters
* GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html:
Encode french characters
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html:
Tag Mismatch
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd:
added convertHTMLEntities for strings
* GSWeb.framework/GSWRepetition.m: added traces, fix "count" property bug, standardize ivars
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m: added traces, handle underscored ivars search
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@9332 72102866-910b-0410-8b05-ffd578937521
2001-03-11 17:15:44 +00:00
|
|
|
iLanguage=[_languages count]-1;//For directly go to no language search so we don't include (for exemple) an English file for a french file
|
|
|
|
};
|
|
|
|
};
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"Direct Search in Component Declaration language=%@ path=%@ (_processedDeclarationsFilePaths=%@)",
|
2002-08-04 18:00:11 +00:00
|
|
|
language,
|
|
|
|
path,
|
2004-03-25 08:35:25 +00:00
|
|
|
_processedDeclarationsFilePaths);
|
2001-03-11 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWWOCompatibility.h/.m: added
* GSWeb.framework/GNUmakefile: added GSWWOCompatibility.h/.m
* GSWeb.framework/GSWApplication.h/m: added WOApplicationMain, handle WO/GSWeb names
* GSWeb.framework/GSWContext.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWConstants.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWDynamicURLString.m: handle WO/GSWeb names
* GSWeb.framework/GSWProjectBundle.m/.h: handle WO/GSWeb names, suppress warnings
* GSWeb.framework/GSWSession.m: handle WO/GSWeb names
* GSWeb.framework/GSWRequest.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParser.m: handle WO/GSWeb names,
added tag counts to help errors hunt
* GSWeb.framework/GSWBundle.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWResourceManager.m: handle WO/GSWeb names
* GSWeb.framework/GSWURLValuedElementData.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectAction.m: handle WO/GSWeb names
* GSWeb.framework/GSWForm.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWHyperlink.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWResourceRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWDirectActionRequestHandler.m: handle WO/GSWeb names
* GSWeb.framework/GSWActiveImage.m/.h: handle WO/GSWeb names
* GSWeb.framework/GSWBindingNameAssociation.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWBrowser.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponent.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWHTMLURLValuedElement.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWImageButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWInput.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWPopUpButton.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWString.h/.m: handle WO/GSWeb names
* GSWeb.framework/GSWAssociation.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBox.m: handle WO/GSWeb names
* GSWeb.framework/GSWCheckBoxList.m: handle WO/GSWeb names
* GSWeb.framework/GSWComponentDefinition.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButton.m: handle WO/GSWeb names
* GSWeb.framework/GSWRadioButtonList.m: handle WO/GSWeb names
* GSWeb.framework/GSWText.m: handle WO/GSWeb names
* GSWeb.framework/GSWTextField.m: handle WO/GSWeb names
* GSWeb.framework/GSWDeployedBundle.m: warnings
* GSWeb.framework/GSWeb.h: added include GSWeb/GSWSessionTimeOut.h, GSWWOCompatibility.h
* GSWeb.framework/GSWAdaptor.m: traces
* GSWeb.framework/GSWDefaultAdaptor.m: handle WO/GSWeb names, added traces
* GSWeb.framework/GSWDefaultAdaptorThread.m/.h: handle WO/GSWeb names
* GSWeb.framework/NSNonBlockingFileHandle.m: added traces
* GSWeb.framework/GSWTemplateParserANTLR.m: handle WO/GSWeb names
* GSWeb.framework/GSWTemplateParserXML.m: handle WO/GSWeb names
added tag count to help errors hunt
remove "Tag gsweb invalid" message
handle unicode strings in node content traces
remove html and body tags if they are not present in the template
* GSWeb.framework/GSWTemplateParseXML.h: added ivar _isHTMLTag, _isBodyTag
* GSWeb.framework/GSWSessionTimeOutManager.m: dealloc sessionOrderedTimeOuts instead
of deallocating 2 times sessionTimeOuts
* GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch, Encode french characters
* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.html:
tag mismatch
* GSWHTMLBareString.m: handle unicode strings in description
* GSWExtensions.framework/French.lproj/GSWExceptionPage.gswc/GSWExceptionPage.html:
Encode french characters, Tag Mismatch
* GSWExtensions.framework/French.lproj/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.html:
Encode french characters
* GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.html:
Encode french characters
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.html:
Tag Mismatch
* GSWExtensions.framework/GSWExceptionPage.gswc/GSWExceptionPage.gswd:
added convertHTMLEntities for strings
* GSWeb.framework/GSWRepetition.m: added traces, fix "count" property bug, standardize ivars
* GSWeb.framework/NSObject+IVarAccess+PerformSel.m: added traces, handle underscored ivars search
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@9332 72102866-910b-0410-8b05-ffd578937521
2001-03-11 17:15:44 +00:00
|
|
|
};
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"gswcomponents",
|
|
|
|
@"Search In Page Component: language=%@ path=%@ _processedDeclarationsFilePaths=%@",
|
2002-08-04 18:00:11 +00:00
|
|
|
language,
|
|
|
|
path,
|
2004-03-25 08:35:25 +00:00
|
|
|
_processedDeclarationsFilePaths);
|
2000-10-04 22:19:43 +00:00
|
|
|
};
|
|
|
|
};
|
2004-03-25 08:35:25 +00:00
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
if (path)
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
2004-03-25 08:35:25 +00:00
|
|
|
NSString* declarationsString=nil;
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",@"path=%@",path);
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
[_processedDeclarationsFilePaths addObject:path];
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
//NSString* pageDefPath=[path stringByAppendingString:_declarationsPath];
|
2000-10-04 22:19:43 +00:00
|
|
|
//TODO use encoding !
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
declarationsString=[NSString stringWithContentsOfFile:path];
|
2004-04-06 11:17:41 +00:00
|
|
|
|
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"ParseDeclarations path=%@: declarationsString:%@\n",path,declarationsString);
|
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
if (declarationsString)
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
2004-03-25 08:35:25 +00:00
|
|
|
declarations=[self parseDeclarationsString:declarationsString
|
|
|
|
named:declarationFileName
|
|
|
|
inFrameworkNamed:declarationFrameworkName];
|
2004-04-06 11:17:41 +00:00
|
|
|
|
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"declarations:%@\n",declarations);
|
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
if (!declarations)
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
2004-04-06 11:17:41 +00:00
|
|
|
LOGError(@"%@ Template componentDeclaration parse failed for "
|
|
|
|
@"included file:%@ in framework:%@ (processedFiles=%@)",
|
2000-10-04 22:19:43 +00:00
|
|
|
[self logPrefix],
|
2004-03-25 08:35:25 +00:00
|
|
|
declarationFileName,
|
|
|
|
declarationFrameworkName,
|
2004-05-14 11:47:28 +00:00
|
|
|
_processedDeclarationsFilePaths);
|
2000-10-04 22:19:43 +00:00
|
|
|
};
|
2004-03-25 08:35:25 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",@"declarations:%@\n",declarations);
|
2000-10-04 22:19:43 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ExceptionRaise(@"GSWTemplateParser",
|
2004-04-06 11:17:41 +00:00
|
|
|
@"%@ Can't load included component declaration "
|
|
|
|
@"named:%@ in framework:%@ (_processedDeclarationsFilePaths=%@)",
|
2000-10-04 22:19:43 +00:00
|
|
|
[self logPrefix],
|
2004-03-25 08:35:25 +00:00
|
|
|
declarationFileName,
|
|
|
|
declarationFrameworkName,
|
|
|
|
_processedDeclarationsFilePaths);
|
2000-10-04 22:19:43 +00:00
|
|
|
};
|
2004-03-25 08:35:25 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",@"declarations:%@\n",declarations);
|
2000-10-04 22:19:43 +00:00
|
|
|
}
|
2002-10-12 11:27:50 +00:00
|
|
|
else if (isPathAlreadyProcessed)
|
2004-04-06 11:17:41 +00:00
|
|
|
{
|
|
|
|
// Returns an empty dictionary
|
|
|
|
declarations=[NSDictionary dictionary];
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
else
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
|
|
|
ExceptionRaise(@"GSWTemplateParser",
|
2004-04-06 11:17:41 +00:00
|
|
|
@"%@ Can't find included component declaration "
|
|
|
|
@"named:%@ in framework:%@ (processedFiles=%@)",
|
2000-10-04 22:19:43 +00:00
|
|
|
[self logPrefix],
|
2004-03-25 08:35:25 +00:00
|
|
|
declarationFileName,
|
|
|
|
declarationFrameworkName,
|
|
|
|
_processedDeclarationsFilePaths);
|
2000-10-04 22:19:43 +00:00
|
|
|
};
|
2004-03-25 08:35:25 +00:00
|
|
|
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",@"Template componentDeclaration "
|
|
|
|
@"includeName:%@ declarations=%@",
|
2004-03-25 08:35:25 +00:00
|
|
|
includedFilePath,
|
|
|
|
declarations);
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2000-10-04 22:19:43 +00:00
|
|
|
LOGObjectFnStop();
|
2004-03-25 08:35:25 +00:00
|
|
|
|
|
|
|
return declarations;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2004-04-06 11:17:41 +00:00
|
|
|
/** parses declarations from _declarationsString if it has not been
|
|
|
|
parsed **/
|
2004-03-25 08:35:25 +00:00
|
|
|
-(void)parseDeclarations
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2000-10-04 22:19:43 +00:00
|
|
|
LOGObjectFnStart();
|
2004-03-25 08:35:25 +00:00
|
|
|
if (!_declarations)
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
2004-04-02 11:06:46 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",@"_declarationsFilePath=%@",
|
|
|
|
_declarationsFilePath);
|
2004-03-25 08:35:25 +00:00
|
|
|
if ([_declarationsString length]==0)
|
2000-10-04 22:19:43 +00:00
|
|
|
{
|
2004-03-25 08:35:25 +00:00
|
|
|
ASSIGN(_declarations,[NSDictionary dictionary]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
NSDictionary* declarations=nil;
|
|
|
|
|
|
|
|
DESTROY(_processedDeclarationsFilePaths);
|
2004-04-02 11:06:46 +00:00
|
|
|
ASSIGN(_processedDeclarationsFilePaths,
|
|
|
|
(_declarationsFilePath
|
|
|
|
? [NSMutableSet setWithObject:_declarationsFilePath]
|
|
|
|
: [NSMutableSet set]));
|
|
|
|
|
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"ParseDeclarations path=%@: declarationsString:%@\n",
|
|
|
|
_declarationsFilePath,_declarationsString);
|
2004-03-25 08:35:25 +00:00
|
|
|
declarations = [self parseDeclarationsString:_declarationsString
|
|
|
|
named:_templateName
|
|
|
|
inFrameworkNamed:_frameworkName];
|
|
|
|
|
|
|
|
ASSIGNCOPY(_declarations,declarations);
|
2000-10-04 22:19:43 +00:00
|
|
|
};
|
|
|
|
};
|
|
|
|
LOGObjectFnStop();
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
2000-10-04 22:19:43 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
//--------------------------------------------------------------------
|
2004-04-06 11:17:41 +00:00
|
|
|
/** parse declarationsString if it is not already done and returns
|
|
|
|
declarations **/
|
2004-03-25 08:35:25 +00:00
|
|
|
-(NSDictionary*)declarations
|
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if (!_declarations)
|
|
|
|
[self parseDeclarations];
|
|
|
|
LOGObjectFnStop();
|
|
|
|
return _declarations;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2004-04-06 11:17:41 +00:00
|
|
|
/** return declarations parsed from declarationsString
|
|
|
|
**/
|
2004-03-25 08:35:25 +00:00
|
|
|
-(NSDictionary*)parseDeclarationsString:(NSString*)declarationsString
|
|
|
|
named:(NSString*)declarationsName
|
|
|
|
inFrameworkNamed:(NSString*)declarationsFrameworkName
|
|
|
|
{
|
|
|
|
NSDictionary* declarations=nil;
|
|
|
|
GSWDeclarationParser* declarationParser=nil;
|
|
|
|
NSAutoreleasePool* arpParse=nil;
|
|
|
|
|
|
|
|
LOGObjectFnStart();
|
|
|
|
|
|
|
|
arpParse=[NSAutoreleasePool new];
|
|
|
|
GSWLogMemCF("New NSAutoreleasePool: %p",arpParse);
|
|
|
|
|
|
|
|
declarationParser=[GSWDeclarationParser declarationParserWithPragmaDelegate:self];
|
|
|
|
|
|
|
|
NSDebugMLLog(@"GSWTemplateParser",@"name:%@ declarationsString=%@",
|
|
|
|
declarationsName,
|
|
|
|
declarationsString);
|
|
|
|
NS_DURING
|
|
|
|
{
|
|
|
|
declarations=[declarationParser parseDeclarationString:declarationsString
|
|
|
|
named:declarationsName
|
|
|
|
inFrameworkNamed:declarationsFrameworkName];
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"declarations=%@",
|
|
|
|
declarations);
|
2004-03-25 08:35:25 +00:00
|
|
|
}
|
|
|
|
NS_HANDLER
|
|
|
|
{
|
|
|
|
NSDebugMLog(@"ERROR ! %@",localException);
|
|
|
|
NSDebugMLog(@"declarationsName=%@",declarationsName);//TODO
|
|
|
|
NSDebugMLog(@"[self logPrefix]=%@",[self logPrefix]);
|
|
|
|
LOGError(@"%@ name:%@ Declarations Parse failed!",
|
|
|
|
[self logPrefix],
|
|
|
|
declarationsName);
|
|
|
|
localException=ExceptionByAddingUserInfoObjectFrameInfo(localException,
|
|
|
|
@"%@ In [declarationsParser document]...",
|
|
|
|
[self logPrefix]);
|
|
|
|
[localException retain];
|
|
|
|
GSWLogMemCF("Destroy NSAutoreleasePool: %p",arpParse);
|
|
|
|
DESTROY(arpParse);
|
|
|
|
[localException autorelease];
|
|
|
|
[localException raise];
|
|
|
|
}
|
|
|
|
NS_ENDHANDLER;
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
NSDebugMLLog0(@"low",@"arpParse infos:\n");
|
|
|
|
[declarations retain];
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
NSDebugMLLog0(@"low",@"DESTROY(arpParse)\n");
|
|
|
|
GSWLogMemCF("Destroy NSAutoreleasePool: %p",arpParse);
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
DESTROY(arpParse);
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
NSDebugMLLog0(@"low",@"DESTROYED(arpParse)\n");
|
|
|
|
[declarations autorelease];
|
|
|
|
|
2004-04-06 11:17:41 +00:00
|
|
|
NSDebugMLLog(@"GSWTemplateParser",
|
|
|
|
@"declarations:%@\n",
|
|
|
|
declarations);
|
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
LOGObjectFnStop();
|
2004-04-06 11:17:41 +00:00
|
|
|
|
2004-03-25 08:35:25 +00:00
|
|
|
return declarations;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
@end
|
|
|
|
|