gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-05-20 19:06:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* GSWeb.framework/GSWRequest.m:
		o fix in -_getFormValuesFromMultipartFormData:
		   add [parser expectNoHeaders] to force body parsing as
			otherwise it fail in some context (navigator/form values)
  	* GSWExtensions.framework/GSWCollapsibleComponentContent.m:
		o use RCS_ID
	* GSWExtensions.framework/GSWExceptionPage.m:
		o logs
		o use RCS_ID
	* GSWExtensions.framework/GSWDictionaryRepetition.m:
		o use RCS_ID
	* GSWExtensions.framework/GSWIFrame.m:
		o clean warnings
		o use RCS_ID
	* GSWExtensions.framework/GSWLongResponsePage.m:
		o use RCS_ID
	* GSWExtensions.framework/GSWMetaRefresh.m:
		o use RCS_ID
	* GSWExtensions.framework/GSWPageRestorationErrorPage.m:
		o use RCS_ID
	* GSWExtensions.framework/GSWRedirect.m:
		o use RCS_ID
	* GSWExtensions.framework/GSWSessionCreationErrorPage.m:
		o use RCS_ID
	* GSWExtensions.framework/GSWSessionRestorationErrorPage.m:
		o use RCS_ID
	* GSWExtensions.framework/GSWStatsPage.m:
		o use RCS_ID
	* GSWExtensionsGSW.framework/GSWLogin.m:
		o use RCS_ID
	* GSWExtensionsGSW.framework/GSWSimpleFormComponent.m:
		o use RCS_ID
	* GSWExtensionsGSW.framework/GSWTabComponent.m:
		o use RCS_ID
	* GSWExtensionsGSW.framework/GSWValidationFailureComponent.m:
		o use RCS_ID
	* GSWeb.framework/GSWApplication.m:
		o change setIVar... by takeValue:forKey:
	* GSWeb.framework/GSWElement.m:
		o logs
	* GSWeb.framework/GSWeb.h:
		o removed NSObject+IVarAccess+PerformSel.h inclusion
	* GSWeb.framework/GSWAssociation.m:
		o removed commented set/getIVar
	* GSWeb.framework/GSWComponent.m:
		o removed commented set/getIVar
	* GSWeb.framework/GSWSession.m:
		o retain/release deleteContextID in -savePageInPermanentCache
			(from St�phane Corth�sy <stephane@sente.ch>)
		o retain/release deleteContextID in -_savePage:forChange
			(from St�phane Corth�sy <stephane@sente.ch>)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@16238 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Manuel Guesdon 2003-03-24 07:45:52 +00:00
parent 3f3c03854e
commit d8acaba816
26 changed files with 210 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

54
ChangeLog
View file

