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

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/10/18 16:06:18

Modified files:
        gnuef/src      : GFForm.py GFObjects.py UIwxpython.py 

Log message:
        Bug fixes
        Crude readonly form support

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.18&r2=1.19
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.18&r2=1.19
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.11&r2=1.12

Patches:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.18 gnue/gnuef/src/GFForm.py:1.19
--- gnue/gnuef/src/GFForm.py:1.18       Wed Oct 11 05:22:10 2000
+++ gnue/gnuef/src/GFForm.py    Wed Oct 18 16:06:18 2000
@@ -190,10 +190,12 @@
     self.dispatchEvent(GFEvent('prevRECORD',self.currentBlock))
   
   def newRecord(self, event):
-    self.dispatchEvent(GFEvent('newRECORD',self.currentBlock))
+    if not self.__dict__.has_key('readonly'):
+      self.dispatchEvent(GFEvent('newRECORD',self.currentBlock))
 
   def deleteRecord(self, event):
-    self.dispatchEvent(GFEvent('deleteRECORD',self.currentBlock))
+    if not self.__dict__.has_key('readonly'):
+      self.dispatchEvent(GFEvent('deleteRECORD',self.currentBlock))
 
   def requestQuery(self, event):
     self.dispatchEvent(GFEvent('initQUERY',self.currentBlock))
@@ -202,7 +204,8 @@
     self.dispatchEvent(GFEvent('processQUERY',self.currentBlock))
 
   def executeCommit(self, event):
-    self.dispatchEvent(GFEvent('processCOMMIT',self.currentBlock))
+    if not self.__dict__.has_key('readonly'):
+      self.dispatchEvent(GFEvent('processCOMMIT',self.currentBlock))
 
   def recordSwitched(self, event):
     self.dispatchEvent(GFEvent('updateENTRY',event.data))
@@ -388,7 +391,8 @@
   # Notes: Insert only at the time :(
   #
   def keyPress(self, event):
-    print self.insertMode
+    if GFOptions.DEBUG:
+      print "Keypress event", event.data
     string = self.currentEntry.getValue()
     if self.insertMode == 1:
       string = string[:self.currentEntry.cursorPosition] + event.data + \
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.18 gnue/gnuef/src/GFObjects.py:1.19
--- gnue/gnuef/src/GFObjects.py:1.18    Wed Oct 18 09:17:44 2000
+++ gnue/gnuef/src/GFObjects.py Wed Oct 18 16:06:18 2000
@@ -222,8 +222,9 @@
     if self.__dict__.has_key('masterBlock'):
       if self.masterBlock == event.data.name:
         fieldValue = self.form.findValue(self.masterBlock, self.masterField)
-        if fieldValue:
-          print "Master Field value is %s" % (fieldValue)
+        if GFOptions.DEBUG:
+          if fieldValue:
+            print "Master Field value is %s" % (fieldValue)
 
           ## clear the link
           self.dataSourceLink.clear()
@@ -296,10 +297,8 @@
         self.currentRecord = self.recordCount
         self.dispatchEvent(GFEvent('switchRECORD',[-1,0]));
         if self.mode != 'query':
-          print "Start Query"
           self.mode = 'query'
         else:
-          print "Abort Query"
           self.mode = 'normal'
         
       elif event.getEvent() == 'processQUERY':
@@ -356,12 +355,15 @@
   # Moves the proper record into editing position
   # 
   def switchRecord(self, event):
-    print "Switching to record %s from record %s" % (event.data[1] , 
event.data[0])
+    if GFOptions.DEBUG:
+      print "Switching to record %s from record %s" % (event.data[1] , 
event.data[0])
       
     if event.data[0] >= 0:
       self.block.dataSourceLink.setField(event.data[0],self.field,self.value)
     
     self.value = self.block.dataSourceLink.getField(event.data[1],self.field)
+    if not self.value:
+      self.value = ""
     self.cursorPosition = len(self.value)
     self.dispatchEvent(GFEvent('recordSWITCHED',self));
 
@@ -388,6 +390,8 @@
     self.emptyRecord = {}
     self.resultSet = []
     self.resultSetStatus = []
