gnue gnue-common/src/GDataObjects.py gnuef/samp...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Branch:         gnuef-new-datasources
Changes by:     James Thompson <address@hidden> 01/07/23 14:29:19

Modified files:
        gnue-common/src: GDataObjects.py 
        gnuef/samples/zipcode: states.gfd zipcode.gfd 
        gnuef/src      : GFForm.py GFParser.py 
        gnuef/src/GFObjects: GFBlock.py GFEntry.py 

Log message:
        Fixed verifyValue routine
        Work on master/detail support

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/GDataObjects.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.7.2.16&tr2=1.7.2.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/zipcode/states.gfd.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.13&tr2=1.13.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/zipcode/zipcode.gfd.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.10.2.1&tr2=1.10.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.110.2.15&tr2=1.110.2.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.46.2.2&tr2=1.46.2.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFBlock.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.4.2.19&tr2=1.4.2.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.2.2.13&tr2=1.2.2.14&r1=text&r2=text

Patches:
Index: gnue/gnue-common/src/GDataObjects.py
diff -u gnue/gnue-common/src/GDataObjects.py:1.6 
gnue/gnue-common/src/GDataObjects.py:1.7
--- gnue/gnue-common/src/GDataObjects.py:1.6    Tue May 29 19:54:11 2001
+++ gnue/gnue-common/src/GDataObjects.py        Tue Jun  5 08:57:45 2001
@@ -127,8 +127,8 @@
     criteria = {}
     for i in range(0, len(self._masterfields)): 
       GDebug.printMesg(10,"Adding criteria")
-      criteria[string.trim(self._detailfields[i])] = \
-          master.current.getField(string.trim(self._masterfields[i]))
+      criteria[string.strip(self._detailfields[i])] = \
+          master.current.getField(string.strip(self._masterfields[i]))
       GDebug.printMesg(10,master.current.getField(self._masterfields[i]))
     return self.createResultSet(criteria)
 
Index: gnue/gnuef/samples/zipcode/states.gfd
diff -u gnue/gnuef/samples/zipcode/states.gfd:1.13 
gnue/gnuef/samples/zipcode/states.gfd:1.14
--- gnue/gnuef/samples/zipcode/states.gfd:1.13  Wed Apr 25 16:24:44 2001
+++ gnue/gnuef/samples/zipcode/states.gfd       Sat Jul 21 16:33:49 2001
@@ -15,22 +15,22 @@
   <page>
     <block name="blkstate" datasource="dsstate">
       <label text="Code" x="2" y="1"/>
-      <entry name="entstate" field="state" x="2" y="2" width="4" height="1" 
visibleCount="5"/>
+      <entry name="entstate" field="state" x="2" y="2" width="4" height="1" 
rows="5"/>
       <label text="Description" x="7" y="1"/>
-      <entry name="entdesc" field="description" x="7" y="2" width="30" 
height="1" visibleCount="5"/>
+      <entry name="entdesc" field="description" x="7" y="2" width="30" 
height="1" rows="5"/>
     </block>
 
 
     <!-- Block of cities -->
     <block name="cities"  datasource="dscities" master="blkstate.state" 
detail="state_code">
       <label text="City" x="2" y="9"/>
-      <entry name="city" field="city" x="2" y="10" width="20" visibleCount="5" 
/>
+      <entry name="city" field="city" x="2" y="10" width="20" rows="5" />
 
       <label text="ST" x="23" y="9"/>
-      <entry name="state" field="state_code" x="23" y="10" width="3" 
visibleCount="5" />
+      <entry name="state" field="state_code" x="23" y="10" width="3" rows="5" 
/>
 
       <label text="Zip" x="27" y="9"/>
-      <entry name="zip" field="zip" x="27" y="10" width="10" visibleCount="5" 
/>
+      <entry name="zip" field="zip" x="27" y="10" width="10" rows="5" />
 
       <box x="1" y="8" width="37" height="8" label="State Cities"/>
 