@ -1,3 +1,57 @@
2003-03-24 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWRequest.m:
o fix in -_getFormValuesFromMultipartFormData:
add [parser expectNoHeaders] to force body parsing as
otherwise it fail in some context (navigator/form values)
* GSWExtensions.framework/GSWCollapsibleComponentContent.m:
o use RCS_ID
* GSWExtensions.framework/GSWExceptionPage.m:
o logs
o use RCS_ID
* GSWExtensions.framework/GSWDictionaryRepetition.m:
o use RCS_ID
* GSWExtensions.framework/GSWIFrame.m:
o clean warnings
o use RCS_ID
* GSWExtensions.framework/GSWLongResponsePage.m:
o use RCS_ID
* GSWExtensions.framework/GSWMetaRefresh.m:
o use RCS_ID
* GSWExtensions.framework/GSWPageRestorationErrorPage.m:
o use RCS_ID
* GSWExtensions.framework/GSWRedirect.m:
o use RCS_ID
* GSWExtensions.framework/GSWSessionCreationErrorPage.m:
o use RCS_ID
* GSWExtensions.framework/GSWSessionRestorationErrorPage.m:
o use RCS_ID
* GSWExtensions.framework/GSWStatsPage.m:
o use RCS_ID
* GSWExtensionsGSW.framework/GSWLogin.m:
o use RCS_ID
* GSWExtensionsGSW.framework/GSWSimpleFormComponent.m:
o use RCS_ID
* GSWExtensionsGSW.framework/GSWTabComponent.m:
o use RCS_ID
* GSWExtensionsGSW.framework/GSWValidationFailureComponent.m:
o use RCS_ID
* GSWeb.framework/GSWApplication.m:
o change setIVar... by takeValue:forKey:
* GSWeb.framework/GSWElement.m:
o logs
* GSWeb.framework/GSWeb.h:
o removed NSObject+IVarAccess+PerformSel.h inclusion
* GSWeb.framework/GSWAssociation.m:
o removed commented set/getIVar
* GSWeb.framework/GSWComponent.m:
o removed commented set/getIVar
* GSWeb.framework/GSWSession.m:
o retain/release deleteContextID in -savePageInPermanentCache
(from Stéphane Corthésy <stephane@sente.ch>)
o retain/release deleteContextID in -_savePage:forChange
(from Stéphane Corthésy <stephane@sente.ch>)
2003-03-23 David Ayers <d.ayers@inode.at>
* GSWAdaptors/Apache/mod_gsweb.c : Include http_protocol.h

9
GSWExtensions.framework/GSWCollapsibleComponentContent.m
View file