+
+    self.sql = None
     
     self.form = parent
     while (self.form.getObjectType() != 'GFForm'):
@@ -434,13 +438,15 @@
     return len(self.resultSet)-1
   
   def query(self):
-    print "Query with this in resultSet"
-    print self.resultSet[0]
+    if GFOptions.DEBUG:
+      print "Query with this in resultSet"
+      print self.resultSet[0]
     if self.__dict__.has_key('database'):
-      mask = {}
-      for key in self.fieldList:
-        if key in self.dataConnection.getFieldList(self.table).keys():
-          mask[key]=self.resultSet[0][key]
+      if self.sql == None:
+        mask = {}
+        for key in self.fieldList:
+          if key in self.dataConnection.getFieldList(self.table).keys():
+            mask[key]=self.resultSet[0][key]
 
       self.clear()
       self.resultSet = self.dataConnection.query(self.table, len(mask) and 
mask or None)
@@ -452,33 +458,38 @@
           for count in range(len(self.resultSet)):
             self.resultSet[fieldName] = ""
 
+
   def commit(self):
     if self.__dict__.has_key('database'):
       for count in range(len(self.resultSet)):
-        print "record %s is %s " % (count, self.resultSetStatus[count])
-        print self.resultSet[count]
+        if GFOptions.DEBUG:
+          print "record %s is %s " % (count, self.resultSetStatus[count])
+          print self.resultSet[count]
         mask = {}
         for key in self.resultSet[count].keys():
-          print key
           if key in self.dataConnection.getFieldList(self.table).keys() or \
              key == "oid_%s" % (self.table):
             mask[key]=self.resultSet[count][key]
 
-        print "will be passing"
-        print mask
+        if GFOptions.DEBUG:
+          print "will be passing"
+          print mask
                                                   
         if self.resultSetStatus[count] == 'modified':
           if self.resultSet[count].has_key("oid_%s" % (self.table)):
             if self.resultSet[count]["oid_%s" % (self.table)] > 0:
-              print "updating the record"
+              if GFOptions.DEBUG:
+                print "updating the record"
               self.dataConnection.update(self.table,mask)
             else:
-              print "deleting the record"
+              if GFOptions.DEBUG:                
+                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"
+            if GFOptions.DEBUG:
+              print "Inserting the record"
             result = self.dataConnection.insert(self.table,mask)
 
             for newkey in result.keys():
@@ -498,7 +509,8 @@
     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)])
+    if GFOptions.DEBUG:
+      print "removeing oid: %s" % (self.resultSet[recordNumber]["oid_%s" % 
(self.table)])
     
   def getField(self,recordNumber,fieldName):
     return self.resultSet[recordNumber][fieldName]
@@ -533,8 +545,6 @@
     self.link.connect(self.host,self.dbname,user,passwd)
 
   def query(self, table, mask):
-    print "Datbase mask looks like "
-    print mask
     results = self.link.query(table,mask)
     return results
 
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.11 gnue/gnuef/src/UIwxpython.py:1.12
--- gnue/gnuef/src/UIwxpython.py:1.11   Wed Oct 11 18:57:06 2000
+++ gnue/gnuef/src/UIwxpython.py        Wed Oct 18 16:06:18 2000
@@ -14,6 +14,7 @@
 from GFEvent import *
 from UIbase import *
 import string
+import GFOptions
 
 #
 # GFUserInterface
@@ -127,7 +128,8 @@
           action = self.keyEvents[event.KeyCode()]
         except KeyError:
           if event.ControlDown():
-            print "Control %s" % (chr(event.KeyCode()))
+            if GFOptions.DEBUG:
+              print "Control %s" % (chr(event.KeyCode()))
             action = GFEvent('requestHOTKEY',chr(event.KeyCode()))
           elif (32 <= event.KeyCode() <= 126):
             action = GFEvent('requestKEYPRESS',chr(event.KeyCode()))
@@ -180,8 +182,6 @@
 
     for spacer in range(count):
       spacer = int(spacer)
-      print spacer
-      
       widget.append(eval(self.widgetConstructor[object.getObjectType()]))
 
     for singleWidget in widget: