gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-04-23 15:33:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GSWeb.framework/GSWDisplayGroup.m ([GSWDisplayGroup

Browse source 
-setCurrentBatchIndex:]): fixed index out of bound.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@8195 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Mirko Viviani 2000-11-24 09:32:34 +00:00
parent 8c8659bc16
commit 423ee2461e
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2000-11-24 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* GSWeb.framework/GSWDisplayGroup.m ([GSWDisplayGroup
-setCurrentBatchIndex:]): fixed index out of bound.
2000-11-04 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWElementIDString.[hm]: fix bug

32
GSWeb.framework/GSWDisplayGroup.m
View file

@ -78,8 +78,8 @@ static char rcsId[] = "$Id$";
{
/*
Description: <EOKeyValueUnarchiver: 0x1a84d20>
--[1] Dumping object 0x1a84d20 of Class EOKeyValueUnarchiver
_propertyList=NSDictionary * object:0x1057850 Description:{
--[1] Dumping object 0x1a84d20 of Class EOKeyValueUnarchiver
_propertyList=NSDictionary * object:0x1057850 Description:{
class = WODisplayGroup;
dataSource = {
class = EODatabaseDataSource;
@ -90,12 +90,12 @@ Description: <EOKeyValueUnarchiver: 0x1a84d20>
_numberOfObjectsPerBatch = 10;
selectsFirstObjectAfterFetch = YES;
}
_parent=id object:0x0 Description:*nil*
_nextParent=id object:0x0 Description:*nil*
_allUnarchivedObjects=NSMutableArray * object:0x1a85920 Description:()
_delegate=id object:0x1a84ff0 Description:<WOBundleUnarchiverDelegate: 0x1a84ff0>
_awakenedObjects=struct ? {...} * PTR
isa=Class Class:EOKeyValueUnarchiver
_parent=id object:0x0 Description:*nil*
_nextParent=id object:0x0 Description:*nil*
_allUnarchivedObjects=NSMutableArray * object:0x1a85920 Description:()
_delegate=id object:0x1a84ff0 Description:<WOBundleUnarchiverDelegate: 0x1a84ff0>
_awakenedObjects=struct ? {...} * PTR
isa=Class Class:EOKeyValueUnarchiver
*/
if ((self=[self init]))
@ -751,17 +751,21 @@ Description: <EOKeyValueUnarchiver: 0x1a84d20>
- (id)fetch
{
BOOL fetch = YES;
LOGObjectFnStart();
if(_delegateRespondsTo.shouldFetchObjects == YES)
fetch = [delegate displayGroupShouldFetch:self];
NSDebugMLog(@"fetch=%d",(int)fetch);
if(fetch)
{
NSArray* objects=nil;
NSArray *objects=nil;
NSDebugMLog(@"_dataSource=%@",_dataSource);
objects=[_dataSource fetchObjects];
objects = [_dataSource fetchObjects];
NSDebugMLog(@"objects=%@",objects);
[self setObjectArray:objects];
@ -770,6 +774,7 @@ Description: <EOKeyValueUnarchiver: 0x1a84d20>
didFetchObjects:_allObjects];
};
LOGObjectFnStop();
return nil;//FIXME
}
@ -894,6 +899,7 @@ Description: <EOKeyValueUnarchiver: 0x1a84d20>
atIndex:(unsigned)index
{
BOOL insert = YES;
LOGObjectFnStart();
if(_delegateRespondsTo.shouldInsertObject == YES)
insert = [delegate displayGroup:self
@ -1419,9 +1425,9 @@ Description: <EOKeyValueUnarchiver: 0x1a84d20>
if(index_ > batchCount)
index_ = 1;
if(!_numberOfObjectsPerBatch)
num = [_allObjects count];
else
num = [_allObjects count];
if(_numberOfObjectsPerBatch && _numberOfObjectsPerBatch < num)
num = _numberOfObjectsPerBatch;
if(num)