@ -1,8 +1,9 @@
/** GSWCollapsibleComponentContent.m - <title>GSWeb: Class GSWCollapsibleComponentContent</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtWOCompatibility.h"
#include "GSWCollapsibleComponentContent.h"

9
GSWExtensions.framework/GSWDictionaryRepetition.m
View file

@ -1,8 +1,9 @@
/** GSWDictionaryRepetition.m - <title>GSWeb: Class GSWDictionaryRepetition</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtWOCompatibility.h"
#include "GSWDictionaryRepetition.h"

19
GSWExtensions.framework/GSWExceptionPage.m
View file

@ -1,8 +1,9 @@
/** GSWExceptionPage.m - <title>GSWeb: Class GSWExceptionPage</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtWOCompatibility.h"
#include "GSWExceptionPage.h"
@ -66,9 +69,10 @@ static char rcsId[] = "$Id$";
-(NSArray*)getReasons
{
if (!_reasons)
{
ASSIGN(_reasons,[[_exception reason] componentsSeparatedByString:@"\n"]);
};
{
ASSIGN(_reasons,[[_exception reason] componentsSeparatedByString:@"\n"]);
NSDebugMLog(@"_reasons=%@",_reasons);
};
return _reasons;
};
@ -83,13 +87,14 @@ static char rcsId[] = "$Id$";
-(void)setException:(NSException*)exception
{
ASSIGN(_exception,exception);
NSDebugMLog(@"_exception=%@",_exception);
};
-(id)getTmpUserInfoValue
{
//If array, print it nicely
if ([_tmpUserInfoValue isKindOfClass:[NSArray class]])
return [(NSArray*)_tmpUserInfoValue componentsJoinedByString:@"\n"];
return [(NSArray*)_tmpUserInfoValue componentsJoinedByString:@"\n"];
else
return _tmpUserInfoValue;
}

11
GSWExtensions.framework/GSWIFrame.m
View file

@ -1,8 +1,9 @@
/** GSWIFrame.m - <title>GSWeb: Class GSWIFrame</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtWOCompatibility.h"
#include "GSWIFrame.h"
@ -47,7 +50,7 @@ static char rcsId[] = "$Id$";
if ([self hasBinding:@"src"])
src=[self valueForBinding:@"src"];
else if ([self hasBinding:@"pageName"] || [self hasBinding:@"value"])
src=[[self context]componentActionURL];
src=(NSString*)[[self context]componentActionURL];
return src;
};

8
GSWExtensions.framework/GSWLongResponsePage.m
View file

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

9
GSWExtensions.framework/GSWMetaRefresh.m
View file

@ -1,8 +1,9 @@
/** GSWMetaRefresh.m - <title>GSWeb: Class GSWMetaRefresh</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtWOCompatibility.h"
#include "GSWMetaRefresh.h"

9
GSWExtensions.framework/GSWPageRestorationErrorPage.m
View file

@ -1,8 +1,9 @@
/** GSWPageRestorationErrorPage.m - <title>GSWeb: Class GSWPageRestorationErrorPage</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtWOCompatibility.h"
#include "GSWPageRestorationErrorPage.h"

9
GSWExtensions.framework/GSWRedirect.m
View file

@ -1,8 +1,9 @@
/** GSWRedirect.m - <title>GSWeb: Class GSWRedirect</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
<*license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtWOCompatibility.h"
#include "GSWRedirect.h"

9
GSWExtensions.framework/GSWSessionCreationErrorPage.m
View file

@ -1,8 +1,9 @@
/** GSWSessionCreationErrorPage.m - <title>GSWeb: Class GSWSessionCreationErrorPage</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtWOCompatibility.h"
#include "GSWSessionCreationErrorPage.h"

9
GSWExtensions.framework/GSWSessionRestorationErrorPage.m
View file

@ -1,8 +1,9 @@
/** GSWSessionRestorationErrorPage.m - <title>GSWeb: Class GSWSessionRestorationErrorPage</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 "GSWExtWOCompatibility.h"
#include "GSWSessionRestorationErrorPage.h"

9
GSWExtensions.framework/GSWStatsPage.m
View file

@ -1,8 +1,9 @@
/** GSWStatsPage.m - <title>GSWeb: Class GSWStatsPage</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtWOCompatibility.h"
#include "GSWStatsPage.h"

6
GSWExtensions.framework/Makefile.preamble
View file

@ -1,8 +1,8 @@
# -*-makefile-*-
# 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.
#
@ -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

4
GSWExtensionsGSW.framework/GSWFileUploadComponent.m
View file

@ -1,9 +1,9 @@
/** GSWFileUploadComponent.m - <title>GSWeb: Class GSWFileUploadComponent</title>
Copyright (C) 2003 Free Software Foundation, Inc.
Copyright (C) 2002-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: May 2002
Date: May 2002
$Revision$
$Date$

9
GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m
View file

@ -1,8 +1,9 @@
/** GSWFileUploadFormComponent.m - <title>GSWeb: Class GSWFileUploadFormComponent</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: Dec 1999
Date: Dec 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtGSWWOCompatibility.h"
#include "GSWFileUploadFormComponent.h"

25
GSWExtensionsGSW.framework/GSWLogin.m
View file

@ -1,11 +1,18 @@
/* GSWLogin.m - GSWeb: Class GSWLogin
Copyright (C) 1999 Free Software Foundation, Inc.
/** GSWLogin.m - <title>GSWeb: Class GSWLogin</title>
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@sbuilders.com>
Date: Apr 1999
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Apr 1999
$Revision$
$Date$
<abstract></abstract>
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,7 +26,13 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
</license>
**/
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtGSWWOCompatibility.h"
#include "GSWLogin.h"
//====================================================================

9
GSWExtensionsGSW.framework/GSWSimpleFormComponent.m
View file

@ -1,8 +1,9 @@
/** GSWSimpleFormComponent.m - <title>GSWeb: Class GSWSimpleFormComponent</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$
@ -28,7 +29,9 @@
</license>
*/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtGSWWOCompatibility.h"
#include "GSWSimpleFormComponent.h"

9
GSWExtensionsGSW.framework/GSWTabComponent.m
View file

