gnue/gnuef TODO src/DBpostgresql.py src/GFForm....

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/10/11 05:22:10

Modified files:
        gnuef          : TODO 
        gnuef/src      : DBpostgresql.py GFForm.py GFObjects.py 
                         UIwxpython.py 
Added files:
        gnuef/src      : DBgeas.py 

Log message:
        Added the ability to delete (F5)
        Start of GEAS driver added

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/TODO.diff?r1=1.8&r2=1.9
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/DBgeas.py.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/DBpostgresql.py.diff?r1=1.4&r2=1.5
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.17&r2=1.18
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.14&r2=1.15
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.9&r2=1.10

Patches:
Index: gnue/gnuef/TODO
diff -u gnue/gnuef/TODO:1.8 gnue/gnuef/TODO:1.9
--- gnue/gnuef/TODO:1.8 Sat Oct  7 23:13:32 2000
+++ gnue/gnuef/TODO     Wed Oct 11 05:22:09 2000
@@ -1,32 +1,28 @@
 The todo list for gnue forms - 
 
-Tasks have a rating (easy, moderate, hard, and you poor bastard)
 Tasks that someone is working on have the persons email and/or 
 name in []
 
   fill in todo list (easy as there is a lot of DOs to TO) [everyone]
 
   Convert the form and view to support auto ajustment of grid system 
-    to text based instead of pixel based (hard)
+    to text based instead of pixel based
 
-  Add menu support (moderate)
+  Add menu support
 
-  Add toolbar support (moderate)
+  Add toolbar support
 
-  Add layout manager support (hard)
+  Add layout manager support
 
-  Add database support (easy - yeah right :) [jamest]
+  Add GEAS support
 
-  Add support of mouse focus to the charater (you poor bastard) 
+  Add support of mouse focus to the charater
 
-  clean up code (you poor bastard :) [everyone working on the code]
+  clean up code  [everyone working on the code]
 
-  a better XML parser - we don't handle the <option></option> blocks 
-  at this time and we should as well as <trigger> (hard) [chris]
-
-  need to add default attrib values support (i dont remember why this is here)
+  need to add default attrib values support
   
-  Create GNUE Forms: Designer the screen painter (you poor bastard)
+  Create GNUE Forms: Designer the screen painter
 
   Autocreate a datasource for block that don't specify one
 
Index: gnue/gnuef/src/DBpostgresql.py
diff -u gnue/gnuef/src/DBpostgresql.py:1.4 gnue/gnuef/src/DBpostgresql.py:1.5
--- gnue/gnuef/src/DBpostgresql.py:1.4  Sat Oct  7 22:37:52 2000
+++ gnue/gnuef/src/DBpostgresql.py      Wed Oct 11 05:22:10 2000
@@ -42,6 +42,13 @@
     return mask
   
   def delete(self,table,mask):
+    print """"
+
+
+
+    """
+    print "I'm deleting "
+    print mask
     self.connection.delete(table,mask)
 
   def update(self,table,mask):
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.17 gnue/gnuef/src/GFForm.py:1.18
--- gnue/gnuef/src/GFForm.py:1.17       Mon Oct  9 06:21:24 2000
+++ gnue/gnuef/src/GFForm.py    Wed Oct 11 05:22:10 2000
@@ -45,6 +45,7 @@
                            'requestNEXTRECORD' : self.nextRecord,
 
                            'requestNEWRECORD'  : self.newRecord,
+                           'requestDELETE'     : self.deleteRecord,
                            
                            'requestQUERY'      : self.requestQuery,
                            'executeQUERY'      : self.executeQuery,
@@ -190,6 +191,9 @@
   
   def newRecord(self, event):
     self.dispatchEvent(GFEvent('newRECORD',self.currentBlock))
+
+  def deleteRecord(self, event):
+    self.dispatchEvent(GFEvent('deleteRECORD',self.currentBlock))
 
   def requestQuery(self, event):
     self.dispatchEvent(GFEvent('initQUERY',self.currentBlock))
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.14 gnue/gnuef/src/GFObjects.py:1.15
--- gnue/gnuef/src/GFObjects.py:1.14    Mon Oct  9 06:21:24 2000
+++ gnue/gnuef/src/GFObjects.py Wed Oct 11 05:22:10 2000
@@ -182,6 +182,7 @@
 
     # Event processing
     self.incommingEvent = {'newRECORD'     : self.newRecord,
+                           'deleteRECORD'  : self.deleteRecord,
                            'nextRECORD'    : self.switchRecord,
                            'prevRECORD'    : self.switchRecord,
                            'recordSWITCHED': self.recordSwitched,
@@ -272,6 +273,13 @@
     self.dataSourceLink.commit()
 
   #
+  # deleteRecord
+  #
+  def deleteRecord(self,event):
+    if event.data == self:
+      self.dataSourceLink.markForRemoval(self.currentRecord)
+
+  #
   # processQuery
   #
   def processQuery(self, event):
@@ -455,9 +463,15 @@
         print mask
                                                   
         if self.resultSetStatus[count] == 'modified':
-          if self.resultSet[count].has_key("oid_%s" % (self.table)):           
 
-            print "updating the record"
-            self.dataConnection.update(self.table,mask)
+          if self.resultSet[count].has_key("oid_%s" % (self.table)):
+            if self.resultSet[count]["oid_%s" % (self.table)] > 0:
+              print "updating the record"
+              self.dataConnection.update(self.table,mask)
+            else:
+              print "deleting the record"
+              mask["oid_%s" % (self.table)] = \
+                mask["oid_%s" % (self.table)] * -1
+              self.dataConnection.delete(self.table,mask)
           else:
             print "Inserting the record"
             result = self.dataConnection.insert(self.table,mask)
@@ -474,7 +488,13 @@
       newentry[key] = self.emptyRecord[key]
     self.resultSet.append(newentry)
     self.resultSetStatus.append('saved')
-                
+
+  def markForRemoval(self,recordNumber):
+    self.resultSet[recordNumber]["oid_%s" % (self.table)] = \
+      self.resultSet[recordNumber]["oid_%s" % (self.table)] * -1
+    self.resultSetStatus[recordNumber] = 'modified'
+    print "removeing oid: %s" % (self.resultSet[recordNumber]["oid_%s" % 
(self.table)])
+    
   def getField(self,recordNumber,fieldName):
     return self.resultSet[recordNumber][fieldName]
 
@@ -526,7 +546,7 @@
     return results
   
   def delete(self, table, mask):
-    self.link.insert(table,mask)
+    self.link.delete(table,mask)
 
   def getFieldList(self,table):
     return self.link.getFieldList(table)
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.9 gnue/gnuef/src/UIwxpython.py:1.10
--- gnue/gnuef/src/UIwxpython.py:1.9    Sat Oct  7 22:37:52 2000
+++ gnue/gnuef/src/UIwxpython.py        Wed Oct 11 05:22:10 2000
@@ -54,6 +54,7 @@
                       WXK_UP:     GFEvent('requestPREVRECORD'),
                       WXK_DOWN:   GFEvent('requestNEXTRECORD'),
 
+                      WXK_F5:     GFEvent('requestDELETE'),
                       WXK_F6:     GFEvent('requestCOMMIT'),
                       WXK_F8:     GFEvent('requestQUERY'),
                       WXK_F9:     GFEvent('executeQUERY'),