gnue gnue-common/src/dbdrivers/_dbsig/DBdriver....

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/08/29 17:20:36

Modified files:
        gnue-common/src/dbdrivers/_dbsig: DBdriver.py 
        gnuef/samples/zipcode: zipcode.gfd 
        gnuef/src      : GFForm.py 
        gnuef/src/GFObjects: GFEntry.py 

Log message:
        I'm really james using jason's laptop so dont blame him for my 
mistakes....
        Fixed dropdown support
        Fixed cursor navigation
        Added order by support to the new datasources

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/zipcode/zipcode.gfd.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.115&tr2=1.116&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py:1.8 
gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py:1.9
--- gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py:1.8       Wed Aug 29 
11:21:22 2001
+++ gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py   Wed Aug 29 17:20:36 2001
@@ -319,6 +319,9 @@
     else: 
       q = "SELECT * FROM %s%s" % (self.table, self._conditionToSQL(conditions))
 
+    if len(self.order_by):
+     q = "%s ORDER BY %s " % (q, self.order_by)
+
     GDebug.printMesg(5,q)
 
     return q
Index: gnue/gnuef/samples/zipcode/zipcode.gfd
diff -u gnue/gnuef/samples/zipcode/zipcode.gfd:1.11 
gnue/gnuef/samples/zipcode/zipcode.gfd:1.12
--- gnue/gnuef/samples/zipcode/zipcode.gfd:1.11 Sun Aug 12 12:55:27 2001
+++ gnue/gnuef/samples/zipcode/zipcode.gfd      Wed Aug 29 17:20:36 2001
@@ -21,7 +21,7 @@
       </entry>
 
       <label text="State" x="17" y="1"/>
-      <entry name="state" field="state_code" x="17" y="2" width="15"  
uppercase="" foreign_key="validator.state" 
foreign_key_description="description" style="dropdown">
+      <entry name="state" field="state_code" x="17" y="2" width="15"  
foreign_key="validator.state" foreign_key_description="description" 
style="dropdown">
        <options>
          <tip>State</tip>
        </options>
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.115 gnue/gnuef/src/GFForm.py:1.116
--- gnue/gnuef/src/GFForm.py:1.115      Sun Aug 12 12:55:27 2001
+++ gnue/gnuef/src/GFForm.py    Wed Aug 29 17:20:36 2001
@@ -314,15 +314,6 @@
 
     message = None
 
-    # TODO: Disabling transactions for now to remove need for 
_databaseDictionary
-    #
-    # TODO: Addendum by jcater: the new database drivers are assumed to be in 
a 
-    # TODO: transactional state if the underlying database supports 
transactions.
-    # TODO: Therefore, beginTransaction is no longer necessary.
-    #
-    #for key in self._databaseDictionary.keys():
-    #  self._databaseDictionary[key].beginTransaction()
-
     try:
       if not self.readonly:
         try:
@@ -352,9 +343,6 @@
         return message
       
       self.processTrigger('Post-Commit')
-    # TODO: Disabling transactions for now to remove need for 
_databaseDictionary
-    #  for key in self._databaseDictionary.keys():
-    #    self._databaseDictionary[key].commit()
 
     except DBError:
       self.processRollback()
@@ -422,13 +410,13 @@
   #
   def moveCursor(self, position):
     if position == 'end':
-      self._currentEntry._cursorPosition = len(self._currentEntry._value)
+      self._currentEntry._cursorPosition = len(self._currentEntry.getValue())
     elif position == 'home':
       self._currentEntry._cursorPosition = 0
     elif position == 'left' and self._currentEntry._cursorPosition > 0:
         self._currentEntry._cursorPosition = 
self._currentEntry._cursorPosition - 1
     elif position == 'right':
-      if self._currentEntry._cursorPosition < len(self._currentEntry._value):
+      if self._currentEntry._cursorPosition < 
len(self._currentEntry.getValue()):
         self._currentEntry._cursorPosition= self._currentEntry._cursorPosition 
+ 1
   
   def replaceValue(self,object, value):
Index: gnue/gnuef/src/GFObjects/GFEntry.py
diff -u gnue/gnuef/src/GFObjects/GFEntry.py:1.8 
gnue/gnuef/src/GFObjects/GFEntry.py:1.9
--- gnue/gnuef/src/GFObjects/GFEntry.py:1.8     Sun Aug 12 12:55:27 2001
+++ gnue/gnuef/src/GFObjects/GFEntry.py Wed Aug 29 17:20:36 2001
@@ -57,8 +57,8 @@
     self.typecast="text"
     self.case="mixed"
     self._inits = [self.initialize, self.loadStartingValues]
+    self._allowedValues = None
 
-
   def buildObject(self): 
     # Convert deprecated attributes
     if hasattr(self,'numeric') and self.numeric: 
@@ -169,22 +169,19 @@
   # verifyValue
   #
   def verifyValue(self):
+    # TODO: This needs to insure the allowedValues are
+    # TODO: loaded if the entry type isn't dropdown
+    # TODO: It's broken now cause it's time to leave 
+    # TODO: and I don't have time to fix it
+    #if not self._allowedValues:
+    #  self.allowedValues()
     value = 1
-
     # If empty skip test
     if len(self._oldval) != 0:
-
-      if hasattr(self,'foreign_key'):
-        value = 0
-        datasourceName,fieldName = string.split(self.foreign_key,'.')
-        datasource = self._block._form._datasourceDictionary[datasourceName]
-
-        for count in range(self._block._form._currentBlock._recordCount+1):
-          if datasource.getField(count,fieldName) == self._oldval:
-            value = 1
-            break        
+      if self._allowedValues:
+        #print self._allowedValues.keys()
+        value = self._allowedValues.has_key(self._oldval)
     return value
-
   #
   # findClosestValue
   # 
@@ -208,28 +205,17 @@
   # allowedValues
   #
   def allowedValues(self):
-
-    if not hasattr(self.datasource,'_allowedValues'): 
+    if not self._allowedValues: 
       rs = self.datasource.createResultSet()
-      self.datasource._allowedValues = {"":""}
-
       more = rs.firstRecord()
-
+      self._allowedValues = {"":""}
       while more: 
         try:
-          self.datasource._allowedValues["%s" % 
rs.current.getField(self.fieldName)] = "%s" % \
+          self._allowedValues["%s" % rs.current.getField(self.fieldName)] = 
"%s" % \
              rs.current.getField(self.foreign_key_description)
         except AttributeError:
-          self.datasource._allowedValues[rs.current.getField(self.fieldName)] 
= None
+          self._allowedValues[rs.current.getField(self.fieldName)] = None
         more = rs.nextRecord()
-    GDebug.printMesg (5,'Created for DropDown: %s' % 
self.datasource._allowedValues)
-
-    return self.datasource._allowedValues
-
-
-
-
-
-
-
+    GDebug.printMesg (5,'Created for DropDown: %s' % self._allowedValues)
 
+    return self._allowedValues