@ -1,8 +1,9 @@
/** GSWTabComponent.m - <title>GSWeb: Class GSWTabComponent</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
Date: Apr 1999
$Revision$
$Date$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtGSWWOCompatibility.h"
#include "GSWTabComponent.h"

9
GSWExtensionsGSW.framework/GSWValidationFailureComponent.m
View file

@ -1,8 +1,9 @@
/** GSWValidationFailureComponent.m - <title>GSWeb: Class GSWValidationFailureComponent</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$
@ -28,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include "GSWExtGSWWOCompatibility.h"
#include "GSWValidationFailureComponent.h"

5
GSWeb.framework/GSWApplication.m
View file

@ -2800,6 +2800,7 @@ selfLockn,
int iName=0;
GSWComponent* page=nil;
LOGObjectFnStart();
NSLog(@"EXCEPTION: %@",anException);
NSDebugMLLog(@"application",@"context=%@",context);
if (context)
[context _putAwakeComponentsToSleep];
@ -2828,8 +2829,8 @@ selfLockn,
{
page=[self pageWithName:GSWExceptionPageName[GSWebNamingConvForRound(iName)]
inContext:context];
[page setIVarNamed:@"exception"
withValue:anException];
[page takeValue:anException
forKey:@"exception"];
}
NS_HANDLER
{

17
GSWeb.framework/GSWAssociation.m
View file

@ -740,7 +740,6 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
for(i=0;!v && i<count;i++)
{
id language=[languages objectAtIndex:i];
//MGNEW v=[retValue getIVarNamed:language];
v=[retValue valueForKey:language];
};
retValue=v;
@ -753,7 +752,6 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
part);
NS_DURING
{
//MGNEW retValue=[retValue getIVarNamed:part];
retValue=[retValue valueForKey:part];
}
NS_HANDLER
@ -843,7 +841,8 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
[object validationFailedWithException:exception
value:value
keyPath:keyPath];
} else {
} else
{
// no exception, set the value
[tmpObject takeValue:value
@ -934,18 +933,16 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
else
tmpObject=nil;
}
else {
//MGNEW tmpObject=[tmpObject getIVarNamed:part];
tmpObject=[tmpObject valueForKey:part];//MGNEW
}
else
{
tmpObject=[tmpObject valueForKey:part];
}
}
else
{
GSWLogAssertGood(tmpObject);
//MGNEW [tmpObject setIVarNamed:part
// withValue:value_];
[tmpObject takeValue:value
forKey:part];//MGNEW
forKey:part];
#ifdef GDL2
NSDebugMLLog(@"associations",@"object class=%@",[object class]);
NSDebugMLLog(@"associations",@"tmpObject class=%@",[tmpObject class]);

5
GSWeb.framework/GSWComponent.m
View file

@ -398,8 +398,7 @@ associationsKeys:(NSArray*)associationsKeys
if ([anAssociation isValueSettable]
&& ![anAssociation isKindOfClass:[GSWBindingNameAssociation class]]) //TODOV
{
//MGNEW aValue=[self getIVarNamed:aKey];
aValue=[self valueForKey:aKey];//MGNEW
aValue=[self valueForKey:aKey];
NSDebugMLLog(@"GSWComponent",@"aValue=%@",aValue);
if (doLog)
[anAssociation logSynchronizeComponentToParentForValue:aValue
@ -442,8 +441,6 @@ associationsKeys:(NSArray*)associationsKeys
if (doLog)
[anAssociation logSynchronizeParentToComponentForValue:aValue
inComponent:self];
/*//MGNEW [self setIVarNamed:aKey
withValue:aValue];*/
#if GDL2 // GDL2 implementation
[self smartTakeValue:aValue
forKey:aKey];

20
GSWeb.framework/GSWElement.m
View file

