gnue/gnuef/src GFForm.py GFObjects.py UIbase.py...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/03/13 16:18:35

Modified files:
        gnuef/src      : GFForm.py GFObjects.py UIbase.py 
        gnuef/src/drivers/postgresql: DBdriver.py 

Log message:
        Removed dependency on negative OIDs signifing record deletion

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.76&r2=1.77
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.68&r2=1.69
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIbase.py.diff?r1=1.23&r2=1.24
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/drivers/postgresql/DBdriver.py.diff?r1=1.14&r2=1.15

Patches:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.76 gnue/gnuef/src/GFForm.py:1.77
--- gnue/gnuef/src/GFForm.py:1.76       Mon Mar  5 20:04:34 2001
+++ gnue/gnuef/src/GFForm.py    Tue Mar 13 16:18:34 2001
@@ -415,6 +415,8 @@
       for block in self.blockList:
         block.updateDetail(originatingBlock)
         
+      # Need to force UI update here for other blocks
+        
   def TriggerErrorFunc(self, t):
     't is an instance of TriggerError'
     print "Trigger Exception Message = ", t.msg
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.68 gnue/gnuef/src/GFObjects.py:1.69
--- gnue/gnuef/src/GFObjects.py:1.68    Mon Mar 12 20:29:27 2001
+++ gnue/gnuef/src/GFObjects.py Tue Mar 13 16:18:34 2001
@@ -574,21 +574,20 @@
                                                   
         if self.resultSetStatus[count] in ('modified', 'deleted'):
           if self.resultSet[count].has_key(self.uniqueKey):
-            print "Delete me ", self.resultSet[count][self.uniqueKey] , 
self.uniqueKey
-            if self.resultSet[count][self.uniqueKey] == 'deleted':
+            if self.resultSetStatus[count]  == 'modified':
               # record never in database so just mark for cleanup
-              self.resultSet[count][self.uniqueKey] = -1
+              # self.resultSet[count][self.uniqueKey] = -1
               
-            elif self.resultSet[count][self.uniqueKey] > 0:
+              # elif self.resultSet[count][self.uniqueKey] > 0:
               GFDebug.printMesg(1, "updating the record")
               self.dataConnection.update(self.table,mask)
             else:
               GFDebug.printMesg(1,"deleting the record")
-              mask[self.uniqueKey] = \
-                mask[self.uniqueKey] * -1
+              #mask[self.uniqueKey] = \
+              #  mask[self.uniqueKey] * -1
               self.dataConnection.delete(self.table,mask)
               # flip negative again so upcomming list purge see's the negatives
-              mask[self.uniqueKey] = -1
+              #mask[self.uniqueKey] = -1
               
           else:
             GFDebug.printMesg(1, "Inserting the record")
@@ -599,13 +598,16 @@
 
       # Clean up record list
       count = 0
-      self.resultSetStatus = []
+      #self.resultSetStatus = []
       while (count < len(self.resultSet)):
-        if self.resultSet[count].has_key(self.uniqueKey) and 
self.resultSet[count][self.uniqueKey] < 0:
+        if self.resultSet[count].has_key(self.uniqueKey) and 
self.resultSetStatus[count]=='deleted':
           del self.resultSet[count]
+          del self.resultSetStatus[count]
         else:
-          count = count + 1
-          self.resultSetStatus.append('saved')
+          self.resultSetStatus[count] = 'saved'
+          
+        count = count + 1
+#          self.resultSetStatus.append('saved')
 
       if len(self.resultSet) == 0:
         self.clear()
@@ -624,18 +626,22 @@
   # is marked for deletion on next commit
   #
   def markForRemoval(self,recordNumber):
-    print " unique key ", self.uniqueKey, " rset ", 
self.resultSet[recordNumber]
-    if not self.resultSet[recordNumber].has_key(self.uniqueKey):
-      self.resultSet[recordNumber][self.uniqueKey] = 'delete'
+    if self.resultSetStatus[recordNumber] == 'deleted':
+      self.resultSetStatus[recordNumber] = 'modified'
     else:
-      if self.resultSet[recordNumber][self.uniqueKey] == 'delete':
-        del self.resultSet[recordNumber][self.uniqueKey]
-      else:
-        self.resultSet[recordNumber][self.uniqueKey] = \
-        int(self.resultSet[recordNumber][self.uniqueKey]) * -1
+      self.resultSetStatus[recordNumber] = 'deleted'
+    
+    #if not self.resultSet[recordNumber].has_key(self.uniqueKey):
+    #  self.resultSet[recordNumber][self.uniqueKey] = 'delete'
+    #else:
+    #  if self.resultSet[recordNumber][self.uniqueKey] == 'delete':
+    #    del self.resultSet[recordNumber][self.uniqueKey]
+    #  else:
+    #    self.resultSet[recordNumber][self.uniqueKey] = \
+    #    int(self.resultSet[recordNumber][self.uniqueKey]) * -1
 
-    self.resultSetStatus[recordNumber] = 'deleted'
-    GFDebug.printMesg(1, "removing object: %s" % 
(self.resultSet[recordNumber][self.uniqueKey]))
+    #self.resultSetStatus[recordNumber] = 'deleted'
+    #GFDebug.printMesg(1, "removing object: %s" % 
(self.resultSet[recordNumber][self.uniqueKey]))
     
   def getField(self,recordNumber,fieldName):
     try:
@@ -721,7 +727,6 @@
     return results
   
   def delete(self, table, mask):
-    print "In database delete"
     self.link.delete(table,mask)
 
   def getFieldList(self,table):
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.23 gnue/gnuef/src/UIbase.py:1.24
--- gnue/gnuef/src/UIbase.py:1.23       Mon Mar  5 20:04:34 2001
+++ gnue/gnuef/src/UIbase.py    Tue Mar 13 16:18:34 2001
@@ -238,6 +238,7 @@
   # this will adjust the entries to ensure the proper one is visible
   #
   def adjustMultiView(self, event):
+#    print "adjustMultiView"
     block = event.data.block.form.currentBlock
     
     if event.getEvent() == 'uiPREVRECORD':
@@ -284,15 +285,18 @@
           else:
             index = block.recordCount
             
-        self.formToUI[entry][1] = index                                        
                                                                                
                                                                                
    
+        self.formToUI[entry][1] = index
+
   #
   # updateEntry
   #
   def updateEntry(self,event):
+    #print "updateEntry on %s" % self.formToUI[event.data]
     index = self.formToUI[event.data][1]
 
     block = event.data.block
     currentRecord = block.currentRecord
+#    print "Index %s CR %s block %s" %( index, currentRecord, block.name)
 
     if hasattr(event.data, 'style'):
       style = event.data.style
@@ -301,6 +305,7 @@
 
     # Fill the prior spots
     for count in range(index):
+#      print "Prior ",count
       value = 
block.dataSourceLink.getField(currentRecord-(index-count),event.data.field)
       if style == 'dropdown':
         value = event.data.allowedValues()[value]
Index: gnue/gnuef/src/drivers/postgresql/DBdriver.py
diff -u gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.14 
gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.15
--- gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.14  Tue Mar  6 19:02:23 2001
+++ gnue/gnuef/src/drivers/postgresql/DBdriver.py       Tue Mar 13 16:18:34 2001
@@ -75,6 +75,7 @@
   
   def delete(self,table,mask):
     try:
+      print "deleting"
       self.connection.delete(table,mask)
     except pg.error, value:
       raise DBError, value