gnue/common/src GDataObjects.py dbdrivers/_dbsi...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/01/08 17:07:58

Modified files:
        common/src     : GDataObjects.py 
        common/src/dbdrivers/_dbsig: DBdriver.py 
        common/src/dbdrivers/pypgsql: DBdriver.py 

Log message:
        Fixed some indexing issues
        pypgsql hack to deal w/ raised errors during empty fetches

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataObjects.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_dbsig/DBdriver.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/pypgsql/DBdriver.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: gnue/common/src/GDataObjects.py
diff -c gnue/common/src/GDataObjects.py:1.32 
gnue/common/src/GDataObjects.py:1.33
*** gnue/common/src/GDataObjects.py:1.32        Fri Dec 21 17:20:38 2001
--- gnue/common/src/GDataObjects.py     Tue Jan  8 17:07:58 2002
***************
*** 156,166 ****
      # Make sure "master" fields will be in our future query
      for field in dataObject._masterfields:
        self._fieldReferences[string.strip(field)] = ""
-       print "FOOOOOOO!"
  
      for field in dataObject._detailfields:
        dataObject._fieldReferences[string.strip(field)] = ""
-       print "BAR!"
  
      self._detailObjects.append ([dataObject, handler])
  
--- 156,164 ----
***************
*** 322,331 ****
    # move to record #, returns 1=New record loaded, 0=invalid #
    def setRecord(self, record):
  
!     while (record - 1 > len(self._cachedRecords)) and self._loadNextRecord():
!       pass
  
!     if record - 1 > len(self._cachedRecords):
        return 0
      else:
        self._currentRecord = record
--- 320,329 ----
    # move to record #, returns 1=New record loaded, 0=invalid #
    def setRecord(self, record):
  
!     while record - 1 > len(self._cachedRecords):
!       self._loadNextRecord()
  
!     if record + 1 >= len(self._cachedRecords):
        return 0
      else:
        self._currentRecord = record
***************
*** 437,442 ****
--- 435,441 ----
        if record._emptyFlag:
          record._deleteFlag = 1
  
+     
        # Adjust the current record if a preceding record is deleted
        if record._deleteFlag and i <= self._currentRecord:
          self._currentRecord -= 1
***************
*** 450,456 ****
--- 449,460 ----
            record._modifiedFlags[field] = 1
  
        record.post()
+ 
+       # Adjust the recordCount if the record is to be deleted
+       self._recordCount -= 1
+ 
        i += 1
+ 
  
      # Move to record 0 if all preceding records were deleted
      # (or set to -1 if all records were deleted)
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.29 
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.30
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.29   Fri Jan  4 19:36:38 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py        Tue Jan  8 17:07:58 2002
***************
*** 208,214 ****
  # TODO: BTW - This should not be in here :(
  #
  # TODO: Since popy fails the fetchmany() with 
!       if len(rsets):
          for rs in(rsets):
            if rs:
              i = 0
--- 208,214 ----
  # TODO: BTW - This should not be in here :(
  #
  # TODO: Since popy fails the fetchmany() with 
!       if rsets and len(rsets):
          for rs in(rsets):
            if rs:
              i = 0
Index: gnue/common/src/dbdrivers/pypgsql/DBdriver.py
diff -c gnue/common/src/dbdrivers/pypgsql/DBdriver.py:1.21 
gnue/common/src/dbdrivers/pypgsql/DBdriver.py:1.22
*** gnue/common/src/dbdrivers/pypgsql/DBdriver.py:1.21  Fri Jan  4 19:36:38 2002
--- gnue/common/src/dbdrivers/pypgsql/DBdriver.py       Tue Jan  8 17:07:58 2002
***************
*** 59,67 ****
        try:
          rsets = self._cursor.fetchmany()
        except self._dataObject._DatabaseError, err:
!         pass
  
!       if len(rsets):
          for rs in(rsets):
            if rs:
              i = 0
--- 59,69 ----
        try:
          rsets = self._cursor.fetchmany()
        except self._dataObject._DatabaseError, err:
!         rsets = None
!       except:
!         rsets = None
  
!       if rsets and len(rsets):
          for rs in(rsets):
            if rs:
              i = 0