Index: gnue/gnuef/samples/zipcode/zipcode.gfd
diff -u gnue/gnuef/samples/zipcode/zipcode.gfd:1.9 
gnue/gnuef/samples/zipcode/zipcode.gfd:1.10
--- gnue/gnuef/samples/zipcode/zipcode.gfd:1.9  Mon Feb 19 18:47:24 2001
+++ gnue/gnuef/samples/zipcode/zipcode.gfd      Tue Mar 20 15:25:50 2001
@@ -11,7 +11,7 @@
 <!--  <database name="gnue" provider="mysql" dbname="gnue" host="localhost"/> 
-->
   <database name="gnue" provider="postgresql" dbname="gnue" host="gnue"/> 
 
-  <datasource name="zips" database="gnue" table="zipcode" cache="5" 
order_by="state_code,city"/> 
+  <datasource name="zips" database="gnue" table="zipcode" cache="5" 
order_by="state_code,city" prequery=""/> 
   <datasource name="validator" database="gnue" table="state" prequery="" 
order_by="description"/>
 
   <page>
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.112 gnue/gnuef/src/GFForm.py:1.113
--- gnue/gnuef/src/GFForm.py:1.112      Thu Jul 12 20:56:13 2001
+++ gnue/gnuef/src/GFForm.py    Mon Jul 16 20:09:41 2001
@@ -783,6 +783,16 @@
             return message
     self._currentBlock.nextRecord()
 
+  def jumpRecord(self,count):
+    for block in self._blockList:
+      if hasattr(block,'master'):
+        masterBlock,masterField = string.split(block.master,'.')
+        if masterBlock == self._currentBlock.name:
+          if not block.isSaved():
+            message = GConfig.get('_msgNOTSAVED')
+            return message
+    self._currentBlock.jumpRecord(count)
+
 
   def toggleInsertMode(self):
     self._insertMode = not self._insertMode
Index: gnue/gnuef/src/GFObjects/GFBlock.py
diff -u gnue/gnuef/src/GFObjects/GFBlock.py:1.5 
gnue/gnuef/src/GFObjects/GFBlock.py:1.6
--- gnue/gnuef/src/GFObjects/GFBlock.py:1.5     Mon Jul 16 20:09:41 2001
+++ gnue/gnuef/src/GFObjects/GFBlock.py Wed Jul 18 15:45:01 2001
@@ -31,8 +31,7 @@
 # Copyright (c) 2000 Free Software Foundation
 #
 
-from gnue.common.GObjects import * 
-from gnue.common.dbdrivers.factory import factory
+#from gnue.common.GObjects import * 
 from gnue.forms.GFEvent import *
 from gnue.forms.GFObjects.GFDataSource import GFDataSource
 
@@ -41,7 +40,6 @@
 from GFObj import GFObj
 
 import string
-import types
 
 # These should really go somewhere else
 TRUE = 1
Index: gnue/gnuef/src/GFObjects/GFEntry.py
diff -u gnue/gnuef/src/GFObjects/GFEntry.py:1.5 
gnue/gnuef/src/GFObjects/GFEntry.py:1.6
--- gnue/gnuef/src/GFObjects/GFEntry.py:1.5     Mon Jul 16 20:09:41 2001
+++ gnue/gnuef/src/GFObjects/GFEntry.py Wed Jul 18 15:45:01 2001
@@ -31,18 +31,10 @@
 # Copyright (c) 2000 Free Software Foundation
 #
 
-from gnue.common.GObjects import * 
-from gnue.common.dbdrivers.factory import factory
-
 from gnue.common import GDebug
 from gnue.common import GConfig
 from GFValue import GFValue
 import string
-import types
-
-# These should really go somewhere else
-TRUE = 1
-FALSE = 0
 
 ############################################################
 # GFEntry
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.48 gnue/gnuef/src/GFParser.py:1.49
--- gnue/gnuef/src/GFParser.py:1.48     Mon Jul 16 20:09:41 2001
+++ gnue/gnuef/src/GFParser.py  Wed Jul 18 15:45:01 2001
@@ -31,7 +31,6 @@
 
 from gnue.common import GDataSource, GParser
 import copy, types
-#from gnue.common.GTypecast import * 
 from gnue.common import GTypecast