2002-08-04 18:00:11 +00:00
|
|
|
/** GSWDynamicURLString.m - <title>GSWeb: Class GSWDynamicURLString</title>
|
|
|
|
|
|
|
|
Copyright (C) 1999-2002 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-08-04 18:00:11 +00:00
|
|
|
$Revision$
|
|
|
|
$Date$
|
|
|
|
|
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
|
|
|
|
|
|
|
static char rcsId[] = "$Id$";
|
|
|
|
|
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 GSWDynamicURLString
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)init
|
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
_url=[NSMutableString new];
|
|
|
|
NSDebugMLLog(@"low",@"url class=%@",[_url class]);
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithCharactersNoCopy:(unichar*)chars
|
2002-08-04 18:00:11 +00:00
|
|
|
length:(unsigned int)length
|
|
|
|
freeWhenDone:(BOOL)flag
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
_url=[[NSMutableString alloc]initWithCharactersNoCopy:chars
|
|
|
|
length:length
|
|
|
|
freeWhenDone:flag];
|
|
|
|
if (chars)
|
|
|
|
[self _parse];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithCharacters:(const unichar*)chars
|
2002-08-04 18:00:11 +00:00
|
|
|
length:(unsigned int)length
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
_url=[[NSMutableString alloc]initWithCharacters:chars
|
|
|
|
length:length];
|
|
|
|
if (chars)
|
|
|
|
[self _parse];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithCStringNoCopy:(char*)byteString
|
2002-08-04 18:00:11 +00:00
|
|
|
length:(unsigned int)length
|
|
|
|
freeWhenDone:(BOOL)flag
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
_url=[[NSMutableString alloc]initWithCStringNoCopy:byteString
|
|
|
|
length:length
|
|
|
|
freeWhenDone:flag];
|
|
|
|
if (byteString)
|
|
|
|
[self _parse];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithCString:(const char*)byteString
|
2002-08-04 18:00:11 +00:00
|
|
|
length:(unsigned int)length;
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
_url=[[NSMutableString alloc]initWithCString:byteString
|
|
|
|
length:length];
|
|
|
|
NSDebugMLLog(@"low",@"url=%@",_url);
|
|
|
|
NSDebugMLLog(@"low",@"url class=%@",[_url class]);
|
|
|
|
if (byteString)
|
|
|
|
[self _parse];
|
|
|
|
NSDebugMLLog(@"low",@"url=%@",_url);
|
|
|
|
NSDebugMLLog(@"low",@"url class=%@",[_url class]);
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithCString:(const char*)byteString;
|
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
NSDebugMLLog(@"low",@"byteString=%s",byteString);
|
|
|
|
_url=[[NSMutableString alloc]initWithCString:byteString];
|
|
|
|
if (byteString)
|
|
|
|
[self _parse];
|
|
|
|
NSDebugMLLog(@"low",@"url=%@",_url);
|
|
|
|
NSDebugMLLog(@"low",@"url class=%@",[_url class]);
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithString:(NSString*)string
|
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
_url=[[NSMutableString alloc]initWithString:string];
|
|
|
|
if (string)
|
|
|
|
[self _parse];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithFormat:(NSString*)format,...
|
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
va_start(ap,format);
|
|
|
|
_url=[[NSMutableString alloc]initWithFormat:format
|
|
|
|
arguments:ap];
|
|
|
|
va_end(ap);
|
|
|
|
[self _parse];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithFormat:(NSString*)format
|
2002-08-04 18:00:11 +00:00
|
|
|
arguments:(va_list)argList
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
_url=[[NSMutableString alloc]initWithFormat:format
|
|
|
|
arguments:argList];
|
|
|
|
[self _parse];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithData:(NSData*)data
|
2002-08-04 18:00:11 +00:00
|
|
|
encoding:(NSStringEncoding)encoding
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
_url=[[NSMutableString alloc]initWithData:data
|
|
|
|
encoding:encoding];
|
|
|
|
if (data)
|
|
|
|
[self _parse];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(id)initWithContentsOfFile:(NSString*)path
|
|
|
|
{
|
|
|
|
//OK
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
_url=[[NSMutableString alloc]initWithContentsOfFile:path];
|
|
|
|
[self _parse];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(void)dealloc
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
DESTROY(_url);
|
|
|
|
DESTROY(_prefix);
|
|
|
|
DESTROY(_applicationName);
|
|
|
|
DESTROY(_applicationNumberString);
|
|
|
|
DESTROY(_requestHandlerKey);
|
|
|
|
DESTROY(_queryString);
|
|
|
|
DESTROY(_requestHandlerPath);
|
2000-01-22 12:49:49 +00:00
|
|
|
[super dealloc];
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(id)initWithCoder:(NSCoder*)coder
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
if ((self = [super initWithCoder:coder]))
|
|
|
|
{
|
|
|
|
[coder decodeValueOfObjCType:@encode(id)
|
|
|
|
at:&_url];
|
|
|
|
_composed=YES;
|
|
|
|
[self _parse];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)encodeWithCoder:(NSCoder*)coder
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
[super encodeWithCoder:coder];
|
2000-01-22 12:49:49 +00:00
|
|
|
[self _compose];
|
2002-08-04 18:00:11 +00:00
|
|
|
[coder encodeObject:_url];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(id)copyWithZone:(NSZone*)zone
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
GSWDynamicURLString* clone = nil;
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"low",@"url class=%@",[_url class]);
|
|
|
|
clone=[[isa allocWithZone:zone] init];
|
2000-01-22 12:49:49 +00:00
|
|
|
if (clone)
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
DESTROY(clone->_url);
|
|
|
|
clone->_url=[_url mutableCopyWithZone:zone];
|
|
|
|
NSDebugMLLog(@"low",@"clone->_url class=%@",[clone->_url class]);
|
|
|
|
ASSIGNCOPY(clone->_protocol,_protocol);
|
|
|
|
ASSIGNCOPY(clone->_host,_host);
|
|
|
|
clone->_port=_port;
|
|
|
|
ASSIGNCOPY(clone->_prefix,_prefix);
|
|
|
|
ASSIGNCOPY(clone->_applicationName,_applicationName);
|
|
|
|
ASSIGNCOPY(clone->_applicationNumberString,_applicationNumberString);
|
|
|
|
ASSIGNCOPY(clone->_requestHandlerKey,_requestHandlerKey);
|
|
|
|
ASSIGNCOPY(clone->_queryString,_queryString);
|
|
|
|
ASSIGNCOPY(clone->_requestHandlerPath,_requestHandlerPath);
|
|
|
|
clone->_applicationNumber=_applicationNumber;
|
|
|
|
clone->_composed=_composed;
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return clone;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)description
|
|
|
|
{
|
|
|
|
//OK
|
|
|
|
[self _compose];
|
2002-08-04 18:00:11 +00:00
|
|
|
return _url;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)forwardInvocation:(NSInvocation*)invocation
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* urlBackup=nil;
|
|
|
|
if (!_composed)
|
|
|
|
[self _compose];
|
|
|
|
urlBackup=[_url copy];
|
|
|
|
[invocation invokeWithTarget:_url];
|
|
|
|
if (![_url isEqualToString:urlBackup])
|
|
|
|
[self _parse];
|
|
|
|
[urlBackup release];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSMethodSignature*)methodSignatureForSelector:(SEL)selector
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return [_url methodSignatureForSelector:selector];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation GSWDynamicURLString (GSWDynamicURLStringParsing)
|
|
|
|
-(void)_compose
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
if (!_composed)
|
|
|
|
{
|
|
|
|
if (_url)
|
|
|
|
{
|
|
|
|
int length=[_url length];
|
|
|
|
NSDebugMLLog(@"low",@"url %@ class=%@",_url,[_url class]);
|
|
|
|
if (length>0)
|
|
|
|
[_url deleteCharactersInRange:NSMakeRange(0,length)];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
_url=[NSMutableString new];
|
|
|
|
if (_protocol)
|
|
|
|
{
|
|
|
|
if (_host)
|
|
|
|
[_url appendFormat:@"%@://",_protocol];
|
|
|
|
else if (_port)
|
|
|
|
[_url appendFormat:@"%@://localhost",_protocol];
|
|
|
|
else if (_prefix)
|
|
|
|
[_url appendFormat:@"%@:/",_protocol];
|
|
|
|
else
|
|
|
|
[_url appendFormat:@"%@://",_protocol];
|
|
|
|
};
|
|
|
|
if (_host)
|
|
|
|
[_url appendString:_host];
|
|
|
|
if (_port)
|
|
|
|
[_url appendFormat:@":%d",_port];
|
|
|
|
if (_prefix)
|
|
|
|
[_url appendFormat:@"%@/",_prefix];
|
|
|
|
if (_applicationName)
|
|
|
|
[_url appendFormat:@"%@.%@/",
|
|
|
|
_applicationName,
|
|
|
|
GSWApplicationSuffix[GSWebNamingConv]];
|
|
|
|
if (_applicationNumber>=0)
|
|
|
|
[_url appendFormat:@"%d/",_applicationNumber];
|
|
|
|
if (_requestHandlerKey)
|
|
|
|
[_url appendFormat:@"%@/",_requestHandlerKey];
|
|
|
|
if (_requestHandlerPath)
|
|
|
|
[_url appendFormat:@"%@",_requestHandlerPath];
|
|
|
|
if (_queryString)
|
|
|
|
[_url appendFormat:@"?%@",_queryString];
|
|
|
|
NSDebugMLLog(@"low",@"url %@ class=%@",_url,[_url class]);
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(void)_parse
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
DESTROY(_prefix);
|
|
|
|
DESTROY(_applicationName);
|
|
|
|
DESTROY(_applicationNumberString);
|
|
|
|
DESTROY(_requestHandlerKey);
|
|
|
|
DESTROY(_queryString);
|
|
|
|
DESTROY(_requestHandlerPath);
|
|
|
|
_applicationNumber=-1;
|
|
|
|
_composed=NO; //??
|
|
|
|
if (_url)
|
|
|
|
{
|
|
|
|
NSArray* components=nil;
|
|
|
|
NSString* Left=_url;
|
|
|
|
int index=0;
|
|
|
|
int tmpIndex=0;
|
|
|
|
NSRange protocolEndRange;
|
|
|
|
NSRange queryStringStartRange=[Left rangeOfString:@"?"];
|
|
|
|
if (queryStringStartRange.length>0)
|
|
|
|
{
|
|
|
|
if (queryStringStartRange.location+1<[Left length])
|
|
|
|
{
|
|
|
|
ASSIGN(_queryString,[Left substringFromIndex:queryStringStartRange.location+queryStringStartRange.length]);
|
|
|
|
};
|
|
|
|
Left=[Left substringToIndex:queryStringStartRange.location];
|
|
|
|
};
|
|
|
|
NSDebugMLLog(@"low",@"Left [%@]",Left);
|
|
|
|
NSDebugMLLog(@"low",@"queryString [%@]",_queryString);
|
|
|
|
|
|
|
|
//Protocol
|
|
|
|
protocolEndRange=[Left rangeOfString:@"://"];
|
|
|
|
if (protocolEndRange.length>0)
|
|
|
|
{
|
|
|
|
ASSIGN(_protocol,[Left substringToIndex:protocolEndRange.location]);
|
|
|
|
NSDebugMLLog(@"low",@"protocol [%@]",_protocol);
|
|
|
|
if (protocolEndRange.location+protocolEndRange.length<[Left length])
|
|
|
|
Left=[Left substringFromIndex:protocolEndRange.location+protocolEndRange.length];
|
|
|
|
else
|
|
|
|
Left=nil;
|
|
|
|
NSDebugMLLog(@"low",@"Left [%@]",Left);
|
|
|
|
//Host
|
|
|
|
if ([Left length]>0)
|
|
|
|
{
|
|
|
|
NSRange hostEndRangePort=[Left rangeOfString:@":"];
|
|
|
|
if (hostEndRangePort.length>0)
|
|
|
|
{
|
|
|
|
ASSIGN(_host,[Left substringToIndex:hostEndRangePort.location]);
|
|
|
|
NSDebugMLLog(@"low",@"host [%@]",_host);
|
|
|
|
if (hostEndRangePort.location+hostEndRangePort.length<[Left length])
|
|
|
|
Left=[Left substringFromIndex:hostEndRangePort.location+hostEndRangePort.length];
|
|
|
|
else
|
|
|
|
Left=nil;
|
|
|
|
NSDebugMLLog(@"low",@"Left [%@]",Left);
|
|
|
|
if (Left)
|
|
|
|
{
|
|
|
|
NSRange portEndRange=[Left rangeOfString:@"/"];
|
|
|
|
if (portEndRange.length>0)
|
|
|
|
{
|
|
|
|
NSString* portString=[Left substringToIndex:portEndRange.location];
|
|
|
|
NSDebugMLLog(@"low",@"portString [%@]",Left);
|
|
|
|
_port=[portString intValue];
|
|
|
|
NSDebugMLLog(@"low",@"port [%d]",_port);
|
|
|
|
if (portEndRange.location+portEndRange.length<[Left length])
|
|
|
|
Left=[Left substringFromIndex:portEndRange.location+portEndRange.length-1]; //Keep the '/'
|
|
|
|
else
|
|
|
|
Left=nil;
|
|
|
|
NSDebugMLLog(@"low",@"Left [%@]",Left);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_port=[Left intValue];
|
|
|
|
NSDebugMLLog(@"low",@"port [%d]",_port);
|
|
|
|
Left=nil;
|
|
|
|
NSDebugMLLog(@"low",@"Left [%@]",Left);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
NSRange hostEndRangeSlash=[Left rangeOfString:@"/"];
|
|
|
|
if (hostEndRangeSlash.length>0)
|
|
|
|
{
|
|
|
|
ASSIGN(_host,[Left substringToIndex:hostEndRangeSlash.location]);
|
|
|
|
NSDebugMLLog(@"low",@"host [%@]",_host);
|
|
|
|
if (hostEndRangeSlash.location+hostEndRangeSlash.length<[Left length])
|
|
|
|
Left=[Left substringFromIndex:hostEndRangeSlash.location+hostEndRangeSlash.length-1];//Keep the '/'
|
|
|
|
else
|
|
|
|
Left=nil;
|
|
|
|
NSDebugMLLog(@"low",@"Left [%@]",Left);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ASSIGN(_host,Left);
|
|
|
|
NSDebugMLLog(@"low",@"host [%@]",_host);
|
|
|
|
Left=nil;
|
|
|
|
NSDebugMLLog(@"low",@"Left [%@]",Left);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
NSDebugMLLog(@"low",@"Left [%@]",Left);
|
|
|
|
//prefix
|
|
|
|
NSDebugMLLog(@"low",@"prefix: components [%@]",components);
|
|
|
|
components=[Left componentsSeparatedByString:@"/"];
|
|
|
|
for(tmpIndex=index;!_prefix && tmpIndex<[components count];tmpIndex++)
|
|
|
|
{
|
|
|
|
NSString* tmp=[components objectAtIndex:tmpIndex];
|
|
|
|
if ([tmp hasSuffix:GSWApplicationPSuffix[GSWNAMES_INDEX]]
|
|
|
|
|| [tmp hasSuffix:GSWApplicationPSuffix[WONAMES_INDEX]])
|
|
|
|
{
|
|
|
|
if (tmpIndex-index>1)
|
|
|
|
{
|
|
|
|
ASSIGN(_prefix,[[components subarrayWithRange:NSMakeRange(index,tmpIndex-index)]componentsJoinedByString:@"/"]);
|
|
|
|
index=tmpIndex;//Stay on ApplicationName !
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
if (!_prefix)
|
|
|
|
{
|
|
|
|
//TODO Erreur
|
|
|
|
NSDebugMLLog(@"low",@"No prefix in [%@]",_url);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
//applicationName
|
|
|
|
if (index>=[components count])
|
|
|
|
{
|
|
|
|
//TODO Erreur
|
|
|
|
NSDebugMLLog(@"low",@"No applicationName in [%@]",_url);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
NSDebugMLLog(@"low",@"applicationName: components [%@]",
|
|
|
|
[components subarrayWithRange:NSMakeRange(index,[components count]-index)]);
|
|
|
|
for(tmpIndex=index;!_applicationName && tmpIndex<[components count];tmpIndex++)
|
|
|
|
{
|
|
|
|
NSString* tmp=[components objectAtIndex:tmpIndex];
|
|
|
|
NSString* appSuffix=nil;
|
|
|
|
if ([tmp hasSuffix:GSWApplicationPSuffix[GSWNAMES_INDEX]])
|
|
|
|
appSuffix=GSWApplicationPSuffix[GSWNAMES_INDEX];
|
|
|
|
else if ([tmp hasSuffix:GSWApplicationPSuffix[WONAMES_INDEX]])
|
|
|
|
appSuffix=GSWApplicationPSuffix[WONAMES_INDEX];
|
|
|
|
if (appSuffix)
|
|
|
|
{
|
|
|
|
ASSIGN(_applicationName,[[[components subarrayWithRange:NSMakeRange(index,tmpIndex-index+1)]
|
|
|
|
componentsJoinedByString:@"/"]
|
2002-09-22 14:27:04 +00:00
|
|
|
stringByDeletingSuffix:appSuffix]);
|
2002-08-04 18:00:11 +00:00
|
|
|
index=tmpIndex+1;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
if (!_applicationName)
|
|
|
|
{
|
|
|
|
NSString* tmp=[[components subarrayWithRange:NSMakeRange(index,[components count]-index)]
|
|
|
|
componentsJoinedByString:@"/"];
|
|
|
|
if ([tmp hasSuffix:GSWApplicationPSuffix[GSWNAMES_INDEX]])
|
2002-09-22 14:27:04 +00:00
|
|
|
tmp=[tmp stringByDeletingSuffix:GSWApplicationPSuffix[GSWNAMES_INDEX]];
|
2002-08-04 18:00:11 +00:00
|
|
|
else if ([tmp hasSuffix:GSWApplicationPSuffix[WONAMES_INDEX]])
|
2002-09-22 14:27:04 +00:00
|
|
|
tmp=[tmp stringByDeletingSuffix:GSWApplicationPSuffix[WONAMES_INDEX]];
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_applicationName,tmp);
|
|
|
|
index=[components count];
|
|
|
|
};
|
|
|
|
|
|
|
|
//Application Number
|
|
|
|
if (index<[components count])
|
|
|
|
{
|
|
|
|
NSDebugMLLog(@"low",@"applicationNumber: components [%@]",
|
|
|
|
[components subarrayWithRange:NSMakeRange(index,[components count]-index)]);
|
|
|
|
ASSIGN(_applicationNumberString,[components objectAtIndex:index]);
|
|
|
|
_applicationNumber=[_applicationNumberString intValue];
|
|
|
|
index++;
|
|
|
|
//requestHandlerKey
|
|
|
|
if (index<[components count])
|
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(@"low",@"requestHandlerKey: _components [%@]",
|
|
|
|
[components subarrayWithRange:NSMakeRange(index,[components count]-index)]);
|
|
|
|
ASSIGN(_requestHandlerKey,[components objectAtIndex:index]);
|
|
|
|
index++;
|
|
|
|
//requestHandlerPath
|
|
|
|
if (index<[components count])
|
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(@"low",@"requestHandlerPath: components [%@]",
|
|
|
|
[components subarrayWithRange:NSMakeRange(index,[components count]-index)]);
|
|
|
|
ASSIGN(_requestHandlerPath,[[components subarrayWithRange:NSMakeRange(index,[components count]-index)]componentsJoinedByString:@"/"]);
|
|
|
|
index++;
|
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(@"low",@"url=%@",_url);
|
|
|
|
NSDebugMLLog(@"low",@"prefix=%@",_prefix);
|
|
|
|
NSDebugMLLog(@"low",@"applicationName=%@",_applicationName);
|
|
|
|
NSDebugMLLog(@"low",@"applicationNumberString=%@",_applicationNumberString);
|
|
|
|
NSDebugMLLog(@"low",@"requestHandlerKey=%@",_requestHandlerKey);
|
|
|
|
NSDebugMLLog(@"low",@"queryString=%@",_queryString);
|
|
|
|
NSDebugMLLog(@"low",@"requestHandlerPath=%@",_requestHandlerPath);
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation GSWDynamicURLString (GSWDynamicURLStringGetGet)
|
|
|
|
/*
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSArray*)urlRequestHandlerPath
|
|
|
|
{
|
|
|
|
NSArray* _path=[urlrequestHandlerPath componentsSeparatedByString:@"/"];
|
|
|
|
return _path;
|
|
|
|
};
|
|
|
|
*/
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)urlRequestHandlerPath
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _requestHandlerPath;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)urlQueryString
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _queryString;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)urlRequestHandlerKey
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _requestHandlerKey;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(int)urlApplicationNumber
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _applicationNumber;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)urlApplicationName
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _applicationName;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)urlPrefix
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _prefix;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(void)checkURL
|
|
|
|
{
|
|
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
|
|
|
-(NSString*)urlProtocol
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _protocol;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
|
|
|
-(NSString*)urlHost
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _host;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
|
|
|
-(NSString*)urlPortString
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return [NSString stringWithFormat:@"%d",_port];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
|
|
|
-(int)urlPort
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _port;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
|
|
|
-(NSString*)urlProtocolHostPort
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
NSMutableString* url=[NSMutableString string];
|
|
|
|
if (_protocol)
|
|
|
|
{
|
|
|
|
if (_host)
|
|
|
|
[url appendFormat:@"%@://",_protocol];
|
|
|
|
else if (_port)
|
|
|
|
[url appendFormat:@"%@://localhost",_protocol];
|
|
|
|
else
|
|
|
|
[url appendFormat:@"%@://",_protocol];
|
|
|
|
};
|
|
|
|
if (_host)
|
|
|
|
[url appendString:_host];
|
|
|
|
if (_port)
|
|
|
|
[url appendFormat:@":%d",_port];
|
|
|
|
return [NSString stringWithString:url];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation GSWDynamicURLString (GSWDynamicURLStringSet)
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLRequestHandlerPath:(NSString*)aString
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_requestHandlerPath,aString);
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLQueryString:(NSString*)aString
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_queryString,aString);
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLRequestHandlerKey:(NSString*)aString
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_requestHandlerKey,aString);
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLApplicationNumber:(int)applicationNumber
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
_applicationNumber=applicationNumber;
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLApplicationName:(NSString*)aString
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_applicationName,aString);
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLPrefix:(NSString*)aString
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_prefix,aString);
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLProtocol:(NSString*)aString
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_protocol,aString);
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLHost:(NSString*)aString
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
ASSIGN(_host,aString);
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLPortString:(NSString*)aString
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
_port=[aString intValue];
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//NDFN
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)setURLPort:(int)port
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
_port=port;
|
|
|
|
_composed=NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
|