gnue/gnuef TODO client/gfclient src/GFForm.py s...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/11/09 19:23:49

Modified files:
        gnuef          : TODO 
        gnuef/client   : gfclient 
        gnuef/src      : GFForm.py GFObjects.py 

Log message:
        fixed validator bugs
        performance improvements

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/TODO.diff?r1=1.22&r2=1.23
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/client/gfclient.diff?r1=1.3&r2=1.4
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.39&r2=1.40
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.36&r2=1.37

Patches:
Index: gnue/gnuef/TODO
diff -u gnue/gnuef/TODO:1.22 gnue/gnuef/TODO:1.23
--- gnue/gnuef/TODO:1.22        Thu Nov  9 15:50:23 2000
+++ gnue/gnuef/TODO     Thu Nov  9 19:23:49 2000
@@ -7,7 +7,6 @@
 **  curses support up to date [arno]
 **  cvs cleanup[jamest]
 **  windows support (ODBC?)
-  
 
   Add layout manager support[perlpoet]
   named triggers[chris]
@@ -56,6 +55,8 @@
  
   taborder support
 
+  might not work on display's other than :0 (need to test)
+
   Tweaks:
     certain attributes should only apply when in normal mode
     (numeric allowing % during query is a working example)
@@ -78,6 +79,12 @@
 
     rewrite the whole friggen braindead focus system to accomidate
       mouse navigation to different blocks
+
+
+
+
+
+
 
 
 
Index: gnue/gnuef/client/gfclient
diff -u gnue/gnuef/client/gfclient:1.3 gnue/gnuef/client/gfclient:1.4
--- gnue/gnuef/client/gfclient:1.3      Mon Nov  6 20:31:09 2000
+++ gnue/gnuef/client/gfclient  Thu Nov  9 19:23:49 2000
@@ -79,12 +79,12 @@
     ui.mainLoop()
       
 if __name__ == '__main__':
-##  import profile
-##  profile.run("GFClient().run()","runstats")
-##  p = pstats.Stats('runstats')
-##  p.sort_stats('cumulative').print_stats(50)
+  import profile
+  profile.run("GFClient().run()","runstats")
+  p = pstats.Stats('runstats')
+  p.sort_stats('cumulative').print_stats(50)
     
-  GFClient().run()
+##  GFClient().run()
 
 
 
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.39 gnue/gnuef/src/GFForm.py:1.40
--- gnue/gnuef/src/GFForm.py:1.39       Thu Nov  9 15:50:23 2000
+++ gnue/gnuef/src/GFForm.py    Thu Nov  9 19:23:49 2000
@@ -166,14 +166,9 @@
   #
   # end of routines made for walking
   #
-  def updateStatus(self):
-    self.updateTip()
-    self.updateInsertMode()
-    self.updateRecordCounter()
-    self.updateRecordStatus()
-    
 
-
+  #
+  # Routines to update parts of the UI's status bar
   def updateInsertMode(self):
     
self.dispatchEvent(GFEvent('uiUPDATESTATUS',[None,None,self.insertMode,None,None]))
     
@@ -192,9 +187,19 @@
     status = 
self.currentBlock.dataSourceLink.resultSetStatus[self.currentBlock.currentRecord]
     self.dispatchEvent(GFEvent('uiUPDATESTATUS',[None,status,None,None,None]))
     
+  def updateStatus(self):
+    self.updateTip()
+    self.updateInsertMode()
+    self.updateRecordCounter()
+    self.updateRecordStatus()
+
+  
   def updateUIEntry(self,event):
     self.dispatchEvent(GFEvent('updateENTRY',event.data));
-    
+
+  #
+  # This routine is only used once in GFObjects
+  #
   def findValue(self, blockname, fieldname):
     for block in self.blockList:
       if block.name == blockname:
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.36 gnue/gnuef/src/GFObjects.py:1.37
--- gnue/gnuef/src/GFObjects.py:1.36    Thu Nov  9 15:50:23 2000
+++ gnue/gnuef/src/GFObjects.py Thu Nov  9 19:23:49 2000
@@ -393,7 +393,7 @@
     if hasattr(self,'foreign_key'):
       value = 0
       datasourceName,fieldName = string.split(self.foreign_key,'.')
-      datasource = self.block.datasource
+      datasource = self.block.form.datasourceDictionary[datasourceName]
 
       for count in range(datasource.getLastRecordNumber()+1):
         if datasource.getField(count,fieldName) == self.value:
@@ -408,8 +408,7 @@
     values = {}
     if hasattr(self,'foreign_key'):
       datasourceName,fieldName = string.split(self.foreign_key,'.')
-#      datasource = self.block.form.datasourceDictionary[datasourceName]
-      datasource = self.block.datasource
+      datasource = self.block.form.datasourceDictionary[datasourceName]
       for count in range(datasource.getLastRecordNumber()+1):
         if hasattr(self,'foreign_key_description'):
           description = datasource.getField(count,self.foreign_key_description)
@@ -612,15 +611,18 @@
     
   def getField(self,recordNumber,fieldName):
     try:
-      if self.resultSet[recordNumber][fieldName] != None:
-        field = self.resultSet[recordNumber][fieldName]
-      else:
-        field = ''
-#      print "Daddy's gonna give you a '",field,"'"
-      return field
-    except IndexError, ex:
-#      print "Fool there isn't any of that in here"
+      return self.resultSet[recordNumber][fieldName]
+    except:
       return ''
+    
+#      if self.resultSet[recordNumber][fieldName]:
+#      else:
+#        field = ''
+##      print "Daddy's gonna give you a '",field,"'"
+#      return field
+#    except IndexError, ex:
+##      print "Fool there isn't any of that in here"
+#      return ''
 
   def setField(self,recordNumber,fieldName,value):
     if len(self.resultSet) > recordNumber: