gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-15 16:11:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2003-03-21 Manuel Guesdon <mguesdon@orange-concept.com>

Browse source 
* 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
This commit is contained in:
Manuel Guesdon 2003-03-21 14:32:57 +00:00
parent 0c55b7592b
commit cf6ed0b5cb
113 changed files with 1112 additions and 494 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

248
ChangeLog
View file

@ -1,3 +1,251 @@
2003-03-21 Manuel Guesdon <mguesdon@orange-concept.com>
* 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
2003-03-04 David Ayers <d.ayers@inode.at>
* GSWeb/NSString+HTML.m ([NSString -decodeURL]): Updated function

40
GSWAdaptors/Apache/mod_gsweb.c
View file

@ -391,20 +391,32 @@ copyHeaders(request_rec *p_pRequestRec,
};
//--------------------------------------------------------------------
// callback finction to copy an header into p_pRequest
// callback fonction to copy an header into p_pRequest
static void
getHeader(GSWDictElem *p_pElem,
void *p_pRequestRec)
{
request_rec *pRequestRec = (request_rec *)p_pRequestRec;
server_rec *pServerRec = pRequestRec->server;
#ifdef DEBUG
GSWLog(GSW_DEBUG,pServerRec,"Start getHeader key=%s value=%s headers_out=%p",
p_pElem->pszKey,(char *)p_pElem->pValue,pRequestRec->headers_out);
#endif
if (!pRequestRec->content_type &&
strcasecmp(p_pElem->pszKey,g_szHeader_ContentType)==0)
pRequestRec->content_type = (char *)ap_pstrdup(pRequestRec->pool,
(char *)p_pElem->pValue);
{
pRequestRec->content_type = (char *)ap_pstrdup(pRequestRec->pool,
(char *)p_pElem->pValue);//TODOVERIFY: strdup or not ?
#ifdef APACHE2
ap_set_content_type(pRequestRec, (char *)p_pElem->pValue);
#endif
}
else
ap_table_add(pRequestRec->headers_out,p_pElem->pszKey,
(char *)p_pElem->pValue);
#ifdef DEBUG
GSWLog(GSW_DEBUG,pServerRec,"Stop getHeader");
#endif
};
//--------------------------------------------------------------------
@ -414,22 +426,28 @@ static void
sendResponse(request_rec *p_pRequestRec,
GSWHTTPResponse *p_pHTTPResponse)
{
char szStatusBuffer[512]="";
server_rec *pServerRec = p_pRequestRec->server;
GSWLog(GSW_DEBUG,pServerRec,"Start sendResponse");
// Process Headers
GSWDict_PerformForAllElem(p_pHTTPResponse->pHeaders,getHeader,p_pRequestRec);
ap_snprintf(szStatusBuffer,sizeof(szStatusBuffer),"%u %s",
p_pHTTPResponse->uStatus,
p_pHTTPResponse->pszStatusMessage);
p_pRequestRec->status_line = szStatusBuffer;
GSWLog(GSW_DEBUG,pServerRec,"status message=[%s]",p_pHTTPResponse->pszStatusMessage);
p_pRequestRec->status_line = apr_psprintf(p_pRequestRec->pool,"%u %s",
p_pHTTPResponse->uStatus,
p_pHTTPResponse->pszStatusMessage);
p_pRequestRec->status = p_pHTTPResponse->uStatus;
GSWLog(GSW_DEBUG,pServerRec,"p_pRequestRec->status_line=[%s]",p_pRequestRec->status_line);
// Set content type if none
if (!p_pRequestRec->content_type)
p_pRequestRec->content_type = g_szContentType_TextHtml;
{
p_pRequestRec->content_type = g_szContentType_TextHtml;
#ifdef APACHE2
ap_set_content_type(p_pRequestRec, g_szContentType_TextHtml);
#endif
};
GSWLog(GSW_DEBUG,pServerRec,"p_pRequestRec->content_type=%s",p_pRequestRec->content_type);
// Set content length
ap_set_content_length(p_pRequestRec, (uintmax_t)p_pHTTPResponse->uContentLength);
@ -437,7 +455,9 @@ sendResponse(request_rec *p_pRequestRec,
// Now Send response...
// send Headers
#ifndef APACHE2 // No more needed in Apache2 (?)
ap_send_http_header(p_pRequestRec);
#endif
// If not headers only
if (!p_pRequestRec->header_only)

2
GSWAdaptors/common/GSWHTTPResponse.c
View file

@ -86,7 +86,7 @@ GSWHTTPResponse_New(CONST char *p_pszStatus,
{
pszSpace=strchr(pszSpace,' ');
if (pszSpace)
pHTTPResponse->pszStatusMessage=strdup(pszSpace);
pHTTPResponse->pszStatusMessage=strdup(pszSpace+1);
};
};
};

1
GSWExtensions.framework/GNUmakefile
View file

@ -63,6 +63,7 @@ GSWExtensions_COMPONENTS = \
GSWSessionCreationErrorPage.gswc \
GSWSessionRestorationErrorPage.gswc \
GSWCollapsibleComponentContent.gswc \
GSWPageRestorationErrorPage.gswc \
GSWStatsPage.gswc \
GSWDictionaryRepetition.gswc \
GSWTable.gswc \

15
GSWExtensionsGSW.framework/GSWFileUploadComponent.h
View file

@ -1,8 +1,9 @@
/* GSWFileUploadComponent.h - GSWeb: Class GSWFileUploadComponent
Copyright (C) 2002 Free Software Foundation, Inc.
Copyright (C) 2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: May 2002
Date: May 2002
This file is part of the GNUstep Web Library.
@ -28,11 +29,11 @@
{
NSMutableDictionary* _tmpFileInfo;
};
-(id)init;
-(void)dealloc;
-(void)awake;
-(void)sleep;
-(BOOL)synchronizesVariablesWithBindings;
-(NSMutableDictionary*)fileInfo;
-(BOOL)isViewEnabled;
-(BOOL)isDeleteEnabled;
@end

19
GSWExtensionsGSW.framework/GSWFileUploadComponent.m
View file

@ -1,5 +1,6 @@
/** GSWFileUploadComponent.m - <title>GSWeb: Class GSWFileUploadComponent</title>
Copyright (C) 2002 Free Software Foundation, Inc.
Copyright (C) 2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: May 2002
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtGSWWOCompatibility.h"
#include "GSWFileUploadComponent.h"
@ -40,8 +43,8 @@ static char rcsId[] = "$Id$";
{
LOGObjectFnStart();
if ((self=[super init]))
{
};
{
};
LOGObjectFnStop();
return self;
};
@ -80,10 +83,15 @@ static char rcsId[] = "$Id$";
-(void)appendToResponse:(GSWResponse*)aResponse
inContext:(GSWContext*)aContext
{
LOGObjectFnStart();
_tmpFileInfo=nil;
[aResponse appendDebugCommentContentString:[[self fileInfo]description]];
NSDebugMLog(@"fileInfo %@",_tmpFileInfo);
[super appendToResponse:aResponse
inContext:aContext];
_tmpFileInfo=nil;
NSDebugMLog(@"fileInfo %@",_tmpFileInfo);
LOGObjectFnStop();
};
//--------------------------------------------------------------------
@ -91,7 +99,8 @@ static char rcsId[] = "$Id$";
inContext:(GSWContext*)aContext
{
LOGObjectFnStart();
NSDebugMLog(@"fileInfo %@",_tmpFileInfo);
_tmpFileInfo=nil;
NSDebugMLog(@"fileInfo %@",[self fileInfo]);
[super takeValuesFromRequest:aRequest
inContext:aContext];
NSDebugMLog(@"fileInfo.fileURL %@",[_tmpFileInfo valueForKey:@"fileURL"]);

2
GSWExtensionsGSW.framework/Makefile.preamble
View file

@ -59,7 +59,7 @@ endif
ADDITIONAL_CFLAGS =
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I$(GNUSTEP_SYSTEM_ROOT)/db -I../.. -I../GSWeb.framework/derived_src
ADDITIONAL_INCLUDE_DIRS = -I$(GNUSTEP_SYSTEM_ROOT)/db -I../ -I../.. -I../GSWeb.framework/derived_src
# Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS = -lGSANTLR

6
GSWeb.framework/GNUmakefile
View file

@ -1,9 +1,9 @@
# GNUmakefile - GSWeb: GNUmakefile
#
# Copyright (C) 1999-2002 Free Software Foundation, Inc.
# Copyright (C) 1999-2003 Free Software Foundation, Inc.
#
# Written by: Manuel Guesdon <mguesdon@orange-concept.com>
# Date: Jan 1999
# Date: Jan 1999
#
# This file is part of the GNUstep Web Library.
#
@ -97,7 +97,6 @@ GSWStats.m \
NSNonBlockingFileHandle.m \
GSWTransactionRecord.m \
GSWBundle.m \
NSObject+IVarAccess+PerformSel.m \
NSString+Trimming.m \
NSString+HTML.m \
GSWTemplateParser.m \
@ -295,7 +294,6 @@ GSWTransactionRecord.h \
GSWURLValuedElementData.h \
GSWVBScript.h \
NSNonBlockingFileHandle.h \
NSObject+IVarAccess+PerformSel.h \
NSString+HTML.h \
NSString+Trimming.h \
GSWConfig.h \

10
GSWeb.framework/GSWActionURL.m
View file

@ -1,9 +1,9 @@
/** GSWActionURL.h - <title>GSWeb: Class GSWActionURL</title>
/** GSWActionURL.m - <title>GSWeb: Class GSWActionURL</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Sep 1999
Date: Sep 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

51
GSWeb.framework/GSWActiveImage.m
View file

@ -1,5 +1,6 @@
/** GSWActiveImage.m - <title>GSWeb: Class GSWActiveImage</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -331,6 +334,12 @@ static char rcsId[] = "$Id$";
{
[aContext _setActionInvoked:YES];
element=[actionAssociation valueInComponent:component];
NSAssert4(!element || [element isKindOfClass:[GSWElement class]],
@"actionAssociation=%@, component=%@ Element is a %@ not a GSWElement: %@",
actionAssociation,
component,
[element class],
element);
}
else
{
@ -343,6 +352,12 @@ static char rcsId[] = "$Id$";
{
[aContext _setActionInvoked:YES];
element=[_action valueInComponent:component];
NSAssert4(!element || [element isKindOfClass:[GSWElement class]],
@"_action=%@, component=%@ Element is a %@ not a GSWElement: %@",
_action,
component,
[element class],
element);
}
else
{
@ -350,15 +365,33 @@ static char rcsId[] = "$Id$";
};
};
if (!element)
element=[aContext page];
{
element=[aContext page];
NSAssert2(!element || [element isKindOfClass:[GSWElement class]],
@"Element is a %@ not a GSWElement: %@",
[element class],
element);
};
}
else
element=[super invokeActionForRequest:request
inContext:aContext];
{
element=[super invokeActionForRequest:request
inContext:aContext];
NSAssert2(!element || [element isKindOfClass:[GSWElement class]],
@"Element is a %@ not a GSWElement: %@",
[element class],
element);
};
}
else
element=[super invokeActionForRequest:request
inContext:aContext];
{
element=[super invokeActionForRequest:request
inContext:aContext];
NSAssert2(!element || [element isKindOfClass:[GSWElement class]],
@"Element is a %@ not a GSWElement: %@",
[element class],
element);
};
LOGObjectFnStop();
return element;
};
@ -368,8 +401,8 @@ static char rcsId[] = "$Id$";
inContext:(GSWContext*)aContext
{
//OK
GSWRequest* _request=[aContext request];
BOOL isFromClientComponent=[_request isFromClientComponent];
//GSWRequest* _request=[aContext request];
//Unused now BOOL isFromClientComponent=[_request isFromClientComponent];
BOOL disabledInContext=[self disabledInContext:aContext];
BOOL isInForm=NO;
isInForm=[aContext isInForm]; //TODO

20
GSWeb.framework/GSWAdaptor.m
View file

@ -1,11 +1,16 @@
/* GSWAdaptor.m - GSWeb: Class GSWAdaptor
Copyright (C) 1999-2002 Free Software Foundation, Inc.
/** GSWAdaptor.m - <title>GSWeb: Class GSWAdaptor</title>
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
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
@ -19,9 +24,12 @@
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>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWApplet.m
View file

@ -1,9 +1,9 @@
/** GSWApplet.m - <title>GSWeb: Class GSWApplet</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

68
GSWeb.framework/GSWApplication.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -61,6 +63,7 @@ NSString* globalApplicationClassName=nil;
NSMutableDictionary* localDynCreateClassNames=nil;
int GSWebNamingConv=GSWNAMES_INDEX;
BOOL WOStrictFlag=NO;
NSString* GSWPageNotFoundException=@"GSWPageNotFoundException";
#ifndef NDEBUG
void GSWApplicationDebugSetChange()
@ -1259,7 +1262,7 @@ selfLockn,
};
if (!componentDefinition)
{
ExceptionRaise(@"GSWApplication",
ExceptionRaise(GSWPageNotFoundException,
@"Unable to create component definition for %@ for languages: %@ (no componentDefinition).",
aName,
languages);
@ -2701,6 +2704,62 @@ selfLockn,
//====================================================================
@implementation GSWApplication (GSWErrorHandling)
//Not used now. For future exception handling rewrite
-(GSWResponse*)_invokeDefaultException:(NSException*)exception
named:(NSString*)name
inContext:(GSWContext*)aContext
{
//TODO
GSWResponse* response=nil;
LOGObjectFnStart();
response=[GSWResponse responseWithMessage:@"Exception Handling failed"
inContext:aContext
forRequest:nil];
LOGObjectFnStop();
return response;
};
//Not used now. For future exception handling rewrite
-(GSWResponse*)_handleErrorWithPageNamed:(NSString*)pageName
exception:(NSException*)anException
inContext:(GSWContext*)aContext
{
GSWResponse* response=nil;
LOGObjectFnStart();
NS_DURING
{
GSWComponent* page=[self pageWithName:pageName
inContext:aContext];
if (anException)
[page takeValue:anException
forKey:@"exception"];
response=[page generateResponse];
}
NS_HANDLER
{
// My God ! Exception on exception !
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,
@"In _handleException:inContext:");
LOGException(@"exception=%@",localException);
if ([[localException name]isEqualToString:GSWPageNotFoundException])
response=[self _invokeDefaultException:localException
named:pageName
inContext:aContext];
else
{
//TODO: better exception text...
NSException* exception=[NSException exceptionWithName:@"Exception"
reason:[NSString stringWithFormat:@"Cant handle exception %@",localException]
userInfo:nil];
response=[self _invokeDefaultException:exception
named:pageName
inContext:aContext];
};
}
NS_ENDHANDLER;
return response;
};
//--------------------------------------------------------------------
-(GSWResponse*)handleException:(NSException*)anException
inContext:(GSWContext*)aContext
@ -2764,6 +2823,7 @@ selfLockn,
inFramework:GSWFramework_extensions[GSWebNamingConvForRound(iName)]
languages:nil])
{
NSDebugMLog(@"exceptionPage=%@ found",exceptionPage);
NS_DURING
{
page=[self pageWithName:GSWExceptionPageName[GSWebNamingConvForRound(iName)]
@ -2777,6 +2837,10 @@ selfLockn,
//TODO
}
NS_ENDHANDLER;
}
else
{
LOGError(@"exceptionPage=%@ Not found",exceptionPage);
};
};
if (page)

16
GSWeb.framework/GSWAssociation.m
View file

@ -1,9 +1,9 @@
/** GSWAssociation.m - <title>GSWeb: Class GSWAssociation</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <math.h>
@ -37,6 +39,9 @@ static char rcsId[] = "$Id$";
#ifdef TCSDB
#include <TCSimpleDB/TCSimpleDB.h>
#endif
#ifdef GDL2
#include <EOControl/EOKeyValueCoding.h>
#endif
static NSDictionary* localMinMaxDictionary=nil;
static NSMutableDictionary* associationsHandlerClasses=nil;
@ -304,7 +309,7 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
{
NSString* numberString=[trimmedString stringByDeletingPrefix:@"#"];
//char* cString=[numberString lossyCString];//TODO
char* cString=[numberString cString];//TODO
const char* cString=[numberString cString];//TODO
char* endPtr=NULL;
int value=strtol(cString,&endPtr,16);
NSDebugMLLog(@"associations",@"value=[%d]",value);
@ -341,7 +346,7 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
else
{
//char* cString=[trimmedString lossyCString];//TODO
char* cString=[trimmedString cString];//TODO
const char* cString=[trimmedString cString];//TODO
char* endPtr=NULL;
int value=strtol(cString,&endPtr,10);
NSDebugMLLog(@"associations",@"value=[%d]",value);
@ -542,7 +547,6 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
int i=0;
Class class=Nil;
int handlerCount=[associationsLogsHandlerClasses count];
NSString* debugDescription=[self debugDescription];
for(i=0;i<handlerCount;i++)
{
class=[associationsLogsHandlerClasses objectAtIndex:i];

4
GSWeb.framework/GSWBindingNameAssociation.h
View file

@ -1,6 +1,6 @@
/** GSWBindingNameAssociation.h - <title>GSWeb: Class GSWBindingNameAssociation</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Apr 1999
@ -46,7 +46,7 @@
-(void)dealloc;
-(id)copyWithZone:(NSZone*)zone;
-(NSString*)description;
-(BOOL)isImplementedForComponent:(NSObject*)object;
-(BOOL)isImplementedForComponent:(GSWComponent*)object;
-(BOOL)isValueConstant;
-(BOOL)isValueSettable;
-(id)valueInObject:(id)object;

8
GSWeb.framework/GSWBindingNameAssociation.m
View file

@ -1,6 +1,6 @@
/** GSWBindingNameAssociation.m - <title>GSWeb: Class GSWBindingNameAssociation</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Apr 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -96,7 +98,7 @@ static char rcsId[] = "$Id$";
};
//--------------------------------------------------------------------
-(BOOL)isImplementedForComponent:(NSObject*)object
-(BOOL)isImplementedForComponent:(GSWComponent*)object
{
BOOL isImplemented=NO;
LOGObjectFnStart();

8
GSWeb.framework/GSWBody.m
View file

@ -1,9 +1,9 @@
/** GSWBody.m - <title>GSWeb: Class GSWBody</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWBrowser.m
View file

@ -1,9 +1,9 @@
/** GSWBrowser.m - <title>GSWeb: Class GSWBrowser</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

16
GSWeb.framework/GSWBundle.m
View file

@ -30,11 +30,15 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#ifdef GDL2
#include <EOControl/EOKeyValueCoding.h>
//====================================================================
@interface GSWBundleUnarchiverDelegate : NSObject
{
@ -268,7 +272,7 @@ objectForReference:(NSString*)keyPath
id resource=nil;
NSString* path=nil;
NSFileManager* fileManager=nil;
int languagesNb=nil;
int languagesNb=0;
BOOL exists=NO;
LOGObjectFnStart();
NSDebugMLLog(@"bundles",@"type=%@",aType);
@ -730,9 +734,8 @@ objectForReference:(NSString*)keyPath
stringsTable=[NSDictionary dictionaryWithContentsOfFile:absolutePath];
if (!stringsTable)
{
NSString* tmpString=[NSString stringWithContentsOfFile:absolutePath];
LOGSeriousError(@"Bad stringTable \n%@\n from file %@",
tmpString,
[NSString stringWithContentsOfFile:absolutePath],
absolutePath);
};
if ([[GSWApplication application] isCachingEnabled])
@ -790,9 +793,8 @@ objectForReference:(NSString*)keyPath
stringsTableArray=[NSArray arrayWithContentsOfFile:absolutePath];
if (!stringsTableArray)
{
NSString* tmpString=[NSString stringWithContentsOfFile:absolutePath];
LOGSeriousError(@"Bad stringTableArray \n%@\n from file %@",
tmpString,
[NSString stringWithContentsOfFile:absolutePath],
absolutePath);
};
if ([[GSWApplication application] isCachingEnabled])
@ -1058,7 +1060,6 @@ objectForReference:(NSString*)keyPath
NSDictionary* archive=nil;
NSString* relativePath=nil;
NSString* absolutePath=nil;
BOOL isCachingEnabled=NO;
LOGObjectFnStart();
NSDebugMLLog(@"bundles",@"search=%@.%@",aName,GSWArchiveSuffix[GSWebNamingConv]);
archive=[self lockedResourceNamed:aName
@ -1135,7 +1136,6 @@ objectForReference:(NSString*)keyPath
NSDictionary* api=nil;
NSString* relativePath=nil;
NSString* absolutePath=nil;
BOOL isCachingEnabled=NO;
LOGObjectFnStart();
api=[self lockedResourceNamed:aName
ofType:GSWAPISuffix

8
GSWeb.framework/GSWCheckBoxList.m
View file

@ -1,9 +1,9 @@
/** GSWCheckBoxList.m - <title>GSWeb: Class GSWCheckBoxList</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWClientSideScript.m
View file

@ -1,9 +1,9 @@
/** GSWClientSideScript.m - <title>GSWeb: Class GSWClientSideScript</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: May 1999
Date: May 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

50
GSWeb.framework/GSWComponent.m
View file

@ -3,7 +3,7 @@
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -30,10 +30,14 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#ifdef GDL2
#include <EOControl/EOKeyValueCoding.h>
#endif
//====================================================================
@implementation GSWComponent
@ -266,7 +270,7 @@ static const char rcsId[]="$Id$";
//OK
NSString* aTemplateName=nil;
LOGObjectFnStart();
aTemplateName=[NSString stringWithCString:[aClass name]];
aTemplateName=[NSString stringWithCString:class_get_class_name(aClass)];
LOGObjectFnStop();
return aTemplateName;
};
@ -651,7 +655,7 @@ associationsKeys:(NSArray*)associationsKeys
-(id)makeAParentPerformSelectorIfPossible:(SEL)aSelector
{
id retValue=nil;
id obj=[self parent];
GSWComponent* obj=[self parent];
LOGObjectFnStart();
while(obj)
{
@ -673,7 +677,7 @@ associationsKeys:(NSArray*)associationsKeys
withObject:(id)object
{
id retValue=nil;
id obj=[self parent];
GSWComponent* obj=[self parent];
LOGObjectFnStart();
while(obj)
{
@ -697,7 +701,7 @@ associationsKeys:(NSArray*)associationsKeys
withObject:(id)object2
{
id retValue=nil;
id obj=[self parent];
GSWComponent* obj=[self parent];
LOGObjectFnStart();
while(obj)
{
@ -720,7 +724,7 @@ associationsKeys:(NSArray*)associationsKeys
-(void)makeSubComponentsPerformSelectorIfPossible:(SEL)aSelector
{
NSEnumerator* enumerator=nil;
id component=nil;
GSWComponent* component=nil;
LOGObjectFnStart();
NSDebugMLLog(@"GSWComponent",@"_subComponents=%@",_subComponents);
enumerator= [_subComponents objectEnumerator];
@ -738,7 +742,7 @@ associationsKeys:(NSArray*)associationsKeys
withObject:(id)object
{
NSEnumerator* enumerator=nil;
id component=nil;
GSWComponent* component=nil;
LOGObjectFnStart();
NSDebugMLLog(@"GSWComponent",@"_subComponents=%@",_subComponents);
enumerator= [_subComponents objectEnumerator];
@ -759,7 +763,7 @@ associationsKeys:(NSArray*)associationsKeys
withObject:(id)object2
{
NSEnumerator* enumerator=nil;
id component=nil;
GSWComponent* component=nil;
LOGObjectFnStart();
NSDebugMLLog(@"GSWComponent",@"_subComponents=%@",_subComponents);
enumerator= [_subComponents objectEnumerator];
@ -1561,18 +1565,6 @@ associationsKeys:(NSArray*)associationsKeys
//====================================================================
@implementation GSWComponent (GSWComponentK)
//--------------------------------------------------------------------
-(GSWResponse*)_generateResponseInContext:(GSWContext*)aContext
{
GSWResponse* response=nil;
LOGObjectFnStart();
NSAssert(aContext,@"No context");
response=[GSWApp createResponseInContext:aContext];
[self _appendPageToResponse:response
inContext:aContext];
return response;
};
//--------------------------------------------------------------------
-(void)_appendPageToResponse:(GSWResponse*)response
inContext:(GSWContext*)aContext
@ -1660,6 +1652,18 @@ associationsKeys:(NSArray*)associationsKeys
LOGObjectFnStop();
};
//--------------------------------------------------------------------
-(GSWResponse*)_generateResponseInContext:(GSWContext*)aContext
{
GSWResponse* response=nil;
LOGObjectFnStart();
NSAssert(aContext,@"No context");
response=[GSWApp createResponseInContext:aContext];
[self _appendPageToResponse:response
inContext:aContext];
return response;
};
//--------------------------------------------------------------------
-(id)validateValue:(id*)valuePtr
forKey:(id)key
@ -1989,7 +1993,7 @@ associationsKeys:(NSArray*)associationsKeys
if (api)
{
NSArray* required=[api objectForKey:@"Required"];
NSArray* optional=[api objectForKey:@"Optional"];
//TODO useit NSArray* optional=[api objectForKey:@"Optional"];
int i=0;
int count=[required count];
id aName=nil;

12
GSWeb.framework/GSWComponentContent.m
View file

@ -1,5 +1,6 @@
/** GSWComponentContent.m - <title>GSWeb: Class GSWComponentContent</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -90,6 +93,11 @@ static char rcsId[] = "$Id$";
[aContext _setCurrentComponent:parent];
element=[childTemplate invokeActionForRequest:request
inContext:aContext];
NSAssert3(!element || [element isKindOfClass:[GSWElement class]],
@"childTemplate=%@ Element is a %@ not a GSWElement: %@",
childTemplate,
[element class],
element);
[aContext _setCurrentComponent:component];
NSDebugMLLog(@"gswdync",@"END ET=%@ defName=%@ id=%@",
[self class],[self definitionName],[aContext elementID]);

14
GSWeb.framework/GSWComponentReference.m
View file

@ -1,9 +1,9 @@
/* GSWComponentReference.m - <title>GSWeb: Class GSWComponentReference</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -29,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -258,6 +260,12 @@ static char rcsId[] = "$Id$";
component=[context component];
element=[component invokeActionForRequest:request
inContext:context];
NSAssert4(!element || [element isKindOfClass:[GSWElement class]],
@"Name= %@, from: %@, Element is a %@ not a GSWElement: %@",
_name,
component,
[element class],
element);
};
[self popRefComponentInContext:context];
}

16
GSWeb.framework/GSWComponentRequestHandler.m
View file

@ -27,7 +27,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -349,8 +351,8 @@ static const char rcsId[] = "$Id$";
NSString* senderID=nil;
NSString* contextID=nil;
NSString* httpVersion=nil;
GSWElement* page=nil;
GSWElement* responsePage=nil;
GSWComponent* page=nil;
GSWComponent* responsePage=nil;
BOOL isFromClientComponent=NO;
BOOL hasFormValues=NO;
GSWContext* responseContext=nil;
@ -424,8 +426,8 @@ static const char rcsId[] = "$Id$";
// Exception catching here ?
NS_DURING
{
responsePage=[[GSWApplication application] invokeActionForRequest:request
inContext:aContext];
responsePage=(GSWComponent*)[[GSWApplication application] invokeActionForRequest:request
inContext:aContext];
NSDebugMLLog(@"requests",@"After invokeAction [aContext elementID]=%@",[aContext elementID]);
NSAssert([[aContext elementID] length]==0,@"4 lockedDispatchWithPreparedPage elementID length>0");
}
@ -462,7 +464,7 @@ static const char rcsId[] = "$Id$";
responseContext=[(GSWComponent*)responsePage context];//So what ?
NSDebugMLLog(@"requests",@"responseContext=%@",responseContext);
[responseContext _setPageReplaced:NO];
responsePageElement=[responseContext _pageElement];
responsePageElement=(GSWComponent*)[responseContext _pageElement];
NSDebugMLLog(@"requests",@"responsePageElement=%@",responsePageElement);
pageChanged=(responsePage!=responsePageElement);
[responseContext _setPageChanged:pageChanged];//??
@ -498,7 +500,7 @@ static const char rcsId[] = "$Id$";
NSAssert([[aContext elementID] length]==0,
@"6 lockedDispatchWithPreparedPage elementID length>0");
responseRequest=[responseContext request];//SoWhat ?
[responseRequest isFromClientComponent];//SoWhat
//Not used [responseRequest isFromClientComponent];//SoWhat
}
NS_HANDLER
{

24
GSWeb.framework/GSWConditional.m
View file

@ -1,9 +1,9 @@
/** GSWConditional.m - <title>GSWeb: Class GSWConditional</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -30,6 +30,10 @@
</license>
**/
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
/**
@ -185,8 +189,8 @@ Bindings
(doIt ? "YES" : "NO"));
if (doIt)
{
GSWRequest* _request=[aContext request];
BOOL isFromClientComponent=[_request isFromClientComponent];
//GSWRequest* _request=[aContext request];
//Deprecated BOOL isFromClientComponent=[_request isFromClientComponent];
[aContext appendZeroElementIDComponent];
[_childrenGroup takeValuesFromRequest:aRequest
inContext:aContext];
@ -238,13 +242,17 @@ Bindings
(doIt ? "YES" : "NO"));
if (doIt)
{
GSWRequest* request=[aContext request];
BOOL isFromClientComponent=[request isFromClientComponent];
//GSWRequest* request=[aContext request];
//Deprecated BOOL isFromClientComponent=[request isFromClientComponent];
[aContext appendZeroElementIDComponent];
NSDebugMLLog(@"gswdync",@"childrenGroup=%@",_childrenGroup);
element=[_childrenGroup invokeActionForRequest:aRequest
inContext:aContext];
NSDebugMLLog(@"gswdync",@"element=%@",element);
NSAssert2(!element || [element isKindOfClass:[GSWElement class]],
@"Element is a %@ not a GSWElement: %@",
[element class],
element);
[aContext deleteLastElementIDComponent];
};
GSWStopElement(aContext);
@ -295,8 +303,8 @@ Bindings
(doIt ? "YES" : "NO"));
if (doIt)
{
GSWRequest* request=[aContext request];
BOOL isFromClientComponent=[request isFromClientComponent];
//GSWRequest* request=[aContext request];
//Deprecated BOOL isFromClientComponent=[request isFromClientComponent];
[aContext appendZeroElementIDComponent];
[_childrenGroup appendToResponse:aResponse
inContext:aContext];

6
GSWeb.framework/GSWConstantValueAssociation.m
View file

@ -1,6 +1,6 @@
/** GSWConstantValueAssociation.m - <title>GSWeb: Class GSWConstantValueAssociation</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Feb 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWConstants.m
View file

@ -30,7 +30,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -105,7 +107,7 @@ NSString* GSWHTTPHeader_SetCookie=@"set-cookie";
NSString* GSWHTTPHeader_AdaptorVersion[2]={ @"x-gsweb-adaptor-version", @"x-webobjects-adaptor-version" };
NSString* GSWHTTPHeader_Method[2]={ @"x-gsweb-request-method", @"x-webobjects-request-method" };
NSString* GSWHTTPHeader_Response_HeaderLineEnd[2]={ @" GNUstep GSWeb", @" NeXT WebObjects" };
NSString* GSWHTTPHeader_Response_HeaderLineEnd[2]={ @"GNUstep GSWeb", @"NeXT WebObjects" };
NSString* GSWHTTPHeader_RequestMethod[2]={ @"x-gsweb-request-method", @"x-webobjects-request-method" };
NSString* GSWHTTPHeader_Recording[2]={ @"x-gsweb-recording", @"x-webobjects-recording" };
NSString* GSWHTTPHeader_QueryString[2]={ @"x-gsweb-query-string", @"x-webobjects-query-string" };

4
GSWeb.framework/GSWContext.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWCookie.m
View file

@ -1,6 +1,6 @@
/** GSWCookie.m - <title>GSWeb: Class GSWResponse</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Feb 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWDebug.m
View file

@ -1,6 +1,6 @@
/** GSWDebug.m - <title>GSWeb: Debug</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include "GSWDebug.h"

3
GSWeb.framework/GSWDefaultAdaptor.h
View file

@ -1,8 +1,9 @@
/** GSWDefaultAdaptor.h - GSWeb: Class GSWDefaultAdaptor
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
This file is part of the GNUstep Web Library.

8
GSWeb.framework/GSWDefaultAdaptor.m
View file

@ -30,12 +30,12 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
//#include <gnustep/base/UnixFileHandle.h>
#include <gnustep/base/GSFileHandle.h>
#include "config.h"
#if HAVE_LIBWRAP
#include <tcpd.h>
@ -259,7 +259,7 @@ int allow_severity = LOG_INFO;
//--------------------------------------------------------------------
//NDFN
-(id)announceNewConnection:(id)notification
-(id)announceNewConnection:(NSNotification*)notification
{
GSWDefaultAdaptorThread* newThread=nil;
NSFileHandle* listenHandle=nil;

8
GSWeb.framework/GSWDefaultAdaptorThread.m
View file

@ -3,7 +3,7 @@
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Feb 1999
Date: Feb 1999
$Revision$
$Date$
@ -30,7 +30,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <unistd.h>
@ -684,7 +686,7 @@ withAdditionalHeaderLines:(NSArray*)addHeaders
NSArray* headersForKey=nil;
NSString* key=nil;
NSString* anHeader=nil;
NSString* head=[NSString stringWithFormat:@"HTTP/%@ %d %@%@\n",
NSString* head=[NSString stringWithFormat:@"HTTP/%@ %d %@ %@\n",
[response httpVersion],
[response status],
GSWHTTPHeader_Response_OK,

9
GSWeb.framework/GSWDeployedBundle.m
View file

@ -1,9 +1,9 @@
/** GSWDeployedBundle.m - <title>GSWeb: Class GSWDeployedBundle</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999
Date: Mar 1999
$Revision$
$Date$
@ -29,10 +29,11 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
//#include <pthread.h>
//====================================================================
@implementation GSWDeployedBundle

1
GSWeb.framework/GSWDirectAction.h
View file

@ -61,6 +61,7 @@
@end
//====================================================================
@interface GSWDirectAction (GSWTakeValuesConvenience)
-(NSArray*)additionalRequestPathArray;
-(void)takeFormValueArraysForKeyArray:(NSArray*)keys;
-(void)takeFormValuesForKeyArray:(NSArray*)keys;
-(void)takeFormValueArraysForKeys:(NSString*)firstKey,...;

13
GSWeb.framework/GSWDirectAction.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -230,7 +232,7 @@ static const char rcsId[] = "$Id$";
NSDebugMLLog(@"requests",
@"_actionResult=%@ class=%@",
actionResult,
[actionResult class]);
[(id)actionResult class]);
}
NS_HANDLER
{
@ -313,6 +315,13 @@ static const char rcsId[] = "$Id$";
//====================================================================
@implementation GSWDirectAction (GSWTakeValuesConvenience)
//NDFN: return additional path elements
-(NSArray*)additionalRequestPathArray
{
return [GSWDirectActionRequestHandler
additionalRequestPathArrayFromRequest:[self request]];
};
//--------------------------------------------------------------------
-(void)takeFormValueArraysForKeyArray:(NSArray*)keyArray
{

1
GSWeb.framework/GSWDirectActionRequestHandler.h
View file

@ -41,6 +41,7 @@
-(GSWResponse*)_nilResponse;
-(void)_initializeRequestSessionIDInContext:(GSWContext*)aContext;
-(id)submitButtonsActionPathFromRequest:(GSWRequest*)aRequest;
+(NSArray*)additionalRequestPathArrayFromRequest:(GSWRequest*)aRequest;
@end
//====================================================================

20
GSWeb.framework/GSWDirectActionRequestHandler.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -98,13 +100,11 @@ static const char rcsId[] = "$Id$";
};
break;
case 2:
default:
className=[requestHandlerPathArray objectAtIndex:0];
actionName=[NSString stringWithFormat:@"%@",
[requestHandlerPathArray objectAtIndex:1]];
break;
default:
ExceptionRaise0(@"GSWDirectActionRequestHandler",@"bad parameters count");
break;
};
NSDebugMLLog(@"requests",@"className=%@",className);
NSDebugMLLog(@"requests",@"actionName=%@",actionName);
@ -211,6 +211,18 @@ static const char rcsId[] = "$Id$";
return nil;
};
//NDFN: return additional path elements
+(NSArray*)additionalRequestPathArrayFromRequest:(GSWRequest*)aRequest
{
NSArray* requestHandlerPathArray=nil;
NSArray* additionalRequestPathArray=nil;
LOGObjectFnStart();
requestHandlerPathArray=[aRequest requestHandlerPathArray];
if ([requestHandlerPathArray count]>2)
additionalRequestPathArray=[requestHandlerPathArray subarrayWithRange:NSMakeRange(2,[requestHandlerPathArray count]-2)];
LOGObjectFnStart();
return additionalRequestPathArray;
};
@end
//====================================================================

13
GSWeb.framework/GSWDisplayGroup.m
View file

@ -29,12 +29,17 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@class EOUndoManager;
#if GDL2 // GDL2 implementation
#include <EOControl/EOUndoManager.h>
#include <EOControl/EOSortOrdering.h>
#include <EOControl/EOClassDescription.h>
//====================================================================
@interface GSWDisplayGroup (Private)
@ -333,7 +338,7 @@ Description: <EOKeyValueUnarchiver: 0x1a84d20>
{
EOUndoManager* undoManager=nil;
LOGObjectFnStart();
undoManager=[[_dataSource editingContext] undoManager];
undoManager=(EOUndoManager*)[[_dataSource editingContext] undoManager];
LOGObjectFnStop();
return undoManager;
};
@ -1240,7 +1245,7 @@ Description: <EOKeyValueUnarchiver: 0x1a84d20>
qualifier=[self qualifierFromQueryValues];//OK
NSDebugMLLog(@"gswdisplaygroup",@"qualifier=%@",qualifier);
NSDebugMLLog(@"gswdisplaygroup",@"_dataSource=%@",_dataSource);
[_dataSource setAuxiliaryQualifier:qualifier];//OK
[(EODatabaseDataSource*)_dataSource setAuxiliaryQualifier:qualifier];//OK
NSDebugMLLog0(@"gswdisplaygroup",@"Will fetch");
[self fetch];//OK use ret Value ?
@ -2151,7 +2156,7 @@ STOP ?
(void*)sel,
NSStringFromSelector(sel));
cd=[_dataSource classDescriptionForObjects];// //ret [EOEntityClassDescription]: <EOEntityClassDescription: 0x1a3c7b0>
validateException=[cd validateValue:value
validateException=[cd validateValue:&value
forKey:key];
NSDebugMLLog(@"gswdisplaygroup",@"validateException=%@",validateException);
if (validateException)

8
GSWeb.framework/GSWDynamicElement.m
View file

@ -1,9 +1,9 @@
/** GSWDynamicElement.m - <title>GSWeb: Class GSWDynamicElement</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWDynamicURLString.m
View file

@ -1,6 +1,6 @@
/** GSWDynamicURLString.m - <title>GSWeb: Class GSWDynamicURLString</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWElement.m
View file

@ -1,9 +1,9 @@
/** GSWElement.m - <title>GSWeb: Class GSWElement</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

27
GSWeb.framework/GSWElementIDString.h
View file

@ -39,33 +39,6 @@
NSMutableString* _string;
};
-(id)init;
-(id)initWithCharactersNoCopy:(unichar*)chars
length:(unsigned)length
freeWhenDone:(BOOL)flag;
-(id)initWithCStringNoCopy:(char*)byteString
length:(unsigned)length
freeWhenDone:(BOOL)flag;
-(id)initWithCapacity:(unsigned)capacity;
-(unsigned)length;
-(unichar)characterAtIndex:(unsigned)index;
-(void)replaceCharactersInRange:(NSRange)range
withString:(NSString*)aString;
-(BOOL)canBeConvertedToEncoding:(NSStringEncoding)encoding;
-(void)dealloc;
-(void)getCString:(char*)buffer
maxLength:(unsigned int)maxLength
range:(NSRange)aRange
remainingRange:(NSRange *)leftoverRange;
-(void)getCString:(char*)buffer
maxLength:(unsigned int)maxLength;
-(void)getCString:(char *)buffer;
-(id)initWithCoder:(NSCoder*)decoder;
-(void)encodeWithCoder:(NSCoder*)encoder;
-(id)copyWithZone:(NSZone *)zone;
-(const char*)cString;
-(unsigned int)cStringLength;
-(BOOL)isSearchOverForSenderID:(NSString*)senderID;
@end

11
GSWeb.framework/GSWElementIDString.m
View file

@ -1,6 +1,6 @@
/** GSWElementIDString.m - <title>GSWeb: Class GSWElementIDString</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -113,9 +115,9 @@ static char rcsId[] = "$Id$";
LOGObjectFnStart();
GSWLogAssertGood(self);
GSWLogAssertGood(_string);
GSWLogMemC("_string deallocate");
GSWLogMemCF("_string deallocate %p",self);
DESTROY(_string);
GSWLogMemC("_string deallocated");
GSWLogMemCF("_string deallocated %p",self);
[super dealloc];
GSWLogMemC("GSWElementIDString end of dealloc");
};
@ -151,6 +153,7 @@ static char rcsId[] = "$Id$";
DESTROY(_string);
[decoder decodeValueOfObjCType:@encode(id)
at:&_string];
RETAIN(_string);
return self;
};

6
GSWeb.framework/GSWEmbeddedObject.m
View file

@ -1,6 +1,6 @@
/** GSWEmbeddedObject.m - <title>GSWeb: Class GSWEmbeddedObject</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWFileUpload.m
View file

@ -1,9 +1,9 @@
/** GSWFileUpload.m - <title>GSWeb: Class GSWFileUpload</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Sep 1999
Date: Sep 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

9
GSWeb.framework/GSWForm.m
View file

@ -27,7 +27,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -328,6 +330,7 @@ static const char rcsId[] = "$Id$";
NSDebugMLLog(@"gswdync",@"i=%d",i);
element=[[_dynamicChildren objectAtIndex:i] invokeActionForRequest:request
inContext:context];
// if (![context _wasFormSubmitted] && [[context elementID] compare:senderID]==NSOrderedDescending)
if (![context _wasFormSubmitted] && [[context elementID] isSearchOverForSenderID:senderID])
{
@ -344,6 +347,10 @@ static const char rcsId[] = "$Id$";
element=[super invokeActionForRequest:request
inContext:context];
NSAssert2(!element || [element isKindOfClass:[GSWElement class]],
@"Element is a %@ not a GSWElement: %@",
[element class],
element);
NSDebugMLLog(@"gswdync",@"isFormSubmited=%d",isFormSubmited);
NSDebugMLLog(@"gswdync",@"[context _wasActionInvoked]=%d",[context _wasActionInvoked]);

8
GSWeb.framework/GSWFrame.m
View file

@ -1,9 +1,9 @@
/** GSWFrame.m - <title>GSWeb: Class GSWFrame</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWGenericContainer.m
View file

@ -1,9 +1,9 @@
/** GSWGenericContainer.m - <title>GSWeb: Class GSWGenericContainer</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWGenericElement.m
View file

@ -1,9 +1,9 @@
/** GSWGenericElement.m - <title>GSWeb: Class GSWGenericElement</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

21
GSWeb.framework/GSWGeometricRegion.h
View file

@ -1,8 +1,9 @@
/** GSWGeometricRegion.h - <title>GSWeb: Class GSWRequest</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Sept 1999
Date: Sept 1999
$Revision$
$Date$
@ -62,8 +63,8 @@
-(NSString*)userDefinedString;
-(id)userDefinedValue;
-(BOOL)hitTest:(NSPoint*)point;
-(BOOL)hitTestX:(unsigned int)x
y:(unsigned int)y;
-(BOOL)hitTestX:(int)x
y:(int)y;
+(GSWGeometricRegion*)hitTestX:(int)x
y:(int)y
inRegions:(NSArray*)regions;
@ -124,8 +125,8 @@
-(NSString*)description;
-(id)copyWithZone:(NSZone*)zone;
-(BOOL)hitTestX:(unsigned int)x
y:(unsigned int)y;
-(BOOL)hitTestX:(int)x
y:(int)y;
@end
@ -236,8 +237,8 @@
userDefinedString:(NSString*)userDefinedString
userDefinedValue:(id)userDefinedValue;
-(NSString*)description;
-(BOOL)hitTestX:(unsigned int)x
y:(unsigned int)y;
-(BOOL)hitTestX:(int)x
y:(int)y;
@ -266,8 +267,8 @@
userDefinedString:(NSString*)userDefinedString
userDefinedValue:(id)userDefinedValue;
-(NSString*)description;
-(BOOL)hitTestX:(unsigned int)x
y:(unsigned int)y;
-(BOOL)hitTestX:(int)x
y:(int)y;
@end

28
GSWeb.framework/GSWGeometricRegion.m
View file

@ -1,9 +1,9 @@
/** GSWGeometricRegion.m - <title>GSWeb: Class GSWRequest</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Sept 1999
Date: Sept 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <math.h>
@ -326,15 +328,15 @@ BOOL canBeOnSegment(NSPoint m,NSPoint a,NSPoint b)
-(BOOL)hitTest:(NSPoint*)point
{
if (point)
return [self hitTestX:(unsigned int)point->x
y:(unsigned int)point->y];
return [self hitTestX:(int)point->x
y:(int)point->y];
else
return NO;
};
//--------------------------------------------------------------------
-(BOOL)hitTestX:(unsigned int)x
y:(unsigned int)y
-(BOOL)hitTestX:(int)x
y:(int)y
{
[self subclassResponsibility: _cmd];
return NO;
@ -521,8 +523,8 @@ BOOL canBeOnSegment(NSPoint m,NSPoint a,NSPoint b)
};
//--------------------------------------------------------------------
-(BOOL)hitTestX:(unsigned int)x
y:(unsigned int)y
-(BOOL)hitTestX:(int)x
y:(int)y
{
BOOL hitOk=NO;
NSPoint test=NSMakePoint(x,y);
@ -911,8 +913,8 @@ BOOL canBeOnSegment(NSPoint m,NSPoint a,NSPoint b)
};
//--------------------------------------------------------------------
-(BOOL)hitTestX:(unsigned int)x
y:(unsigned int)y
-(BOOL)hitTestX:(int)x
y:(int)y
{
BOOL hitOk=NO;
LOGObjectFnStart();
@ -1009,8 +1011,8 @@ BOOL canBeOnSegment(NSPoint m,NSPoint a,NSPoint b)
//--------------------------------------------------------------------
-(BOOL)hitTestX:(unsigned int)x
y:(unsigned int)y
-(BOOL)hitTestX:(int)x
y:(int)y
{
BOOL hitOk=NO;
int i=0;

6
GSWeb.framework/GSWHTMLBareString.m
View file

@ -1,6 +1,6 @@
/** GSWHTMLBareString.m - <title>GSWeb: Class GSWHTMLBareString</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWHTMLComment.m
View file

@ -1,6 +1,6 @@
/** GSWHTMLComment.m - <title>GSWeb: Class GSWRequest</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Sept 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

9
GSWeb.framework/GSWHTMLDynamicElement.m
View file

@ -30,7 +30,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -567,6 +569,11 @@ attributeAssociations:(NSDictionary*)attributeAssociations
{
element=[[dynamicChildren objectAtIndex:elementsN[2]] invokeActionForRequest:aRequest
inContext:aContext];
NSAssert3(!element || [element isKindOfClass:[GSWElement class]],
@"From: %@ Element is a %@ not a GSWElement: %@",
[dynamicChildren objectAtIndex:elementsN[2]],
[element class],
element);
if (![aContext _wasFormSubmitted] && [[aContext elementID] isSearchOverForSenderID:senderID])
{
NSDebugMLLog(@"gswdync",@"id=%@ senderid=%@ => search is over",

6
GSWeb.framework/GSWHTMLParserExt.m
View file

@ -1,6 +1,6 @@
/** GSWHTMLParserExt.m - <title>GSWeb: Class GSWHTMLParser: Categories</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

17
GSWeb.framework/GSWHTMLStaticElement.m
View file

@ -1,9 +1,9 @@
/** GSWHTMLStaticElement.m - <title>GSWeb: Class GSWHTMLStaticElement</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Feb 1999
Date: Feb 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -291,8 +293,8 @@ static char rcsId[] = "$Id$";
inContext:(GSWContext*)context
{
//OK
GSWRequest* request=[context request];
BOOL isFromClientComponent=[request isFromClientComponent]; //bis repetitam
//GSWRequest* request=[context request];
//not used BOOL isFromClientComponent=[request isFromClientComponent]; //bis repetitam
GSWStartElement(context);
GSWSaveAppendToResponseElementID(context);
if ([_elementsMap length]>0)
@ -382,6 +384,11 @@ static char rcsId[] = "$Id$";
{
element=[[aDynamicChildrensArray objectAtIndex:elementsN[1]] invokeActionForRequest:request
inContext:context];
NSAssert3(!element || [element isKindOfClass:[GSWElement class]],
@"From: %@, Element is a %@ not a GSWElement: %@",
[aDynamicChildrensArray objectAtIndex:elementsN[1]],
[element class],
element);
if (![context _wasFormSubmitted] && [[context elementID] isSearchOverForSenderID:senderID])
{
searchIsOver=YES;

8
GSWeb.framework/GSWHTMLStaticGroup.m
View file

@ -1,9 +1,9 @@
/** GSWHTMLStaticGroup.m - <title>GSWeb: Class GSWHTMLStaticGroup</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Feb 1999
Date: Feb 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

32
GSWeb.framework/GSWHTMLURLValuedElement.m
View file

@ -28,10 +28,11 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <gnustep/base/GSCategories.h>
//====================================================================
@implementation GSWHTMLURLValuedElement
@ -217,12 +218,25 @@ static const char rcsId[] = "$Id$";
{
GSWComponent* component=[aContext component];
if (_value)
element=[_value valueInComponent:component];
{
element=[_value valueInComponent:component];
NSAssert4(!element || [element isKindOfClass:[GSWElement class]],
@"_value: %@ component: %@ Element is a %@ not a GSWElement: %@",
_value,
component,
[element class],
element);
}
else if (_pageName)
{
NSString* pageNameValue=[_pageName valueInComponent:component];
element=[GSWApp pageWithName:pageNameValue
inContext:aContext];
NSAssert3(!element || [element isKindOfClass:[GSWElement class]],
@"pageNameValue: %@ Element is a %@ not a GSWElement: %@",
pageNameValue,
[element class],
element);
if (!WOStrictFlag && element)//GNUstepWeb only
{
if (_pageSetVarAssociations)
@ -256,12 +270,22 @@ static const char rcsId[] = "$Id$";
//the end ?
//TODOV
if (!element)
element=[aContext page];
{
element=[aContext page];
NSAssert2(!element || [element isKindOfClass:[GSWElement class]],
@"Element is a %@ not a GSWElement: %@",
[element class],
element);
};
}
else
{
element=[super invokeActionForRequest:aRequest
inContext:aContext];
NSAssert2(!element || [element isKindOfClass:[GSWElement class]],
@"Element is a %@ not a GSWElement: %@",
[element class],
element);
};
NSDebugMLLog(@"gswdync",@"GSWHTMLURLValuedElement invoke element=%@",element);
NSDebugMLLog(@"gswdync",@"senderID=%@",[aContext senderID]);

8
GSWeb.framework/GSWHiddenField.m
View file

@ -1,9 +1,9 @@
/** GSWHiddenField.m - <title>GSWeb: Class GSWHiddenField</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

22
GSWeb.framework/GSWHyperlink.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -510,9 +512,9 @@ static const char rcsId[]="$Id$";
{
NSString* actionString=nil;
LOGObjectFnStart();
actionString=[self computeActionStringWithActionClassAssociation:_actionClass
directActionNameAssociation:_directActionName
inContext:context];
actionString=[(GSWHTMLDynamicElement*)self computeActionStringWithActionClassAssociation:_actionClass
directActionNameAssociation:_directActionName
inContext:context];
LOGObjectFnStop();
return actionString;
};
@ -558,11 +560,11 @@ static const char rcsId[]="$Id$";
{
NSDictionary* queryDictionary=nil;
LOGObjectFnStart();
queryDictionary=[self computeQueryDictionaryWithActionClassAssociation:_actionClass
directActionNameAssociation:_directActionName
queryDictionaryAssociation:_queryDictionary
otherQueryAssociations:_otherQueryAssociations
inContext:context];
queryDictionary=[(GSWHTMLDynamicElement*)self computeQueryDictionaryWithActionClassAssociation:_actionClass
directActionNameAssociation:_directActionName
queryDictionaryAssociation:_queryDictionary
otherQueryAssociations:_otherQueryAssociations
inContext:context];
LOGObjectFnStop();
return queryDictionary;
};
@ -633,7 +635,7 @@ static const char rcsId[]="$Id$";
else
{
// call awakeInContext when _element is sleeping deeply
[element ensureAwakeInContext:context];
[(GSWComponent*)element ensureAwakeInContext:context];
/*
if (![_element context]) {
NSDebugMLLog(@"gswdync",@"_element sleeps, awake it = %@",_element);

34
GSWeb.framework/GSWImage.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -47,11 +49,10 @@ static const char rcsId[]="$Id$";
_width = [[inAssociations objectForKey:width__Key
withDefaultObject:[_width autorelease]] retain];
NSDebugMLLog(@"gswdync",@"width=%@",_width);
NSDebugMLLog(@"gswdync",@"_width=%@",_width);
_height = [[inAssociations objectForKey:height__Key
withDefaultObject:[_height autorelease]] retain];
NSDebugMLLog(@"gswdync",@"height=%@",_height);
NSDebugMLLog(@"gswdync",@"_height=%@",_height);
[associations removeObjectForKey:width__Key];
[associations removeObjectForKey:height__Key];
@ -110,25 +111,36 @@ static const char rcsId[]="$Id$";
inContext:(GSWContext*)context
{
//OK
GSWComponent* component=nil;
LOGObjectFnStartC("GSWImage");
[super appendGSWebObjectsAssociationsToResponse:response
inContext:context];
NSDebugMLLog(@"gswdync",@"_width=%@",_width);
NSDebugMLLog(@"gswdync",@"_height=%@",_height);
if (_width || _height)
{
GSWComponent* component=[context component];
if (_width)
{
id width=[_width valueInComponent:component];
[response _appendContentAsciiString:@" width=\""];
[response appendContentHTMLString:width];
[response appendContentCharacter:'"'];
NSDebugMLLog(@"gswdync",@"width=%@",width);
if (width)
{
[response _appendContentAsciiString:@" width=\""];
[response appendContentHTMLString:width];
[response appendContentCharacter:'"'];
};
};
if (_height)
{
id height=[_height valueInComponent:component];
[response _appendContentAsciiString:@" height=\""];
[response appendContentHTMLString:height];
[response appendContentCharacter:'"'];
NSDebugMLLog(@"gswdync",@"height=%@",height);
if (height)
{
[response _appendContentAsciiString:@" height=\""];
[response appendContentHTMLString:height];
[response appendContentCharacter:'"'];
};
};
};
LOGObjectFnStopC("GSWImage");

16
GSWeb.framework/GSWImageButton.m
View file

@ -1,9 +1,9 @@
/** GSWImageButton.m - <title>GSWeb: Class GSWImageButton</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -292,8 +294,8 @@ static char rcsId[] = "$Id$";
inContext:(GSWContext*)context
{
//OK
GSWRequest* request=[context request];
BOOL isFromClientComponent=[request isFromClientComponent];
//GSWRequest* request=[context request];
//Unused now BOOL isFromClientComponent=[request isFromClientComponent];
BOOL disabledInContext=[self disabledInContext:context];
GSWSaveAppendToResponseElementID(context);//Debug Only
if (disabledInContext)
@ -455,7 +457,7 @@ static char rcsId[] = "$Id$";
if (element && [element isKindOfClass:[GSWComponent class]])
{
// call awakeInContext when _element is sleeping deeply
[element ensureAwakeInContext:context];
[(GSWComponent*)element ensureAwakeInContext:context];
}
}
else
@ -474,7 +476,7 @@ static char rcsId[] = "$Id$";
if (element && [element isKindOfClass:[GSWComponent class]])
{
// call awakeInContext when _element is sleeping deeply
[element ensureAwakeInContext:context];
[(GSWComponent*)element ensureAwakeInContext:context];
}
}
else

6
GSWeb.framework/GSWJavaScript.m
View file

@ -1,6 +1,6 @@
/** GSWJavaScript.m - <title>GSWeb: Class GSWJavaScript</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWKeyValueAssociation.m
View file

@ -1,6 +1,6 @@
/** GSWKeyValueAssociation.m - <title>GSWeb: Class GSWKeyValueAssociation</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWMailDelivery.m
View file

@ -1,6 +1,6 @@
/** GSWMailDelivery.m - <title>GSWeb: Class GSWMailDelivery</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Feb 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWMultiKeyDictionary.m
View file

@ -1,6 +1,6 @@
/** GSWMultiKeyDictionary.m - <title>GSWeb: Class GSWMultiKeyDictionary</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWNestedList.m
View file

@ -1,6 +1,6 @@
/** GSWNestedList.m - <title>GSWeb: Class GSWNestedList</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWPageDefElement.m
View file

@ -1,6 +1,6 @@
/** GSWPageDefElement.m - <title>GSWeb: Class GSWPageDefElement</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWPageDefParserExt.m
View file

@ -1,6 +1,6 @@
/** GSWPageDefParserExt.m - <title>GSWeb: Class GSWPageDefParserExt</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWParam.m
View file

@ -1,6 +1,6 @@
/** GSWParam.m - <title>GSWeb: Class GSWParam</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWPasswordField.m
View file

@ -1,9 +1,9 @@
/** GSWPasswordField.m - <title>GSWeb: Class GSWPasswordField</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWPopUpButton.m
View file

@ -1,9 +1,9 @@
/** GSWPopUpButton.m - <title>GSWeb: Class GSWPopUpButton</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

4
GSWeb.framework/GSWProcFS.m
View file

@ -21,7 +21,9 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <unistd.h>

8
GSWeb.framework/GSWProjectBundle.m
View file

@ -1,9 +1,9 @@
/** GSWProjectBundle.m - <title>GSWeb: Class GSWProjectBundle</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999
Date: Mar 1999
$Revision$
$Date$
@ -29,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <Foundation/NSFileManager.h>

8
GSWeb.framework/GSWRadioButtonList.m
View file

@ -1,9 +1,9 @@
/** GSWRadioButtonList.m - <title>GSWeb: Class GSWRadioButtonList</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

11
GSWeb.framework/GSWRepetition.m
View file

@ -1,6 +1,6 @@
/** GSWRepetition.m - <title>GSWeb: Class GSWRepetition</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -29,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -413,6 +415,11 @@ static char rcsId[] = "$Id$";
[context appendZeroElementIDComponent];
element=[_childrenGroup invokeActionForRequest:request
inContext:context];
NSAssert3(!element || [element isKindOfClass:[GSWElement class]],
@"_childrenGroup=%@ Element is a %@ not a GSWElement: %@",
_childrenGroup,
[element class],
element);
[context deleteLastElementIDComponent];
[self stopOneIterationWithIndex:i
stopIndex:stopIndexValue

2
GSWeb.framework/GSWRequest.h
View file

@ -214,6 +214,8 @@
-(NSString*)senderID;
//NDFN
-(NSDictionary*)uriOrFormOrCookiesElementsByLookingForCookieFirst:(BOOL)lookCookieFirst;
-(id)uriOrFormOrCookiesElementForKey:(NSString*)key
byLookingForCookieFirst:(BOOL)lookCookieFirst;
-(NSMutableDictionary*)uriOrFormOrCookiesElements;
-(NSMutableDictionary*)_uriElements;
@end

70
GSWeb.framework/GSWRequest.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <Foundation/GSMime.h>
@ -385,8 +387,7 @@ static const char rcsId[]="$Id$";
//--------------------------------------------------------------------
-(NSString*)description
{
return [NSString stringWithFormat:@"<%s %p -
method=%@, uri=%@, httpVersion=%@, headers=%@, content=%@, userInfo=%@, defaultFormValueEncoding=%u, formValueEncoding=%u, formValues=%@, uriElements=%@, cookie=%@, applicationURLPrefix=%@, requestHandlerPathArray=%@, browserLanguages=%@, requestType=%d, isUsingWebServer=%s, formValueEncodingDetectionEnabled=%s, applicationNumber=%d",
return [NSString stringWithFormat:@"<%s %p - method=%@, uri=%@, httpVersion=%@, headers=%@, content=%@, userInfo=%@, defaultFormValueEncoding=%u, formValueEncoding=%u, formValues=%@, uriElements=%@, cookie=%@, applicationURLPrefix=%@, requestHandlerPathArray=%@, browserLanguages=%@, requestType=%d, isUsingWebServer=%s, formValueEncodingDetectionEnabled=%s, applicationNumber=%d",
object_get_class_name(self),
(void*)self,
_method,
@ -575,7 +576,7 @@ method=%@, uri=%@, httpVersion=%@, headers=%@, content=%@, userInfo=%@, defaultF
// uriElementForKey:
-(NSString*)uriElementForKey:(NSString*)key
{
NSArray* uriElement=nil;
NSString* uriElement=nil;
NSDictionary* uriElements=nil;
LOGObjectFnStart();
NS_DURING
@ -1373,13 +1374,15 @@ method=%@, uri=%@, httpVersion=%@, headers=%@, content=%@, userInfo=%@, defaultF
key,[value objectAtIndex:i]];
};
[headersString appendString:@"\n"];
NSDebugMLog(@"headersString=%@",headersString);
NSDebugMLLog(@"requests",@"headersString=%@",headersString);
NSDebugMLLog(@"requests",@"content=%@",[[[NSString alloc]initWithData:_content
encoding:NSISOLatin1StringEncoding]autorelease]);
headersData=[headersString dataUsingEncoding:NSISOLatin1StringEncoding];
parser=[GSMimeParser mimeParser];
[parser parse:headersData];
if ([parser parse:_content])
[parser parse:nil];
NSDebugMLog(@"[parser isComplete]=%d",[parser isComplete]);
NSDebugMLLog(@"requests",@"[parser isComplete]=%d",[parser isComplete]);
if ([parser isComplete] == NO)
{
//TODO
@ -1389,18 +1392,18 @@ method=%@, uri=%@, httpVersion=%@, headers=%@, content=%@, userInfo=%@, defaultF
GSMimeDocument* document = [parser mimeDocument];
NSArray* content=nil;
NSString* contentSubtype=nil;
NSDebugMLog(@"document=%@",document);
NSDebugMLLog(@"requests",@"document=%@",document);
content=[document content];
NSDebugMLog(@"contentType=%@",[document contentType]);
NSDebugMLLog(@"requests",@"contentType=%@",[document contentType]);
contentSubtype=[document contentSubtype];
NSDebugMLog(@"contentSubtype=%@",contentSubtype);
NSDebugMLLog(@"requests",@"contentSubtype=%@",contentSubtype);
if ([contentSubtype isEqual:@"form-data"])
{
NSDebugMLog(@"contentID=%@",[document contentID]);
NSDebugMLog(@"[document allHeaders]=%@",[document allHeaders]);
NSDebugMLog(@"[document content]=%@",content);
NSDebugMLog(@"[document content] class=%@",[content class]);
NSDebugMLLog(@"requests",@"contentID=%@",[document contentID]);
NSDebugMLLog(@"requests",@"[document allHeaders]=%@",[document allHeaders]);
NSDebugMLLog(@"requests",@"[document content]=%@",content);
NSDebugMLLog(@"requests",@"[document content] class=%@",[content class]);
if (![content isKindOfClass:[NSArray class]])
{
@ -1420,20 +1423,20 @@ method=%@, uri=%@, httpVersion=%@, headers=%@, content=%@, userInfo=%@, defaultF
NSAssert2([aDoc isKindOfClass:[GSMimeDocument class]],
@"Document is not a GSMimeDocument but a %@:\n%@",
[aDoc class],aDoc);
NSDebugMLog(@"aDoc=%@",aDoc);
NSDebugMLLog(@"requests",@"aDoc=%@",aDoc);
aDocContent=[aDoc content];
NSDebugMLog(@"aDocContent=%@",aDocContent);
NSDebugMLog(@"contentType=%@",[aDoc contentType]);
NSDebugMLog(@"contentSubtype=%@",[aDoc contentSubtype]);
NSDebugMLog(@"contentID=%@",[aDoc contentID]);
NSDebugMLLog(@"requests",@"aDocContent=%@",aDocContent);
NSDebugMLLog(@"requests",@"contentType=%@",[aDoc contentType]);
NSDebugMLLog(@"requests",@"contentSubtype=%@",[aDoc contentSubtype]);
NSDebugMLLog(@"requests",@"contentID=%@",[aDoc contentID]);
contentDispositionHeader=[aDoc headerNamed:@"content-disposition"];
NSDebugMLog(@"contentDispositionHeader=%@",contentDispositionHeader);
NSDebugMLLog(@"requests",@"contentDispositionHeader=%@",contentDispositionHeader);
contentDispositionValue=[contentDispositionHeader value];
contentDispositionParams=[contentDispositionHeader parameters];
NSDebugMLog(@"contentDispositionValue=%@",contentDispositionValue);
NSDebugMLog(@"contentDispositionParams=%@",contentDispositionParams);
NSDebugMLog(@"aDoc allHeaders=%@",[aDoc allHeaders]);
NSDebugMLog(@"aDocContent class=%@",[aDocContent class]);
NSDebugMLLog(@"requests",@"contentDispositionValue=%@",contentDispositionValue);
NSDebugMLLog(@"requests",@"contentDispositionParams=%@",contentDispositionParams);
NSDebugMLLog(@"requests",@"aDoc allHeaders=%@",[aDoc allHeaders]);
NSDebugMLLog(@"requests",@"aDocContent class=%@",[aDocContent class]);
if ([contentDispositionValue isEqual:@"form-data"])
{
NSString* formDataName=[contentDispositionParams objectForKey:@"name"];
@ -1454,20 +1457,31 @@ method=%@, uri=%@, httpVersion=%@, headers=%@, content=%@, userInfo=%@, defaultF
NSDebugMLLog(@"requests",@"paramName=%@",paramName);
if (![paramName isEqualToString:@"name"])
{
NSArray* previous=nil;
NSString* paramFormValueName=nil;
id paramValue=nil;
paramValue=[contentDispositionParams objectForKey:paramName];
NSDebugMLLog(@"requests",@"paramValue=%@",paramValue);
paramFormValueName=[NSString stringWithFormat:@"%@.%@",formDataName,paramName];
NSDebugMLLog(@"requests",@"paramFormValueName=%@",paramFormValueName);
[formValues setObject:[NSArray arrayWithObject:paramValue]
forKey:paramFormValueName];
previous=[formValues objectForKey:paramFormValueName];
if (previous)
[formValues setObject:[previous arrayByAddingObject:paramValue]
forKey:paramFormValueName];
else
[formValues setObject:[NSArray arrayWithObject:paramValue]
forKey:paramFormValueName];
};
};
if (aDocContent)
{
[formValues setObject:[NSArray arrayWithObject:aDocContent]
forKey:formDataName];
NSArray* previous=[formValues objectForKey:formDataName];
if (previous)
[formValues setObject:[previous arrayByAddingObject:aDocContent]
forKey:formDataName];
else
[formValues setObject:[NSArray arrayWithObject:aDocContent]
forKey:formDataName];
};
};
};
@ -1476,7 +1490,7 @@ method=%@, uri=%@, httpVersion=%@, headers=%@, content=%@, userInfo=%@, defaultF
};
};
ASSIGN(_formValues,formValues);
NSDebugMLog(@"_formValues=%@",_formValues);
NSDebugMLLog(@"requests",@"_formValues=%@",_formValues);
LOGObjectFnStop();
};

6
GSWeb.framework/GSWRequestHandler.m
View file

@ -1,6 +1,6 @@
/** GSWRequestHandler.m - <title>GSWeb: Class GSWRequestHandler</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Feb 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWResetButton.m
View file

@ -1,9 +1,9 @@
/** GSWResetButton.m - <title>GSWeb: Class GSWResetButton</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

58
GSWeb.framework/GSWResourceManager.m
View file

@ -1,8 +1,9 @@
/** GSWResourceManager.m - <title>GSWeb: Class GSWResourceManager</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -52,7 +55,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
NSBundle* mainBundle=nil;
GSWDeployedBundle* deployedBundle=nil;
GSWLogC("Start GSWResourceManager +initialize");
if ((self=[[super superclass] initialize]))
//if ((self=[[super superclass] initialize]))
{
NSString* bundlePath=nil;
mainBundle=[GSWApplication mainBundle];
@ -61,7 +64,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
bundlePath=[mainBundle bundlePath];
//NSDebugMLLog(@"resmanager",@"bundlePath:%@",bundlePath);
printf("bundlePath:%s",[bundlePath lossyCString]);
deployedBundle=[GSWDeployedBundle bundleWithPath:bundlePath];
deployedBundle=(GSWDeployedBundle*)[GSWDeployedBundle bundleWithPath:bundlePath];
//NSDebugMLLog(@"resmanager",@"deployedBundle:%@",deployedBundle);
globalAppProjectBundle=[[deployedBundle projectBundle] retain];
@ -96,8 +99,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
LOGObjectFnStart();
if ((self=[super init]))
{
//TODO
NSBundle* mainBundle=[NSBundle mainBundle];
//TODO NSBundle* mainBundle=[NSBundle mainBundle];
NSArray* allFrameworks=[NSBundle allFrameworks];
int i=0;
NSString* bundlePath=nil;
@ -625,7 +627,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
stringsTable=[self lockedStringsTableWithName:aTableName
inFramework:aFrameworkName
language:aLanguage];
else if (stringsTable==localNotFoundMarker)
else if ((id)stringsTable==(id)localNotFoundMarker)
stringsTable=nil;
NSDebugMLLog(@"resmanager",@"lockedCachedStringsTableNamed:%@ inFramework:%@ language:%@: %@",
@ -653,7 +655,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
stringsTableArray=[self lockedStringsTableArrayWithName:aTableName
inFramework:aFrameworkName
language:aLanguage];
else if (stringsTableArray==localNotFoundMarker)
else if ((id)stringsTableArray==(id)localNotFoundMarker)
stringsTableArray=nil;
LOGObjectFnStop();
return stringsTableArray;
@ -726,9 +728,8 @@ NSString* localNotFoundMarker=@"NOTFOUND";
stringsTable=[NSDictionary dictionaryWithContentsOfFile:path];
if (!stringsTable)
{
NSString* tmpString=[NSString stringWithContentsOfFile:path];
LOGSeriousError(@"Bad stringTable \n%@\n from file %@",
tmpString,
[NSString stringWithContentsOfFile:path],
path);
};
};
@ -737,7 +738,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
NSMutableDictionary* languageDict=nil;
if (!frameworkDict)
{
frameworkDict=[NSMutableDictionary dictionary];
frameworkDict=(NSMutableDictionary*)[NSMutableDictionary dictionary];
if (!aFrameworkName)
aFrameworkName=@"";//Global
[_stringsTablesByFrameworkByLanguageByName setObject:frameworkDict
@ -746,7 +747,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
languageDict=[frameworkDict objectForKey:aLanguage];
if (!languageDict)
{
languageDict=[NSMutableDictionary dictionary];
languageDict=(NSMutableDictionary*)[NSMutableDictionary dictionary];
if (!aLanguage)
aLanguage=@"";
[frameworkDict setObject:languageDict
@ -837,9 +838,8 @@ NSString* localNotFoundMarker=@"NOTFOUND";
stringsTableArray=[NSArray arrayWithContentsOfFile:path];
if (!stringsTableArray)
{
NSString* tmpString=[NSString stringWithContentsOfFile:path];
LOGSeriousError(@"Bad stringTableArray \n%@\n from file %@",
tmpString,
[NSString stringWithContentsOfFile:path],
path);
};
};
@ -848,7 +848,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
NSMutableDictionary* languageDict=nil;
if (!frameworkDict)
{
frameworkDict=[NSMutableDictionary dictionary];
frameworkDict=(NSMutableDictionary*)[NSMutableDictionary dictionary];
if (!aFrameworkName)
aFrameworkName=@"";//Global
[_stringsTableArraysByFrameworkByLanguageByName setObject:frameworkDict
@ -857,7 +857,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
languageDict=[frameworkDict objectForKey:aLanguage];
if (!languageDict)
{
languageDict=[NSMutableDictionary dictionary];
languageDict=(NSMutableDictionary*)[NSMutableDictionary dictionary];
if (!aLanguage)
aLanguage=@"";
[frameworkDict setObject:languageDict
@ -918,12 +918,12 @@ NSString* localNotFoundMarker=@"NOTFOUND";
path=[NSString stringWithFormat:@"ERROR_NOT_FOUND_framework_*%@*_filename_%@",
aFrameworkName,
resourceName];
url=[request _urlWithRequestHandlerKey:GSWResourceRequestHandlerKey[GSWebNamingConv]
path:nil
queryString:[NSString stringWithFormat:
@"%@=%@",
GSWKey_Data[GSWebNamingConv],
path]];//TODO Escape
url=(NSString*)[request _urlWithRequestHandlerKey:GSWResourceRequestHandlerKey[GSWebNamingConv]
path:nil
queryString:[NSString stringWithFormat:
@"%@=%@",
GSWKey_Data[GSWebNamingConv],
path]];//TODO Escape
};
// NSDebugMLLog(@"resmanager",@"[_frameworkProjectBundlesCache count]=%d",[_frameworkProjectBundlesCache count]);
// NSDebugMLLog(@"resmanager",@"_frameworkProjectBundlesCache=%@",_frameworkProjectBundlesCache);
@ -1099,9 +1099,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
int i=0;
NSString* bundlePath=nil;
NSBundle* tmpBundle=nil;
NSDictionary* infoDict=nil;
NSString* frameworkName=nil;
GSWDeployedBundle* projectBundle=nil;
[allFrameworks addObjectsFromArray:[NSBundle allBundles]];
[allFrameworks autorelease];
@ -1118,7 +1116,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
// NSDebugMLLog(@"resmanager",@"frameworkName=%@",frameworkName);
if ([frameworkName isEqualToString:resourceName])
{
bundle=[GSWDeployedBundle bundleWithPath:bundlePath];
bundle=(GSWDeployedBundle*)[GSWDeployedBundle bundleWithPath:bundlePath];
NSDebugMLLog(@"resmanager",@"bundle=%@",bundle);
/*projectBundle=[GSWProjectBundle projectBundleForProjectNamed:resourceName
isFramework:YES];
@ -1443,8 +1441,6 @@ NSString* localNotFoundMarker=@"NOTFOUND";
//OK
NSString* type=nil;
NSString* extension=nil;
NSDictionary* tmpMimeTypes=nil;
NSMutableDictionary* mimeTypes=[NSMutableDictionary dictionary];
LOGObjectFnStart();
NSDebugMLLog(@"resmanager",@"path=%@",path);
extension=[path pathExtension];
@ -1630,7 +1626,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
NSAssert(globalMimePListPathName,@"No resource MIME.plist");
{
NSDictionary* tmpMimeTypes=nil;
NSMutableDictionary* mimeTypes=[NSMutableDictionary dictionary];
NSMutableDictionary* mimeTypes=(NSMutableDictionary*)[NSMutableDictionary dictionary];
LOGObjectFnStart();
tmpMimeTypes=[NSDictionary dictionaryWithContentsOfFile:globalMimePListPathName];
// NSDebugMLLog(@"resmanager",@"tmpMimeTypes=%@",tmpMimeTypes);
@ -1664,8 +1660,8 @@ NSString* localNotFoundMarker=@"NOTFOUND";
NSAssert(globalLanguagesPListPathName,@"No resource languages.plist");
{
NSDictionary* tmpLanguages=nil;
NSMutableDictionary* ISO2GS=[NSMutableDictionary dictionary];
NSMutableDictionary* GS2ISO=[NSMutableDictionary dictionary];
NSMutableDictionary* ISO2GS=(NSMutableDictionary*)[NSMutableDictionary dictionary];
NSMutableDictionary* GS2ISO=(NSMutableDictionary*)[NSMutableDictionary dictionary];
LOGObjectFnStart();
tmpLanguages=[NSDictionary dictionaryWithContentsOfFile:globalLanguagesPListPathName];
NSDebugMLLog(@"resmanager",@"tmpLanguages=%@",tmpLanguages);

4
GSWeb.framework/GSWResourceRequestHandler.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

9
GSWeb.framework/GSWResourceURL.m
View file

@ -1,8 +1,9 @@
/** GSWResourceURL.m - <title>GSWeb: Class GSWResourceURL</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Sep 1999
Date: Sep 1999
$Revision$
$Date$
@ -26,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

6
GSWeb.framework/GSWResponse.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -390,7 +392,7 @@ static NSArray* cacheControlHeaderValues=nil;
-(void)appendContentData:(NSData*)dataObject
{
unsigned char* bytes=NULL;
const void* bytes=NULL;
unsigned int length=0;
LOGObjectFnStart();
NSDebugMLLog(@"low",@"response=%p dataObject:%@",self,dataObject);

4
GSWeb.framework/GSWServerSessionStore.m
View file

@ -27,7 +27,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWSession.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <gnustep/base/GSCategories.h>
@ -465,7 +467,6 @@ static const char rcsId[] = "$Id$";
{
//OK
NSString* sessionID=nil;
NSNotification* notification=nil;
LOGObjectFnStart();
_isTerminating=YES;
@ -1321,9 +1322,6 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self);
GSWStatisticsStore* statisticsStore=nil;
NSString* logFile=nil;
GSWSession* session=nil;
GSWComponent* page=nil;
NSString* pageName=nil;
NSString* description=nil;
GSWElement* pageElement=nil;
GSWComponent* pageComponent=nil;
LOGObjectFnStart();

4
GSWeb.framework/GSWSessionStore.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

4
GSWeb.framework/GSWSessionTimeOut.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include "GSWSessionTimeOut.h"

4
GSWeb.framework/GSWSessionTimeOutManager.m
View file

@ -28,7 +28,9 @@
</license>
**/
static const char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include "GSWSessionTimeOut.h"

2
GSWeb.framework/GSWStatisticsStore.h
View file

@ -94,7 +94,7 @@
timeInterval:(NSTimeInterval)timeInterval;
-(void)_updateDAStatisticsForActionNamed:(id)name
timeInterval:(NSTimeInterval)timeInterval;
-(void)_sessionTerminating:(id)session;
-(void)_sessionTerminating:(GSWSession*)session;
-(void)_applicationCreatedSession:(GSWSession*)session;
-(void)_applicationDidHandleComponentActionRequest;
-(void)_applicationDidHandleComponentActionRequestInTimeInterval:(double)timeInterval;

13
GSWeb.framework/GSWStatisticsStore.m
View file

@ -1,9 +1,9 @@
/** GSWStatisticsStore.m - <title>GSWeb: Class GSWStatisticsStore</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,10 +27,13 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <sys/resource.h>
#include <unistd.h>
//====================================================================
@ -319,7 +322,7 @@ static char rcsId[] = "$Id$";
}
else
{
pageStats=[NSMutableDictionary dictionary];
pageStats=(NSMutableDictionary*)[NSMutableDictionary dictionary];
[_pagesStatistics setObject:pageStats
forKey:aPage];
AvgRespTimeValue=aTimeInterval;
@ -366,7 +369,7 @@ static char rcsId[] = "$Id$";
};
//--------------------------------------------------------------------
-(void)_sessionTerminating:(id)aSession
-(void)_sessionTerminating:(GSWSession*)aSession
{
//OK
LOGObjectFnStart();

8
GSWeb.framework/GSWStats.m
View file

@ -1,9 +1,9 @@
/** GSWStats.m - <title>GSWeb: Class GSWStats</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

8
GSWeb.framework/GSWString.m
View file

@ -1,9 +1,9 @@
/** GSWString.m - <title>GSWeb: Class GSWString</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

10
GSWeb.framework/GSWSubmitButton.m
View file

@ -1,6 +1,6 @@
/** GSWSubmitButton.m - <title>GSWeb: Class GSWSubmitButton</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
@ -27,7 +27,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -169,7 +171,7 @@ static char rcsId[] = "$Id$";
else
{
// call awakeInContext when _element is sleeping deeply
[element ensureAwakeInContext:context];
[(GSWComponent*)element ensureAwakeInContext:context];
/*
if (![_element context]) {
NSDebugMLLog(@"gswdync",@"_element sleeps, awake it = %@",_element);
@ -199,7 +201,7 @@ static char rcsId[] = "$Id$";
}
NS_ENDHANDLER;
//if (![context _wasActionInvoked] && [[[context elementID] parentElementIDString] compare:[context senderID]]!=NSOrderedAscending)
if (![context _wasActionInvoked] && [[[context elementID] parentElementIDString] isSearchOverForSenderID:[context senderID]])
if (![context _wasActionInvoked] && [(GSWElementIDString*)[[context elementID] parentElementIDString] isSearchOverForSenderID:[context senderID]])
{
LOGError(@"Action not invoked at the end of %@ (id=%@) senderId=%@",
[self class],

9
GSWeb.framework/GSWSwitchComponent.m
View file

@ -1,8 +1,9 @@
/** GSWSwitchComponent.m - <title>GSWeb: Class GSWSwitchComponent</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
Date: Jan 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"

10
GSWeb.framework/GSWTemplateParser.m
View file

@ -30,7 +30,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
@ -336,8 +338,10 @@ static const char rcsId[]="$Id$";
if (docTypeRangeEnd.length) {
if (docTypeRangeStart.location < docTypeRangeEnd.location)
{
[_template setDocumentTypeString:[_string substringFromRange:NSMakeRange(docTypeRangeStart.location,
docTypeRangeEnd.location - docTypeRangeStart.location + 1)]];
[(GSWHTMLStaticGroup*)_template setDocumentTypeString:
[_string substringFromRange:
NSMakeRange(docTypeRangeStart.location,
docTypeRangeEnd.location - docTypeRangeStart.location + 1)]];
}
}
}

61
GSWeb.framework/GSWTemplateParserANTLR.m
View file

@ -1,6 +1,6 @@
/** GSWTemplateParserANTLR.h - <title>GSWeb: Class GSWTemplateParserANTLR</title>
/** GSWTemplateParserANTLR.m - <title>GSWeb: Class GSWTemplateParserANTLR</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999
@ -28,6 +28,10 @@
</license>
**/
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include "GSWTemplateParserANTLR.h"
@ -90,28 +94,18 @@
{
LOGError(@"template named:%@ HTML Parse failed!",_templateName);
localException=ExceptionByAddingUserInfoObjectFrameInfo(localException,@"In [htmlParser document]... template named:%@ HTML Parse failed!",_templateName);
[localException retain];
RETAIN(localException);
DESTROY(arpParse);
[localException autorelease];
AUTORELEASE(localException);
[localException raise];
}
NS_ENDHANDLER;
NSDebugMLLog0(@"low",@"arpParse infos:\n");
#ifndef NDEBUG
if ([NSThread currentThread])
{
NSDebugMLLog(@"low",@"thread current_pool=%@",
[NSThread currentThread]->_autorelease_vars.current_pool);
NSDebugMLLog(@"low",@"thread current_pool _parentAutoreleasePool=%@",
[[NSThread currentThread]->_autorelease_vars.current_pool _parentAutoreleasePool]);
};
#endif
NSDebugMLLog0(@"low",@"DESTROY(arpParse)\n");
[htmlAST retain];
DESTROY(arpParse);
arpParse=[NSAutoreleasePool new];
[htmlAST autorelease];
NSDebugMLLog0(@"low",@"DESTROYED(arpParse)\n");
if (htmlAST)
{
_tagsNames=[[NSMutableDictionary dictionary] retain];
@ -130,25 +124,18 @@
_templateName);
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,
@"In createElementsStartingWithAST...");
RETAIN(localException);
DESTROY(arpParse);
AUTORELEASE(localException);
[localException raise];
}
NS_ENDHANDLER;
};
NSDebugMLLog0(@"low",@"ARP infos:\n");
#ifndef NDEBUG
if ([NSThread currentThread])
{
NSDebugMLLog(@"low",@"thread current_pool=%@",
[NSThread currentThread]->_autorelease_vars.current_pool);
NSDebugMLLog(@"low",@"thread current_pool _parentAutoreleasePool=%@",
[[NSThread currentThread]->_autorelease_vars.current_pool _parentAutoreleasePool]);
};
#endif
[elements retain];
NSDebugMLLog0(@"low",@"DESTROY(arp)\n");
DESTROY(arpParse);
NSDebugMLLog0(@"low",@"DESTROYED(arp)\n");
[elements autorelease];
NSDebugMLLog0(@"low",@"Display Template\n");
NSDebugMLLog(@"low",@"template named:%@ elements=%@",
_templateName,
@ -206,22 +193,14 @@
LOGError(@"PARSE PB:[%@]",[anAST text]);//TODO
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,
@"In [_tagParser tag]...");
RETAIN(localException);
DESTROY(arpParse);
AUTORELEASE(localException);
[localException raise];
}
NS_ENDHANDLER;
NSDebugMLLog0(@"low",@"arpParse infos:\n");
#ifndef NDEBUG
if ([NSThread currentThread])
{
NSDebugMLLog(@"low",@"thread current_pool=%@",
[NSThread currentThread]->_autorelease_vars.current_pool);
NSDebugMLLog(@"low",@"thread current_pool _parentAutoreleasePool=%@",
[[NSThread currentThread]->_autorelease_vars.current_pool _parentAutoreleasePool]);
};
#endif
NSDebugMLLog0(@"low",@"DESTROY(arpParse)\n");
DESTROY(arpParse);
NSDebugMLLog0(@"low",@"DESTROYED(arpParse)\n");
NSDebugMLLog(@"low",@"END PARSE:[%@]",[anAST text]);
@ -390,7 +369,7 @@
&& ![_associations objectForKey:_tagAttrKey])
{
if (!_addedAssoc)
_addedAssoc=[NSMutableDictionary dictionary];
_addedAssoc=(NSMutableDictionary*)[NSMutableDictionary dictionary];
_tagAttrValue=[tagAttrs objectForKey:_tagAttrKey];
[_addedAssoc setObject:[GSWAssociation associationWithValue:_tagAttrValue]
forKey:_tagAttrKey];

14
GSWeb.framework/GSWTemplateParserXML.m
View file

@ -30,7 +30,9 @@
</license>
**/
static const char rcsId[]="$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include "GSWTemplateParserXML.h"
@ -424,10 +426,7 @@ xmlParserInputPtr GSWTemplateParserSAXHandler_ExternalLoader(const char *systemI
externalContent=[NSString stringWithContentsOfFile:fileName];
if (externalContent)
{
NSString* gswebTag=@"\n<!ELEMENT gsweb %Flow;>
<!ATTLIST gsweb
%attrs;
>\n";
NSString* gswebTag=@"\n<!ELEMENT gsweb %Flow;>\n<!ATTLIST gsweb\n %attrs;\n >\n";
// name NMTOKEN; #IMPLIED
NSDebugMLLog(@"GSWTemplateParser",@"gswebTag=\n%@",gswebTag);
externalContent=[externalContent stringByAppendingString:gswebTag];
@ -673,7 +672,7 @@ static NSString* TabsForLevel(int level)
{
NSData* dataToParse=nil;
NSString* xmlHeader=nil;
NSRange docTypeRange=NSMakeRange(NSNotFound,0);
//NSRange docTypeRange=NSMakeRange(NSNotFound,0);
NSString* stringToParse=nil;
NSString* encodingString=nil;
encodingString=[GSXMLParser xmlEncodingStringForStringEncoding:stringEncoding];
@ -1114,8 +1113,7 @@ text [Type:XML_TEXT_NODE] [{}] ####
//To know if it's an autoclose tag
if (!children && [self isKindOfClass:[GSWTemplateParserXMLHTML class]])
{
htmlElemDescPtr elemDscr=NULL;
elemDscr=htmlTagLookup([nodeName lossyCString]);
const htmlElemDesc* elemDscr=htmlTagLookup([nodeName lossyCString]);
if (elemDscr
&& elemDscr->endTag!=2 //Forbidden End Tag
&& elemDscr->endTag!=1) //End can be omitted

Some files were not shown because too many files have changed in this diff Show more