diff --git a/ChangeLog b/ChangeLog index 92ab63a..95f0b84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2004-04-22 S.J. Chun + + * GSWExtensions.framework/GSWKeyValueConditional.m + ([GSWKeyValueConditional condition]): Declare all variables at top + of block to be able to compile with gcc 2.95. + * GSWeb.framework/GSWBaseParser.m + (_ParserDebugLogBuffer):Ditto. + * GSWeb.framework/GSWDisplayGroup.m + ([GSWDisplayGroup _deleteObjects]), + ([GSWDisplayGroup displayBatchContainingSelectedObject]), + ([GSWDisplayGroup setDefaultStringMatchFormat:]), + ([GSWDisplayGroup _setUpForNewDataSource]): Ditto. + * GSWeb.framework/GSWHTMLDynamicElement.m + ([GSWHTMLDynamicElement computeActionStringWithActionClassAssociation: + directActionNameAssociation:pathQueryDictionaryAssociation: + otherPathQueryAssociations:inContext:]): Ditto. + * GSWeb.framework/GSWHTMLRawParser.m + ([GSWHTMLRawParser tagPropertiesForType:betweenIndex:andIndex:]), + ([GSWHTMLRawParser parseHTML]): Ditto. + * GSWeb.framework/GSWRequest.m + ([GSWRequest valuesFromHeaderString:], [GSWRequest initWithString:]), + ([GSWRequest cookies]): Ditto. + * GSWeb.framework/GSWStatisticsStore.m + ([GSWStatisticsStore _sessionTerminating:]): Ditto. + * GSWeb.framework/GSWTemporaryElement.m + ([GSWTemporaryElement _elementWithDeclaration:name:properties: + template:languages:]): Ditto. + + 2004-04-20 David Ayers * GSWeb.framework/GSWDisplayGroup.m: diff --git a/GSWExtensions.framework/GSWKeyValueConditional.m b/GSWExtensions.framework/GSWKeyValueConditional.m index 2875a8d..bb7bdb7 100644 --- a/GSWExtensions.framework/GSWKeyValueConditional.m +++ b/GSWExtensions.framework/GSWKeyValueConditional.m @@ -46,16 +46,18 @@ RCS_ID("$Id$") } //-------------------------------------------------------------------- -- (BOOL) condition +- (BOOL) condition { BOOL condition = NO; + id parentValue; + id value; LOGObjectFnStart(); -// id key = [self valueForBinding:@"key"]; -// id parentValue = (key ? [[self parent] valueForKeyPath:key]:nil); - id parentValue = [self valueForBinding:@"key"]; - id value = [self valueForBinding:@"value"]; +// key = [self valueForBinding:@"key"]; +// parentValue = (key ? [[self parent] valueForKeyPath:key]:nil); + parentValue = [self valueForBinding:@"key"]; + value = [self valueForBinding:@"value"]; NSDebugMLLog(@"GSWComponent",@"parentValue=%@",parentValue); NSDebugMLLog(@"GSWComponent",@"value=%@",value); diff --git a/GSWeb.framework/GSWBaseParser.m b/GSWeb.framework/GSWBaseParser.m index 85856bf..fe9ba48 100644 --- a/GSWeb.framework/GSWBaseParser.m +++ b/GSWeb.framework/GSWBaseParser.m @@ -139,8 +139,8 @@ RCS_ID("$Id$") void _ParserDebugLogBuffer(char* fn,char* file,int line,unichar* uniBuf,int length,int index,int charsCount) { - printf("In %s (%s %d): length=%d index=%d ==>\n",fn,file,line,length,index); int i=0; + printf("In %s (%s %d): length=%d index=%d ==>\n",fn,file,line,length,index); for(i=index;i0) { - result = YES; int i=0; + result = YES; for(i=0;i0) newBatchIndex = selectionIndex / _numberOfObjectsPerBatch + 1; @@ -1945,9 +1946,10 @@ of all Batches, not only the current one. - (void)setDefaultStringMatchFormat:(NSString *)format { + NSRange range; LOGObjectFnStart(); // This must contains value format string - NSRange range=[format rangeOfString:@"%@"]; + range=[format rangeOfString:@"%@"]; if (range.length==0) { [[NSException exceptionWithName:NSInvalidArgumentException @@ -2465,11 +2467,12 @@ of all Batches, not only the current one. LOGObjectFnStart(); if(_dataSource) { + EOEditingContext* editingContext; // Set flags to detect customer dataSource _flags.isCustomDataSourceClass = [self _isCustomDataSourceClass:[_dataSource class]]; // Add self as observer on dataSource editingContext - EOEditingContext* editingContext = [_dataSource editingContext]; + editingContext = [_dataSource editingContext]; if(editingContext) { [[NSNotificationCenter defaultCenter] diff --git a/GSWeb.framework/GSWHTMLDynamicElement.m b/GSWeb.framework/GSWHTMLDynamicElement.m index 00fd935..78e49dd 100644 --- a/GSWeb.framework/GSWHTMLDynamicElement.m +++ b/GSWeb.framework/GSWHTMLDynamicElement.m @@ -835,6 +835,10 @@ attributeAssociations:(NSDictionary*)attributeAssociations if ([pathQueryDictionary count]>0 || [otherPathQueryAssociations count]>0) { NSMutableDictionary* pathKV=nil; + NSArray* keys; + unsigned int count; + unsigned int i; + if ([otherPathQueryAssociations count]>0) { NSEnumerator* enumerator = [otherPathQueryAssociations keyEnumerator]; @@ -861,9 +865,9 @@ attributeAssociations:(NSDictionary*)attributeAssociations NSDebugMLLog(@"gswdync",@"pathKV=%@",pathKV); // We sort keys so URL are always the same for same parameters - NSArray* keys=[[pathKV allKeys]sortedArrayUsingSelector:@selector(compare:)]; - int count=[keys count]; - int i=0; + keys=[[pathKV allKeys]sortedArrayUsingSelector:@selector(compare:)]; + count=[keys count]; + NSDebugMLLog(@"gswdync",@"pathKV=%@",pathKV); for(i=0;i0) { + unsigned int i; //Sor oon quality desc [qvs sortUsingSelector:@selector(compareOnQualityDesc:)]; //Remove Duplicates - int i=0; for(i=0;icookies if (!_cookies) { + NSDictionary* cookies; + NSEnumerator* keysEnum; + NSString* key; [self _initCookies]; // super cookies init - NSDictionary* cookies=[self cookieValues]; - NSEnumerator* keysEnum=[cookies keyEnumerator]; - NSString* key=nil; + cookies=[self cookieValues]; + keysEnum=[cookies keyEnumerator]; + key=nil; while((key=[keysEnum nextObject])) { NSString* value=[cookies objectForKey:key]; diff --git a/GSWeb.framework/GSWStatisticsStore.m b/GSWeb.framework/GSWStatisticsStore.m index ea16b4e..338578c 100644 --- a/GSWeb.framework/GSWStatisticsStore.m +++ b/GSWeb.framework/GSWStatisticsStore.m @@ -267,13 +267,18 @@ RCS_ID("$Id$") //-------------------------------------------------------------------- -(void)_sessionTerminating:(GSWSession*)aSession { + int activeSessionsCount; + NSArray* statistics; + NSDate* sessionBirthDate; + NSTimeInterval sessionTimeOut; + int sessionRequestCounter; //OK LOGObjectFnStart(); - int activeSessionsCount=[GSWApp _activeSessionsCount]; - NSArray* statistics=[aSession statistics]; - NSDate* sessionBirthDate=nil; - NSTimeInterval sessionTimeOut=0; - int sessionRequestCounter=0; + activeSessionsCount=[GSWApp _activeSessionsCount]; + statistics=[aSession statistics]; + sessionBirthDate=nil; + sessionTimeOut=0; + sessionRequestCounter=0; [self _updatePathsStatisticsWithPaths:statistics]; sessionBirthDate=[aSession _birthDate]; sessionTimeOut=[aSession timeOut]; diff --git a/GSWeb.framework/GSWTemporaryElement.m b/GSWeb.framework/GSWTemporaryElement.m index ec2d256..f68a776 100644 --- a/GSWeb.framework/GSWTemporaryElement.m +++ b/GSWeb.framework/GSWTemporaryElement.m @@ -340,10 +340,11 @@ May raise exception if element can't be created else { Class elementClass = NSClassFromString(elementType); + NSDictionary* associations; NSDebugMLog(@"elementClass=%@",elementClass); - NSDictionary* associations=[declaration associations]; + associations=[declaration associations]; if ([properties count]>0) { NSEnumerator* _propertiesEnum = [properties keyEnumerator];