mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-24 04:01:16 +00:00
* GSWeb.framework/GSWGNUmakefile: o removed NSObject+IVarAccess+PerformSel.* * GSWeb.framework/GSWConstants.m: o fix GSWHTTPHeader_Response_HeaderLineEnd: remove space at the begining o use RCS_ID * GSWeb.framework/Adaptors/common/GSWHTTPResponse.c: o fix status in GSWHTTPResponse_New() * GSWAdaptors/Apache/mod_gsweb.c: o fixes bad returned status o traces * GSWeb.framework/GSWTemplateParserANTLR.m: o removed logs o fixes for warnings o use RCS_ID * GSWeb.framework/GSWApplication.m: o use RCS_ID o added logs o new method to begin rewrite exception handling * GSWeb.framework/GSWRequest.m: o logs o fix in -_getFormValuesFromMultipartFormData to handle more than one value per name o use RCS_ID o -fix bad types in uriElementForKey: * GSWeb.framework/GSWConditional.m: o added asserts o use RCS_ID * GSWeb.framework/GSWHTMLStaticElement.m: o added asserts o clean warnings o use RCS_ID * GSWeb.framework/GSWComponentReference.m: o added asserts o use RCS_ID * GSWeb.framework/GSWActiveImage.m: o added asserts * GSWeb.framework/GSWComponentContent.m: o added asserts o use RCS_ID * GSWeb.framework/GSWForm.m: o added asserts o use RCS_ID * GSWeb.framework/GSWHTMLDynamicElement.m: o added asserts o use RCS_ID * GSWeb.framework/GSWHTMLURLValuedElement.m: o use RCS_ID o added asserts * GSWeb.framework/GSWRepetition.m: o added asserts o use RCS_ID * GSWeb.framework/GSWExtensions.framework/GNUmakefile: o added GSWPageRestorationErrorPage.gswc * GSWeb.framework/GSWFileUploadComponent.m: o use RCS_ID * GSWeb.framework/GSWImage.m: o Don't output nil height/width o fix: get component before using ! o use RCS_ID * GSWeb.framework/GSWElementIDString.m: o in -initWithCoder: retain _string o use RCS_ID * GSWeb.framework/GSWElementIDString.h: o cleaned * config.h.in: o define RCS_ID like in GDL2 * GSWeb.framework/GSWDirectActionRequestHandler.[hm]: o added +additionalRequestPathArrayFromRequest: o enable directAction with additional path components o use RCS_ID * GSWeb.framework/GSWDirectAction.[hm]: o added -additionalRequestPathArray o use RCS_ID * GSWeb.framework/GSWeb.h: o include GSCategories.h * GSWeb.framework/GSWDebug.m: o use RCS_ID * GSWeb.framework/GSWPageDefParserExt.m: o use RCS_ID * GSWeb.framework/GSWPageDefElement.m: o use RCS_ID * GSWeb.framework/GSWDeployedBundle.m: o use RCS_ID * GSWeb.framework/GSWProjectBundle.m: o use RCS_ID * GSWeb.framework/GSWStats.m: o use RCS_ID * GSWeb.framework/GSWBundle.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWTemplateParser.m:: o clean warnings o use RCS_ID * GSWeb.framework/GSWTemplateParserXML.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWComponent.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWDisplayGroup.m: o clean warnings o fix -validateValue:forKey: call o use RCS_ID * GSWeb.framework/GSWHTMLParserExt.m: o use RCS_ID * GSWeb.framework/GSWAssociation.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWResourceManager.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWSession.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWMultiKeyDictionary.m: o use RCS_ID * GSWeb.framework/GSWResponse.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWStatisticsStore.m: o clean warnings * GSWeb.framework/GSWAdaptor.m: o use RCS_ID * GSWeb.framework/GSWGeometricRegion.[hm]: o types change o use RCS_ID * GSWeb.framework/GSWActiveImage.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWBody.m: o use RCS_ID * GSWeb.framework/GSWTextField.m: o use RCS_ID * GSWeb.framework/GSWSubmitButton.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWHTMLBareString.m: o use RCS_ID * GSWeb.framework/GSWHTMLComment.m: o use RCS_ID * GSWeb.framework/GSWApplet.m: o use RCS_ID * GSWeb.framework/GSWBrowser.m: o use RCS_ID * GSWeb.framework/GSWCheckBoxList.m: o use RCS_ID * GSWeb.framework/GSWEmbeddedObject.m: o use RCS_ID * GSWeb.framework/GSWFrame.m: o use RCS_ID * GSWeb.framework/GSWGenericContainer.m: o use RCS_ID * GSWeb.framework/GSWGenericElement.m: o use RCS_ID * GSWeb.framework/GSWHyperlink.m: o use RCS_ID o clean warnings * GSWeb.framework/GSWImageButton.m: o use RCS_ID o clean warnings * GSWeb.framework/GSWJavaScript.m: o use RCS_ID * GSWeb.framework/GSWNestedList.m: o use RCS_ID * GSWeb.framework/GSWParam.m: o use RCS_ID * GSWeb.framework/GSWPasswordField.m: o use RCS_ID * GSWeb.framework/GSWPopUpButton.m: o use RCS_ID * GSWeb.framework/GSWRadioButtonList.m: o use RCS_ID * GSWeb.framework/GSWResetButton.m: o use RCS_ID * GSWeb.framework/GSWSwitchComponent.m: o use RCS_ID * GSWeb.framework/GSWVBScript.m: o use RCS_ID * GSWeb.framework/GSWString.m: o use RCS_ID * GSWeb.framework/GSWText.m: o use RCS_ID * GSWeb.framework/GSWCookie.m: o use RCS_ID * GSWeb.framework/GSWRequestHandler.m: o use RCS_ID * GSWeb.framework/GSWMailDelivery.m: o use RCS_ID * GSWeb.framework/GSWComponentRequestHandler.m: o use RCS_ID o clean warnings * GSWeb.framework/GSWKeyValueAssociation.m: o use RCS_ID * GSWeb.framework/GSWHTMLStaticGroup.m: o use RCS_ID * GSWeb.framework/GSWConstantValueAssociation.m: o use RCS_ID * GSWeb.framework/GSWDynamicURLString.m: o use RCS_ID * GSWeb.framework/GSWBindingNameAssociation.m: o use RCS_ID * GSWeb.framework/GSWBindingNameAssociation.[hm] o clean warnings o use RCS_ID * GSWeb.framework/GSWURLValuedElementData.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWToggle.m: o use RCS_ID * GSWeb.framework/GSWFileUpload.m: o use RCS_ID * GSWeb.framework/GSWResourceURL.m: o use RCS_ID * GSWeb.framework/GSWProcFS.m: o use RCS_ID * GSWeb.framework/GSWActionURL.m: o use RCS_ID * GSWeb.framework/GSWContext.m: o use RCS_ID * GSWeb.framework/GSWDefaultAdaptorThread.m: o use RCS_ID * GSWeb.framework/GSWDynamicElement.m: o use RCS_ID * GSWeb.framework/GSWeb.m: o use RCS_ID * GSWeb.framework/GSWElement.m: o use RCS_ID * GSWeb.framework/GSWResourceRequestHandler.m: o use RCS_ID * GSWeb.framework/GSWServerSessionStore.m: o use RCS_ID * GSWeb.framework/GSWSessionStore.m: o use RCS_ID * GSWeb.framework/GSWSessionTimeOut.m: o use RCS_ID * GSWeb.framework/GSWSessionTimeOutManager.m: o use RCS_ID * GSWeb.framework/GSWTransactionRecord.m: o use RCS_ID * GSWeb.framework/GSWUtils.m: o use RCS_ID * GSWeb.framework/GSWWOCompatibility.m: o use RCS_ID * GSWeb.framework/NSString+HTML.m: o use RCS_ID * GSWeb.framework/NSString+Trimming.m: o use RCS_ID git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@16216 72102866-910b-0410-8b05-ffd578937521
250 lines
9.2 KiB
Objective-C
250 lines
9.2 KiB
Objective-C
/** GSWElement.m - <title>GSWeb: Class GSWElement</title>
|
|
|
|
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
|
|
|
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
|
Date: Jan 1999
|
|
|
|
$Revision$
|
|
$Date$
|
|
|
|
This file is part of the GNUstep Web Library.
|
|
|
|
<license>
|
|
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.
|
|
</license>
|
|
**/
|
|
|
|
#include "config.h"
|
|
|
|
RCS_ID("$Id$")
|
|
|
|
#include "GSWeb.h"
|
|
|
|
BYTE ElementsMap_htmlBareString = (BYTE)0x53;
|
|
BYTE ElementsMap_gswebElement = (BYTE)0x57;
|
|
BYTE ElementsMap_dynamicElement = (BYTE)0x43;
|
|
BYTE ElementsMap_attributeElement = (BYTE)0x41;
|
|
|
|
//====================================================================
|
|
@implementation GSWElement
|
|
|
|
#ifndef NDEBBUG
|
|
-(void)saveAppendToResponseElementIDInContext:(id)context
|
|
{
|
|
NSString* elementID=nil;
|
|
LOGObjectFnStartC("GSWElement");
|
|
elementID=[context elementID];
|
|
/* if ([elementID length]==0)
|
|
elementID=@"MARKER";*/
|
|
NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ elementID=%@ %p",self,[self definitionName],elementID,elementID);
|
|
ASSIGNCOPY(_appendToResponseElementID,elementID);
|
|
NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ _appendToResponseElementID=%@ %p",self,[self definitionName],_appendToResponseElementID,_appendToResponseElementID);
|
|
GSWAssertIsElementID(context);
|
|
LOGObjectFnStopC("GSWElement");
|
|
};
|
|
|
|
-(void)assertCorrectElementIDInContext:(id)context
|
|
method:(SEL)method
|
|
file:(const char*)file
|
|
line:(int)line
|
|
{
|
|
LOGObjectFnStartC("GSWElement");
|
|
/* NSDebugMLLog(@"GSWElement",@"In Object %p Class %@ definitionName=%@ _appendToResponseElementID=%@ [_appendToResponseElementID length]=%d",
|
|
self,
|
|
[self class],
|
|
[self definitionName],
|
|
_appendToResponseElementID,[_appendToResponseElementID length]);
|
|
*/
|
|
[self assertIsElementIDInContext:context
|
|
method:method
|
|
file:file
|
|
line:line];
|
|
/* NSDebugMLLog(@"GSWElement",@"In Object %p Class %@ definitionName=%@ _appendToResponseElementID=%@ [_appendToResponseElementID length]=%d",
|
|
self,
|
|
[self class],
|
|
[self definitionName],
|
|
_appendToResponseElementID,[_appendToResponseElementID length]);
|
|
*/
|
|
if ([_appendToResponseElementID length]>0)
|
|
{
|
|
NSString* elementID=[context elementID];
|
|
BOOL appendToResponseElementIDIsFirst=NO;
|
|
BOOL elementIDIsFirst=NO;
|
|
BOOL OK=YES;
|
|
/* if ([elementID length]==0)
|
|
elementID=@"MARKER";*/
|
|
appendToResponseElementIDIsFirst=([_appendToResponseElementID length]==0 || [_appendToResponseElementID isEqualToString:@"0"]);
|
|
elementIDIsFirst=([elementID length]==0 || [elementID isEqualToString:@"0"]);
|
|
if (!appendToResponseElementIDIsFirst || appendToResponseElementIDIsFirst!=elementIDIsFirst)
|
|
{
|
|
OK=[_appendToResponseElementID isEqualToString:elementID];
|
|
NSDebugMLog(@"[context elementID]=%@ _appendToResponseElementID=%@ [_appendToResponseElementID length]=%d OK=%d [context isInLoop]=%d",
|
|
[context elementID],_appendToResponseElementID,[_appendToResponseElementID length],OK,[context isInLoop]);
|
|
};
|
|
if (!OK && ![context isInLoop])
|
|
{
|
|
NSString* msg=[NSString stringWithFormat:@"In Object %p Class %@ definitionName=%@ (file %s line %d), id '%@' (%p) in %@ is not the same than in appendToResponse '%@' (%p)",
|
|
self,
|
|
[self class],
|
|
[self definitionName],
|
|
file,
|
|
line,
|
|
[context elementID],
|
|
[context elementID],
|
|
NSStringFromSelector(method),
|
|
_appendToResponseElementID,
|
|
_appendToResponseElementID];
|
|
//No: we may have multiple occurences NSAssert1(OK,@"%@",msg);
|
|
NSDebugMLog(@"ELEMENT ID WARNING %@",msg);
|
|
};
|
|
};
|
|
LOGObjectFnStopC("GSWElement");
|
|
};
|
|
|
|
-(void)assertIsElementIDInContext:(id)context
|
|
method:(SEL)method
|
|
file:(const char*)file
|
|
line:(int)line
|
|
{
|
|
LOGObjectFnStartC("GSWElement");
|
|
/* NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ _appendToResponseElementID=%@ %p / [context elementID]=%@",
|
|
self,
|
|
[self definitionName],
|
|
_appendToResponseElementID,_appendToResponseElementID,[context elementID]);
|
|
*/
|
|
if (_appendToResponseElementID && [_appendToResponseElementID length]==0 && [[context elementID] length]>0)
|
|
{
|
|
NSString* msg=[NSString stringWithFormat:@"In Object %p Class %@ definitionName=%@ (file %s line %d), in %@ _appendToResponseElementID '%@' (%p) is not set",
|
|
self,
|
|
[self class],
|
|
[self definitionName],
|
|
file,
|
|
line,
|
|
NSStringFromSelector(method),
|
|
_appendToResponseElementID,
|
|
_appendToResponseElementID];
|
|
NSAssert1(NO,@"%@",msg);
|
|
};
|
|
LOGObjectFnStopC("GSWElement");
|
|
};
|
|
|
|
-(void)logElementInContext:(id)context
|
|
method:(SEL)method
|
|
file:(const char*)file
|
|
line:(int)line
|
|
startFlag:(BOOL)start
|
|
stopFlag:(BOOL)stop
|
|
{
|
|
NSString* senderID=[context senderID];
|
|
if (start)
|
|
[context addToDocStructureElement:self];
|
|
NSDebugMLLog(@"gswdync",@"%s:.%d - %@ %s ELEMENT self=%p class=%@ defName=%@ id=%@ appendID:%@ %s%@",
|
|
file,line,NSStringFromSelector(method),
|
|
(start ? "START" : (stop ? "STOP" : "")),
|
|
self,
|
|
[self class],
|
|
[self definitionName],
|
|
[context elementID],
|
|
_appendToResponseElementID,
|
|
(senderID ? "senderID:" : ""),
|
|
(senderID ? senderID : @""));
|
|
};
|
|
|
|
#endif
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)dealloc
|
|
{
|
|
GSWLogAssertGood(self);
|
|
GSWLogC("Dealloc GSWElement");
|
|
GSWLogC("Dealloc GSWElement: name");
|
|
DESTROY(_definitionName);
|
|
GSWLogC("Dealloc GSWElement Super");
|
|
[super dealloc];
|
|
GSWLogC("End Dealloc GSWElement");
|
|
}
|
|
|
|
-(NSString*)definitionName
|
|
{
|
|
return _definitionName;
|
|
};
|
|
|
|
-(void)setDefinitionName:(NSString*)definitionName
|
|
{
|
|
NSDebugMLLog(@"gswdync",@"setDefinitionName1 in %p: %p %@",
|
|
self,definitionName,definitionName);
|
|
ASSIGN(_definitionName,definitionName);
|
|
NSDebugMLLog(@"gswdync",@"setDefinitionName2 in %p: %p %@",
|
|
self,_definitionName,_definitionName);
|
|
};
|
|
@end
|
|
|
|
//====================================================================
|
|
@implementation GSWElement (GSWRequestHandling)
|
|
|
|
//--------------------------------------------------------------------
|
|
// takeValuesFromRequest:inContext:
|
|
|
|
-(void)takeValuesFromRequest:(GSWRequest*)request
|
|
inContext:(GSWContext*)context
|
|
{
|
|
GSWStartElement(context);
|
|
GSWAddElementToDocStructure(context);
|
|
GSWAssertCorrectElementID(context);// Debug Only
|
|
//Does Nothing
|
|
GSWStopElement(context);
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
// invokeActionForRequest:inContext:
|
|
|
|
-(GSWElement*)invokeActionForRequest:(GSWRequest*)request
|
|
inContext:(GSWContext*)context
|
|
{
|
|
GSWStartElement(context);
|
|
GSWAddElementToDocStructure(context);
|
|
GSWAssertCorrectElementID(context);// Debug Only
|
|
//Does Nothing
|
|
GSWStopElement(context);
|
|
return nil;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
// appendToResponse:inContext:
|
|
|
|
-(void)appendToResponse:(GSWResponse*)response
|
|
inContext:(GSWContext*)context
|
|
{
|
|
GSWSaveAppendToResponseElementID(context);//Debug Only
|
|
GSWAddElementToDocStructure(context);
|
|
//Does Nothing
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
//NDFN
|
|
-(BOOL)prefixMatchSenderIDInContext:(GSWContext*)context
|
|
{
|
|
BOOL match=NO;
|
|
NSString* senderID=[context senderID];
|
|
NSString* elementID=[context elementID];
|
|
NSDebugMLLog(@"gswdync",@" senderID=%@",senderID);
|
|
NSDebugMLLog(@"gswdync",@"elementID=%@",elementID);
|
|
match=([elementID hasPrefix:senderID] || [senderID hasPrefix:elementID]);
|
|
NSDebugMLLog(@"gswdync",@"match=%s",(match ? "YES" : "NO"));
|
|
return match;
|
|
};
|
|
|
|
@end
|