2002-08-04 18:00:11 +00:00
|
|
|
/** GSWHTMLURLValuedElement.m - <title>GSWeb: Class GSWHTMLURLValuedElement</title>
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
2002-08-04 18:00:11 +00:00
|
|
|
|
|
|
|
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
|
|
|
Date: Apr 1999
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
$Revision$
|
|
|
|
$Date$
|
2003-01-19 15:33:07 +00:00
|
|
|
$Id$
|
2002-08-04 18:00:11 +00:00
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
This file is part of the GNUstep Web Library.
|
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
<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-08-04 18:00:11 +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$")
|
2000-01-22 12:49:49 +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 GSWHTMLURLValuedElement
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(id)initWithName:(NSString*)aName
|
|
|
|
associations:(NSDictionary*)inAssociations
|
|
|
|
contentElements:(NSArray*)elements
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* urlAttributeName=nil;
|
|
|
|
NSString* valueAttributeName=nil;
|
|
|
|
NSMutableDictionary* associations=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStartC("GSWHTMLURLValuedElement");
|
2002-08-04 18:00:11 +00:00
|
|
|
urlAttributeName=[self urlAttributeName];//so what ?
|
|
|
|
valueAttributeName=[self valueAttributeName];//so what ?
|
|
|
|
|
|
|
|
associations=[NSMutableDictionary dictionaryWithDictionary:inAssociations];
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_src = [[associations objectForKey:src__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_src autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"src=%@",_src);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_value = [[associations objectForKey:value__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_value autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"value=%@",_value);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_pageName = [[associations objectForKey:pageName__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_pageName autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"pageName=%@",_pageName);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_filename = [[associations objectForKey:filename__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_filename autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"filename=%@",_filename);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_framework = [[associations objectForKey:framework__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_framework autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"framework=%@",_framework);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_data = [[associations objectForKey:data__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_data autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"data=%@",_data);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_mimeType = [[associations objectForKey:mimeType__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_mimeType autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"mimeType=%@",_mimeType);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_key = [[associations objectForKey:key__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_key autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"key=%@",_key);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_actionClass = [[associations objectForKey:actionClass__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_actionClass autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"actionClass=%@",_actionClass);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_directActionName = [[associations objectForKey:directActionName__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_directActionName autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"directActionName=%@",_directActionName);
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
_queryDictionary = [[associations objectForKey:queryDictionary__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_queryDictionary autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"queryDictionary=%@",_queryDictionary);
|
|
|
|
|
|
|
|
[associations removeObjectForKey:src__Key];
|
|
|
|
[associations removeObjectForKey:value__Key];
|
|
|
|
[associations removeObjectForKey:pageName__Key];
|
|
|
|
[associations removeObjectForKey:filename__Key];
|
|
|
|
[associations removeObjectForKey:framework__Key];
|
|
|
|
[associations removeObjectForKey:data__Key];
|
|
|
|
[associations removeObjectForKey:mimeType__Key];
|
|
|
|
[associations removeObjectForKey:key__Key];
|
|
|
|
[associations removeObjectForKey:actionClass__Key];
|
|
|
|
[associations removeObjectForKey:directActionName__Key];
|
|
|
|
[associations removeObjectForKey:queryDictionary__Key];
|
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
|
|
|
if (!WOStrictFlag)
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
//pageSetVarAssociations//GNUstepWeb only
|
2003-01-19 15:33:07 +00:00
|
|
|
NSDictionary* pageSetVarAssociations=[associations associationsWithoutPrefix:pageSetVar__Prefix__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
removeFrom:associations];
|
|
|
|
if ([pageSetVarAssociations count]>0)
|
|
|
|
{
|
|
|
|
ASSIGN(_pageSetVarAssociations,pageSetVarAssociations);
|
|
|
|
};
|
2003-01-19 15:33:07 +00:00
|
|
|
_pageSetVarAssociationsDynamic=[[associations objectForKey:pageSetVars__Key
|
2002-08-04 18:00:11 +00:00
|
|
|
withDefaultObject:[_pageSetVarAssociationsDynamic autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"_pageSetVarAssociationsDynamic=%@",_pageSetVarAssociationsDynamic);
|
2003-01-19 15:33:07 +00:00
|
|
|
|
|
|
|
_cidStore = [[associations objectForKey:cidStore__Key
|
|
|
|
withDefaultObject:[_cidStore autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"cidStore=%@",_cidStore);
|
|
|
|
|
|
|
|
_cidKey = [[associations objectForKey:cidKey__Key
|
|
|
|
withDefaultObject:[_cidKey autorelease]] retain];
|
|
|
|
NSDebugMLLog(@"gswdync",@"cidKey=%@",_cidKey);
|
|
|
|
|
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
[associations removeObjectForKey:pageSetVars__Key];
|
2003-01-19 15:33:07 +00:00
|
|
|
[associations removeObjectForKey:cidStore__Key];
|
|
|
|
[associations removeObjectForKey:cidKey__Key];
|
|
|
|
};
|
|
|
|
|
|
|
|
if ([associations count]>0)
|
|
|
|
{
|
|
|
|
ASSIGN(_otherQueryAssociations,([associations extractObjectsForKeysWithPrefix:@"?"
|
|
|
|
removePrefix:YES]));
|
|
|
|
if ([_otherQueryAssociations count]==0)
|
|
|
|
DESTROY(_otherQueryAssociations);
|
2003-11-24 12:05:48 +00:00
|
|
|
|
|
|
|
if (!WOStrictFlag)
|
|
|
|
{
|
|
|
|
ASSIGN(_otherPathQueryAssociations,([associations extractObjectsForKeysWithPrefix:@"!"
|
|
|
|
removePrefix:YES]));
|
|
|
|
if ([_otherPathQueryAssociations count]==0)
|
|
|
|
DESTROY(_otherPathQueryAssociations);
|
|
|
|
};
|
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
|
|
|
};
|
2003-01-19 15:33:07 +00:00
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
if ((self=[super initWithName:[self elementName]//NEW
|
2002-08-04 18:00:11 +00:00
|
|
|
attributeAssociations:associations
|
|
|
|
contentElements:elements]))
|
|
|
|
{
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStopC("GSWHTMLURLValuedElement");
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(void)dealloc
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
DESTROY(_src);
|
|
|
|
DESTROY(_value);
|
|
|
|
DESTROY(_pageName);
|
|
|
|
DESTROY(_pageSetVarAssociations);//GNUstepWeb only
|
|
|
|
DESTROY(_pageSetVarAssociationsDynamic);//GSWeb only
|
|
|
|
DESTROY(_filename);
|
|
|
|
DESTROY(_framework);
|
|
|
|
DESTROY(_data);
|
|
|
|
DESTROY(_mimeType);
|
|
|
|
DESTROY(_key);
|
|
|
|
DESTROY(_actionClass);
|
|
|
|
DESTROY(_directActionName);
|
|
|
|
DESTROY(_queryDictionary);
|
|
|
|
DESTROY(_otherQueryAssociations);
|
2003-11-24 12:05:48 +00:00
|
|
|
DESTROY(_otherPathQueryAssociations);
|
2003-01-19 15:33:07 +00:00
|
|
|
DESTROY(_cidStore);//GSWeb only
|
|
|
|
DESTROY(_cidKey);//GSWeb only
|
2000-01-22 12:49:49 +00:00
|
|
|
[super dealloc];
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)valueAttributeName
|
|
|
|
{
|
|
|
|
//Does nothing
|
|
|
|
return nil;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)urlAttributeName
|
|
|
|
{
|
|
|
|
//Does nothing
|
|
|
|
return nil;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)description
|
|
|
|
{
|
|
|
|
return [NSString stringWithFormat:@"<%s %p>",
|
2002-08-04 18:00:11 +00:00
|
|
|
object_get_class_name(self),
|
|
|
|
(void*)self];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation GSWHTMLURLValuedElement (GSWHTMLURLValuedElementA)
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(GSWElement*)invokeActionForRequest:(GSWRequest*)aRequest
|
|
|
|
inContext:(GSWContext*)aContext
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
GSWElement* element=nil;
|
|
|
|
NSString* senderID=nil;
|
|
|
|
NSString* elementID=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStartC("GSWHTMLURLValuedElement");
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[aContext elementID]);
|
|
|
|
senderID=[aContext senderID];
|
|
|
|
elementID=[aContext elementID];
|
|
|
|
NSDebugMLLog(@"gswdync",@"senderID=%@",senderID);
|
|
|
|
NSDebugMLLog(@"gswdync",@"elementID=%@",elementID);
|
|
|
|
NSDebugMLLog(@"gswdync",@"[elementID isEqualToString:senderID]=%d",(int)[elementID isEqualToString:senderID]);
|
|
|
|
if ([elementID isEqualToString:senderID])
|
|
|
|
{
|
|
|
|
GSWComponent* component=[aContext component];
|
|
|
|
if (_value)
|
2003-03-21 14:32:57 +00:00
|
|
|
{
|
|
|
|
element=[_value valueInComponent:component];
|
|
|
|
NSAssert4(!element || [element isKindOfClass:[GSWElement class]],
|
|
|
|
@"_value: %@ component: %@ Element is a %@ not a GSWElement: %@",
|
|
|
|
_value,
|
|
|
|
component,
|
|
|
|
[element class],
|
|
|
|
element);
|
|
|
|
}
|
2002-08-04 18:00:11 +00:00
|
|
|
else if (_pageName)
|
|
|
|
{
|
|
|
|
NSString* pageNameValue=[_pageName valueInComponent:component];
|
|
|
|
element=[GSWApp pageWithName:pageNameValue
|
|
|
|
inContext:aContext];
|
2003-03-21 14:32:57 +00:00
|
|
|
NSAssert3(!element || [element isKindOfClass:[GSWElement class]],
|
|
|
|
@"pageNameValue: %@ Element is a %@ not a GSWElement: %@",
|
|
|
|
pageNameValue,
|
|
|
|
[element class],
|
|
|
|
element);
|
2002-08-04 18:00:11 +00:00
|
|
|
if (!WOStrictFlag && element)//GNUstepWeb only
|
|
|
|
{
|
|
|
|
if (_pageSetVarAssociations)
|
|
|
|
{
|
|
|
|
[_pageSetVarAssociations associationsSetValuesFromObject:component
|
|
|
|
inObject:(GSWComponent*)element];
|
|
|
|
};
|
|
|
|
if (_pageSetVarAssociationsDynamic)
|
|
|
|
{
|
|
|
|
NSDictionary* assocs=[_pageSetVarAssociationsDynamic valueInComponent:component];
|
|
|
|
if (assocs)
|
|
|
|
{
|
|
|
|
if (![assocs isKindOfClass:[NSDictionary class]])
|
|
|
|
{
|
|
|
|
ExceptionRaise(@"GSWHTMLURLValuedElement",@"%@ (%@) must return a Dictionary, not a %@ like %@",
|
|
|
|
pageSetVars__Key,
|
|
|
|
_pageSetVarAssociationsDynamic,
|
|
|
|
[assocs class],
|
|
|
|
assocs);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
[assocs associationsSetValuesFromObject:component
|
|
|
|
inObject:(GSWComponent*)element];
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
NSDebugMLLog(@"gswdync",@"GSWHTMLURLValuedElement invoke element=%@",element);
|
|
|
|
//the end ?
|
|
|
|
//TODOV
|
|
|
|
if (!element)
|
2003-03-21 14:32:57 +00:00
|
|
|
{
|
|
|
|
element=[aContext page];
|
|
|
|
NSAssert2(!element || [element isKindOfClass:[GSWElement class]],
|
|
|
|
@"Element is a %@ not a GSWElement: %@",
|
|
|
|
[element class],
|
|
|
|
element);
|
|
|
|
};
|
2002-08-04 18:00:11 +00:00
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
else
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
element=[super invokeActionForRequest:aRequest
|
|
|
|
inContext:aContext];
|
2003-03-21 14:32:57 +00:00
|
|
|
NSAssert2(!element || [element isKindOfClass:[GSWElement class]],
|
|
|
|
@"Element is a %@ not a GSWElement: %@",
|
|
|
|
[element class],
|
|
|
|
element);
|
2002-08-04 18:00:11 +00:00
|
|
|
};
|
|
|
|
NSDebugMLLog(@"gswdync",@"GSWHTMLURLValuedElement invoke element=%@",element);
|
|
|
|
NSDebugMLLog(@"gswdync",@"senderID=%@",[aContext senderID]);
|
|
|
|
NSDebugMLLog(@"gswdync",@"elementID=%@",[aContext elementID]);
|
|
|
|
NSDebugMLLog(@"gswdync",@"END ET=%@ id=%@",[self class],[aContext elementID]);
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStopC("GSWHTMLURLValuedElement");
|
2002-08-04 18:00:11 +00:00
|
|
|
return element;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
2003-02-01 19:07:25 +00:00
|
|
|
@end
|
2000-01-22 12:49:49 +00:00
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation GSWHTMLURLValuedElement (GSWHTMLURLValuedElementB)
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)appendURLToResponse:(GSWResponse*)aResponse
|
|
|
|
inContext:(GSWContext*)aContext
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* urlAttributeName=nil;
|
|
|
|
NSString* url=nil;
|
|
|
|
GSWComponent* component=nil;
|
|
|
|
NSString* keyValue=nil;
|
|
|
|
id data=nil;
|
|
|
|
id mimeTypeValue=nil;
|
2003-01-19 15:33:07 +00:00
|
|
|
id cidStoreValue=nil;
|
2002-08-04 18:00:11 +00:00
|
|
|
GSWURLValuedElementData* dataValue=nil;
|
|
|
|
GSWResourceManager* resourceManager=nil;
|
2003-01-19 15:33:07 +00:00
|
|
|
|
|
|
|
LOGObjectFnStartC("GSWHTMLURLValuedElement");
|
|
|
|
NS_DURING
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"gswdync",@"elementID=%@",[aContext elementID]);
|
|
|
|
component=[aContext component];
|
|
|
|
NSDebugMLLog(@"gswdync",@"data=%@",_data);
|
|
|
|
NSDebugMLLog(@"gswdync",@"filename=%@",_filename);
|
|
|
|
NSDebugMLLog(@"gswdync",@"pageName=%@",_pageName);
|
2003-01-19 15:33:07 +00:00
|
|
|
|
|
|
|
cidStoreValue=[_cidStore valueInComponent:component];
|
|
|
|
NSDebugMLLog(@"gswdync",@"cidStoreValue=%@",cidStoreValue);
|
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
resourceManager=[[GSWApplication application]resourceManager];
|
2003-01-19 15:33:07 +00:00
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
if (_src)
|
2003-01-19 15:33:07 +00:00
|
|
|
{
|
|
|
|
url=[_src valueInComponent:component];
|
|
|
|
NSDebugMLLog(@"gswdync",@"url=%@",url);
|
|
|
|
if (cidStoreValue)
|
|
|
|
{
|
|
|
|
url=[self addURL:url
|
2004-03-01 16:45:58 +00:00
|
|
|
forCIDKeyAssociation:_cidKey
|
|
|
|
CIDStoreAssociation:_cidStore
|
2003-01-19 15:33:07 +00:00
|
|
|
inContext:aContext];
|
|
|
|
NSDebugMLLog(@"gswdync",@"url=%@",url);
|
|
|
|
};
|
|
|
|
}
|
|
|
|
else if (_actionClass || _directActionName)
|
|
|
|
{
|
|
|
|
url=(NSString*)[aContext componentActionURL];
|
|
|
|
NSDebugMLLog(@"gswdync",@"url=%@",url);
|
|
|
|
if (cidStoreValue)
|
|
|
|
{
|
|
|
|
url=[self addURL:url
|
2004-03-01 16:45:58 +00:00
|
|
|
forCIDKeyAssociation:_cidKey
|
|
|
|
CIDStoreAssociation:_cidStore
|
2003-01-19 15:33:07 +00:00
|
|
|
inContext:aContext];
|
|
|
|
NSDebugMLLog(@"gswdync",@"url=%@",url);
|
|
|
|
};
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
else
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
2003-01-19 15:33:07 +00:00
|
|
|
BOOL processed=NO;
|
2002-08-04 18:00:11 +00:00
|
|
|
if (_key)
|
|
|
|
{
|
|
|
|
keyValue=[_key valueInComponent:component];
|
2003-01-19 15:33:07 +00:00
|
|
|
NSDebugMLLog(@"gswdync",@"keyValue=%@",keyValue);
|
2002-08-04 18:00:11 +00:00
|
|
|
dataValue=[resourceManager _cachedDataForKey:keyValue];
|
2003-01-19 15:33:07 +00:00
|
|
|
NSDebugMLLog(@"gswdync",@"dataValue=%@",dataValue);
|
2002-08-04 18:00:11 +00:00
|
|
|
};
|
2003-01-19 15:33:07 +00:00
|
|
|
if (_data && !dataValue)
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
data=[_data valueInComponent:component];
|
|
|
|
NSDebugMLLog(@"gswdync",@"_data=%@",data);
|
|
|
|
mimeTypeValue=[_mimeType valueInComponent:component];
|
|
|
|
NSDebugMLLog(@"gswdync",@"mimeType=%@",_mimeType);
|
|
|
|
NSDebugMLLog(@"gswdync",@"mimeTypeValue=%@",mimeTypeValue);
|
|
|
|
dataValue=[[[GSWURLValuedElementData alloc] initWithData:data
|
|
|
|
mimeType:mimeTypeValue
|
|
|
|
key:nil] autorelease];
|
|
|
|
NSDebugMLLog(@"gswdync",@"dataValue=%@",dataValue);
|
|
|
|
[resourceManager setURLValuedElementData:dataValue];
|
2003-01-19 15:33:07 +00:00
|
|
|
processed=YES;
|
2002-08-04 18:00:11 +00:00
|
|
|
}
|
2003-01-19 15:33:07 +00:00
|
|
|
if (cidStoreValue && dataValue)
|
|
|
|
{
|
|
|
|
url=[self addURLValuedElementData:dataValue
|
2004-03-01 16:45:58 +00:00
|
|
|
forCIDKeyAssociation:_cidKey
|
|
|
|
CIDStoreAssociation:_cidStore
|
2003-01-19 15:33:07 +00:00
|
|
|
inContext:aContext];
|
|
|
|
NSDebugMLLog(@"gswdync",@"url=%@",url);
|
|
|
|
}
|
|
|
|
if (!processed && _filename)
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
//Exemple: Body with filename
|
|
|
|
id filenameValue=nil;
|
|
|
|
id frameworkValue=nil;
|
|
|
|
GSWRequest* request=nil;
|
|
|
|
NSArray* languages=nil;
|
|
|
|
NSDebugMLLog(@"gswdync",@"filename=%@",_filename);
|
|
|
|
filenameValue=[_filename valueInComponent:component];
|
|
|
|
NSDebugMLLog(@"gswdync",@"filenameValue=%@",filenameValue);
|
|
|
|
frameworkValue=[self frameworkNameInContext:aContext];
|
|
|
|
NSDebugMLLog(@"gswdync",@"frameworkValue=%@",frameworkValue);
|
|
|
|
request=[aContext request];
|
|
|
|
languages=[aContext languages];
|
2003-01-19 15:33:07 +00:00
|
|
|
if (cidStoreValue)
|
|
|
|
{
|
|
|
|
NSString* path=[resourceManager pathForResourceNamed:filenameValue
|
|
|
|
inFramework:frameworkValue
|
|
|
|
languages:languages];
|
|
|
|
url=[self addPath:path
|
2004-03-01 16:45:58 +00:00
|
|
|
forCIDKeyAssociation:_cidKey
|
|
|
|
CIDStoreAssociation:_cidStore
|
2003-01-19 15:33:07 +00:00
|
|
|
inContext:aContext];
|
|
|
|
NSDebugMLLog(@"gswdync",@"url=%@",url);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
url=[resourceManager urlForResourceNamed:filenameValue
|
|
|
|
inFramework:frameworkValue
|
|
|
|
languages:languages
|
|
|
|
request:request];
|
|
|
|
NSDebugMLLog(@"gswdync",@"url=%@",url);
|
|
|
|
};
|
2002-08-04 18:00:11 +00:00
|
|
|
};
|
|
|
|
};
|
|
|
|
[aResponse appendContentCharacter:' '];
|
|
|
|
urlAttributeName=[self urlAttributeName];
|
|
|
|
if (urlAttributeName)
|
|
|
|
{
|
|
|
|
[aResponse _appendContentAsciiString:urlAttributeName];
|
|
|
|
[aResponse _appendContentAsciiString:@"=\""];
|
|
|
|
};
|
|
|
|
if (_src)
|
|
|
|
{
|
|
|
|
[aResponse appendContentString:url];
|
|
|
|
}
|
2003-01-19 15:33:07 +00:00
|
|
|
else if (_actionClass || _directActionName)
|
|
|
|
{
|
|
|
|
[aResponse appendContentString:url];
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
else
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
2004-03-25 08:29:00 +00:00
|
|
|
if (dataValue)//_key || _data)
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
2003-01-19 15:33:07 +00:00
|
|
|
if (cidStoreValue)
|
|
|
|
[aResponse appendContentString:url];
|
|
|
|
else
|
|
|
|
[dataValue appendDataURLToResponse:aResponse
|
|
|
|
inContext:aContext];
|
2002-08-04 18:00:11 +00:00
|
|
|
}
|
|
|
|
else if (_filename)
|
|
|
|
{
|
|
|
|
NSDebugMLLog(@"gswdync",@"url = %@",url);
|
|
|
|
[aResponse appendContentString:url];
|
|
|
|
};
|
|
|
|
};
|
|
|
|
if (urlAttributeName)
|
|
|
|
[aResponse appendContentCharacter:'"'];
|
|
|
|
NSDebugMLLog(@"gswdync",@"_elementID=%@",[aContext elementID]);
|
2003-01-19 15:33:07 +00:00
|
|
|
}
|
|
|
|
NS_HANDLER
|
|
|
|
{
|
|
|
|
LOGException0(@"exception in GSWHTMLURLValuedElement appendToResponse:inContext");
|
|
|
|
LOGException(@"exception=%@",localException);
|
|
|
|
localException=ExceptionByAddingUserInfoObjectFrameInfo(localException,
|
|
|
|
@"In GSWHTMLURLValuedElement appendToResponse:inContext");
|
|
|
|
LOGException(@"exception=%@",localException);
|
|
|
|
[localException raise];
|
|
|
|
}
|
|
|
|
NS_ENDHANDLER;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStopC("GSWHTMLURLValuedElement");
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)appendGSWebObjectsAssociationsToResponse:(GSWResponse*)aResponse
|
|
|
|
inContext:(GSWContext*)aContext
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStartC("GSWHTMLURLValuedElement");
|
2002-08-04 18:00:11 +00:00
|
|
|
[self appendURLToResponse:aResponse
|
|
|
|
inContext:aContext];
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStopC("GSWHTMLURLValuedElement");
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)_appendCGIActionURLToResponse:(GSWResponse*)aResponse
|
|
|
|
inContext:(GSWContext*)aContext
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2003-01-19 15:33:07 +00:00
|
|
|
//OK
|
|
|
|
NSString* actionString=nil;
|
|
|
|
NSDictionary* queryDictionary=nil;
|
|
|
|
NSString* anUrl=nil;
|
|
|
|
LOGObjectFnStart();
|
|
|
|
|
|
|
|
actionString=[self computeActionStringInContext:aContext];
|
|
|
|
NSDebugMLLog(@"gswdync",@"actionString=%@",actionString);
|
|
|
|
|
|
|
|
queryDictionary=[self computeQueryDictionaryInContext:aContext];
|
|
|
|
NSDebugMLLog(@"gswdync",@"queryDictionary=%@",queryDictionary);
|
|
|
|
|
|
|
|
anUrl=(NSString*)[aContext directActionURLForActionNamed:actionString
|
|
|
|
queryDictionary:queryDictionary];
|
|
|
|
NSDebugMLLog(@"gswdync",@"anUrl=%@",anUrl);
|
|
|
|
|
|
|
|
[aResponse appendContentString:anUrl];
|
|
|
|
|
|
|
|
LOGObjectFnStop();
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2003-01-19 15:33:07 +00:00
|
|
|
-(NSString*)computeActionStringInContext:(GSWContext*)aContext
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2003-01-19 15:33:07 +00:00
|
|
|
NSString* actionString=nil;
|
|
|
|
LOGObjectFnStart();
|
|
|
|
actionString=[self computeActionStringWithActionClassAssociation:_actionClass
|
|
|
|
directActionNameAssociation:_directActionName
|
2003-11-24 12:05:48 +00:00
|
|
|
otherPathQueryAssociations:_otherPathQueryAssociations
|
2003-01-19 15:33:07 +00:00
|
|
|
inContext:aContext];
|
|
|
|
LOGObjectFnStop();
|
|
|
|
return actionString;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2003-01-19 15:33:07 +00:00
|
|
|
-(NSDictionary*)computeQueryDictionaryInContext:(GSWContext*)aContext
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2003-01-19 15:33:07 +00:00
|
|
|
NSDictionary* queryDictionary=nil;
|
|
|
|
LOGObjectFnStart();
|
|
|
|
queryDictionary=[self computeQueryDictionaryWithActionClassAssociation:_actionClass
|
|
|
|
directActionNameAssociation:_directActionName
|
|
|
|
queryDictionaryAssociation:_queryDictionary
|
|
|
|
otherQueryAssociations:_otherQueryAssociations
|
|
|
|
inContext:aContext];
|
|
|
|
LOGObjectFnStop();
|
|
|
|
return queryDictionary;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)frameworkNameInContext:(GSWContext*)aContext
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* frameworkName=nil;
|
|
|
|
GSWComponent* component=[aContext component];
|
|
|
|
NSDebugMLog(@"framework=%@",_framework);
|
|
|
|
if (_framework)
|
|
|
|
frameworkName=[_framework valueInComponent:component];
|
2000-01-22 12:49:49 +00:00
|
|
|
else
|
2002-08-04 18:00:11 +00:00
|
|
|
frameworkName=[component frameworkName];
|
|
|
|
return frameworkName;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
@end
|
2003-01-19 15:33:07 +00:00
|
|
|
|