@ -62,37 +62,23 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
line:(int)line
{
LOGObjectFnStartC("GSWElement");
/* NSDebugMLLog(@"GSWElement",@"In Object %p Class %@ definitionName=%@ _appendToResponseElementID=%@ [_appendToResponseElementID length]=%d",
self,
[self class],
[self definitionName],
_appendToResponseElementID,[_appendToResponseElementID length]);
*/
[self assertIsElementIDInContext:context
method:method
file:file
line:line];
/* NSDebugMLLog(@"GSWElement",@"In Object %p Class %@ definitionName=%@ _appendToResponseElementID=%@ [_appendToResponseElementID length]=%d",
self,
[self class],
[self definitionName],
_appendToResponseElementID,[_appendToResponseElementID length]);
*/
if ([_appendToResponseElementID length]>0)
{
NSString* elementID=[context elementID];
BOOL appendToResponseElementIDIsFirst=NO;
BOOL elementIDIsFirst=NO;
BOOL OK=YES;
/* if ([elementID length]==0)
elementID=@"MARKER";*/
appendToResponseElementIDIsFirst=([_appendToResponseElementID length]==0 || [_appendToResponseElementID isEqualToString:@"0"]);
elementIDIsFirst=([elementID length]==0 || [elementID isEqualToString:@"0"]);
if (!appendToResponseElementIDIsFirst || appendToResponseElementIDIsFirst!=elementIDIsFirst)
{
OK=[_appendToResponseElementID isEqualToString:elementID];
NSDebugMLog(@"[context elementID]=%@ _appendToResponseElementID=%@ [_appendToResponseElementID length]=%d OK=%d [context isInLoop]=%d",
[context elementID],_appendToResponseElementID,[_appendToResponseElementID length],OK,[context isInLoop]);
NSDebugMLLog(@"GSWElement",@"[context elementID]=%@ _appendToResponseElementID=%@ [_appendToResponseElementID length]=%d OK=%d [context isInLoop]=%d",
[context elementID],_appendToResponseElementID,[_appendToResponseElementID length],OK,[context isInLoop]);
};
if (!OK && ![context isInLoop])
{
@ -151,7 +137,7 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
NSString* senderID=[context senderID];
if (start)
[context addToDocStructureElement:self];
NSDebugMLLog(@"gswdync",@"%s:.%d - %@ %s ELEMENT self=%p class=%@ defName=%@ id=%@ appendID:%@ %s%@",
NSDebugMLLog(@"GSWElement",@"%s:.%d - %@ %s ELEMENT self=%p class=%@ defName=%@ id=%@ appendID:%@ %s%@",
file,line,NSStringFromSelector(method),
(start ? "START" : (stop ? "STOP" : "")),
self,

7
GSWeb.framework/GSWRequest.m
View file

@ -1374,12 +1374,13 @@ RCS_ID("$Id$")
key,[value objectAtIndex:i]];
};
[headersString appendString:@"\n"];
NSDebugMLLog(@"requests",@"headersString=%@",headersString);
NSDebugMLLog(@"requests",@"content=%@",[[[NSString alloc]initWithData:_content
encoding:NSISOLatin1StringEncoding]autorelease]);
NSDebugMLLog(@"requests",@"headersString=[\n%@\n]",headersString);
NSDebugMLLog(@"requests",@"content=[\n%@\n]",[[[NSString alloc]initWithData:_content
encoding:NSISOLatin1StringEncoding]autorelease]);
headersData=[headersString dataUsingEncoding:NSISOLatin1StringEncoding];
parser=[GSMimeParser mimeParser];
[parser parse:headersData];
[parser expectNoHeaders];
if ([parser parse:_content])
[parser parse:nil];
NSDebugMLLog(@"requests",@"[parser isComplete]=%d",[parser isComplete]);

19
GSWeb.framework/GSWSession.m
View file

@ -641,6 +641,7 @@ RCS_ID("$Id$")
[GSWApplication statusLogWithFormat:@"Deleting permanent cached Page"];
deleteContextID=[_permanentContextIDArray objectAtIndex:0];
GSWLogAssertGood(deleteContextID);
RETAIN(deleteContextID); // We'll remove it from array
[GSWApplication statusLogWithFormat:@"permanentContextIDArray=%@",
_permanentContextIDArray];
[GSWApplication statusLogWithFormat:@"contextID=%@",deleteContextID];
@ -657,6 +658,7 @@ RCS_ID("$Id$")
[deletePage class]];
NSDebugMLLog(@"sessions",@"SESSION REMOVE: %p",[permanentPageCache objectForKey:deleteContextID]);
[permanentPageCache removeObjectForKey:deleteContextID];
RELEASE(deleteContextID);
};
contextID=[context contextID];
NSAssert(contextID,@"No contextID");
@ -917,7 +919,7 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self);
//--------------------------------------------------------------------
-(void)_savePage:(GSWComponent*)page
forChange:(BOOL)forChange
forChange:(BOOL)forChange
{
//OK
GSWResponse* response=nil;
@ -925,7 +927,9 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self);
GSWTransactionRecord* transactionRecord=nil;
unsigned int pageCacheSize=0;
NSString* contextID=nil;
LOGObjectFnStart();
NSAssert(page,@"No Page");
if ([_contextArrayStack count]>0) // && _forChange!=NO ??
[self _rearrangeContextArrayStack];
@ -933,6 +937,7 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self);
// Get the response
response=[_currentContext response];//currentContext??
NSDebugMLLog(@"sessions",@"response=%@",response);
isClientCachingDisabled=[response _isClientCachingDisabled]; //So what
NSDebugMLLog(@"sessions",@"currentContext=%@",_currentContext);
@ -950,8 +955,10 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self);
// Create contextArrayStack and contextRecords if not already created
if (!_contextArrayStack)
_contextArrayStack=[NSMutableArray new];
if (!_contextRecords)
_contextRecords=[NSMutableDictionary new];
NSDebugMLLog(@"sessions",@"contextArrayStack=%@",_contextArrayStack);
NSDebugMLLog(@"sessions",@"contextRecords=%@",_contextRecords);
@ -960,25 +967,35 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self);
{
id deleteRecord=nil;
NSString* deleteContextID=nil;
[GSWApplication statusLogWithFormat:@"Deleting cached Page"];
deleteContextID=[_contextArrayStack objectAtIndex:0];
GSWLogAssertGood(deleteContextID);
RETAIN(deleteContextID); // We'll remove it from array
[GSWApplication statusLogWithFormat:@"contextArrayStack=%@",_contextArrayStack];
[GSWApplication statusLogWithFormat:@"contextID=%@",deleteContextID];
NSDebugMLLog(@"sessions",@"_deleteContextID=%@",deleteContextID);
NSDebugMLLog(@"sessions",@"[contextArrayStack objectAtIndex:0]=%@",
[_contextArrayStack objectAtIndex:0]);
NSDebugMLLog(@"sessions",@"[contextArrayStack objectAtIndex:0] retainCount=%d",
(int)[[_contextArrayStack objectAtIndex:0] retainCount]);
NSDebugMLLog(@"sessions",@"SESSION REMOVE: %p",[_contextArrayStack objectAtIndex:0]);
[_contextArrayStack removeObjectAtIndex:0];
deleteRecord=[_contextRecords objectForKey:deleteContextID];
GSWLogAssertGood(deleteRecord);
GSWLogAssertGood([deleteRecord responsePage]);
[GSWApplication statusLogWithFormat:@"delete page of class=%@",
[[deleteRecord responsePage] class]];
NSDebugMLLog(@"sessions",@"SESSION REMOVE: %p",[_contextRecords objectForKey:deleteContextID]);
[_contextRecords removeObjectForKey:deleteContextID];
RELEASE(deleteContextID);
};
GSWLogC("display page");

1
GSWeb.framework/GSWeb.h
View file

@ -133,7 +133,6 @@
#include "GSWDebug.h"
#include "NSString+Trimming.h"
#include "NSString+HTML.h"
#include "NSObject+IVarAccess+PerformSel.h"
#include "GSWElementIDString.h"
#include "GSWResponse.h"
#include "GSWHTMLLexer.h"