gnue common/src/GDataSource.py common/src/dbdri...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/02/05 00:45:53

Modified files:
        common/src     : GDataSource.py 
        common/src/dbdrivers/_dbsig: DBdriver.py 
        common/src/dbdrivers/_pgsql: DBdriver.py 
        forms/samples/zipcode: zipcode.gfd 
        forms/src      : GFParser.py 
        forms/src/GFObjects: GFBlock.py 

Log message:
        Removed master/detail tags from block in GFParser
        Added some functions to the trigger namespace
        Fixed rollback on db errors

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataSource.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_dbsig/DBdriver.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_pgsql/DBdriver.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/zipcode/zipcode.gfd.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFParser.py.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBlock.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: gnue/common/src/GDataSource.py
diff -c gnue/common/src/GDataSource.py:1.24 gnue/common/src/GDataSource.py:1.25
*** gnue/common/src/GDataSource.py:1.24 Sun Feb  3 23:09:59 2002
--- gnue/common/src/GDataSource.py      Tue Feb  5 00:45:53 2002
***************
*** 65,72 ****
--- 65,97 ----
      self._triggerGlobal = 1
      self._triggerFunctions = 
{'createResultSet':{'function':self.createResultSet,
                                                   },
+                               
'simpleQuery':{'function':self.triggerSimpleQuery,
+                                              },
                                }
                  
+ 
+   def triggerSimpleQuery(self,maskDict):
+     queryDict = {}
+     okToProcess = 1
+     for key in maskDict.keys():
+       queryDict[key]= str(maskDict[key])
+       if not len(queryDict[key]):
+         okToProcess = 0
+         break
+ 
+     conditions = 
GConditions.buildConditionFromDict(queryDict,GConditions.GClike)
+     resultSet = self.createResultSet(conditions)
+     recordCount = resultSet.getRecordCount()
+ 
+     returnList = []
+     for count in range(recordCount):
+       record = resultSet.getRecord(count)
+       resultDict = {}
+       for key in record._fields.keys():
+         resultDict[key]=record.getField(key) or ""
+       returnList.append(resultDict)
+     return returnList
+     
  
    #
    # This method should be called after the object is created
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.34 
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.35
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.34   Wed Jan 23 11:36:34 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py        Tue Feb  5 00:45:53 2002
***************
*** 57,63 ****
          for key in self._fields.keys(): 
            self._initialData[key] = self._fields[key]
  
!     except self._parent._dataObject._DatabaseError, err: 
        raise GDataObjects.ConnectionError, err
  
      self._updateFlag = 0
--- 57,63 ----
          for key in self._fields.keys(): 
            self._initialData[key] = self._fields[key]
  
!     except self._parent._dataObject._DatabaseError, err:
        raise GDataObjects.ConnectionError, err
  
      self._updateFlag = 0
***************
*** 250,256 ****
  
    def commit(self):
      GDebug.printMesg (5,"DB-SIG database driver: commit()")
! 
      try:
        self._dataConnection.commit()
      except self._DatabaseError, value:
--- 250,256 ----
  
    def commit(self):
      GDebug.printMesg (5,"DB-SIG database driver: commit()")
!     
      try:
        self._dataConnection.commit()
      except self._DatabaseError, value:
Index: gnue/common/src/dbdrivers/_pgsql/DBdriver.py
diff -c gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.8 
gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.9
*** gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.8    Tue Jan 29 12:39:05 2002
--- gnue/common/src/dbdrivers/_pgsql/DBdriver.py        Tue Feb  5 00:45:53 2002
***************
*** 62,72 ****
    def connect(self, connectData={}):
      GDebug.printMesg(1,"Postgresql database driver initializing")
      try:
-       #self._dataConnection = self._pgdriver.connect("%s::%s:%s:%s::" % \
-       #       (connectData['host'],
-       #        connectData['dbname'],
-       #        connectData['_username'],
-       #        connectData['_password']))
        self._dataConnection = self._pgdriver.connect(self._connectString %
                                                      (connectData['host'],
                                                       connectData['dbname'],
--- 62,67 ----
Index: gnue/forms/samples/zipcode/zipcode.gfd
diff -c gnue/forms/samples/zipcode/zipcode.gfd:1.16 
gnue/forms/samples/zipcode/zipcode.gfd:1.17
*** gnue/forms/samples/zipcode/zipcode.gfd:1.16 Tue Nov 20 21:12:53 2001
--- gnue/forms/samples/zipcode/zipcode.gfd      Tue Feb  5 00:45:53 2002
***************
*** 9,16 ****
    </options>
    <datasource prequery="" cache="5" database="gnue" name="zips"
                order_by="state,city" table="zipcode"/>
!   <datasource prequery="" database="gnue" name="validator"
                order_by="description" table="state"/>
    <page name="Page_1">
      <block name="zip" rows="15" datasource="zips">
        <label x="1" y="1" name="Label_1" text="City"/>
--- 9,17 ----
    </options>
    <datasource prequery="" cache="5" database="gnue" name="zips"
                order_by="state,city" table="zipcode"/>
! <!--  <datasource prequery="" database="gnue" name="validator"
                order_by="description" table="state"/>
+ -->
    <page name="Page_1">
      <block name="zip" rows="15" datasource="zips">
        <label x="1" y="1" name="Label_1" text="City"/>
***************
*** 20,28 ****
          </options>
        </entry>
        <label x="17" y="1" name="Label_2" text="State"/>
!       <entry x="17" y="2" field="state" name="state" width="15"
!              style="dropdown" foreign_key="validator.state"
!              foreign_key_description="description">
          <options>
            <option name="tip" value="State"/>
          </options>
--- 21,29 ----
          </options>
        </entry>
        <label x="17" y="1" name="Label_2" text="State"/>
!       <entry x="17" y="2" field="state" name="state" width="15">
!           <!--   style="dropdown" foreign_key="validator.state"
!              foreign_key_description="description"> -->
          <options>
            <option name="tip" value="State"/>
          </options>
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.30 
gnue/forms/src/GFObjects/GFBlock.py:1.31
*** gnue/forms/src/GFObjects/GFBlock.py:1.30    Mon Feb  4 21:40:14 2002
--- gnue/forms/src/GFObjects/GFBlock.py Tue Feb  5 00:45:53 2002
***************
*** 265,276 ****
--- 265,281 ----
    #
    # processRollback
    #
+   # if recovering=0, then the user requested a rollback
+   # if recovering=1, then a commit or such failed and we need to clean up
+   # (but not lose state information)
+   # 
    def processRollback(self, recovering=0):
      #self.mode='normal'
      if not recovering:
        self._currentRecord = 0
        self._recordCount = 0
        self._dataSourceLink.createEmptyResultSet()
+     self._dataSourceLink._dataObject.rollback()
      self.switchRecord(0)
  
    #
Index: gnue/forms/src/GFParser.py
diff -c gnue/forms/src/GFParser.py:1.59 gnue/forms/src/GFParser.py:1.60
*** gnue/forms/src/GFParser.py:1.59     Tue Jan  8 17:16:55 2002
--- gnue/forms/src/GFParser.py  Tue Feb  5 00:45:53 2002
***************
*** 158,169 ****
                 'Required': 1,
                 'Unique': 1,
                 'Typecast': GTypecast.name },
-             'master': {
-                'References': (('datasource','name'),),
-                'Typecast': GTypecast.name },
-             'detail': {
-                'References': (('datasource','name'),),
-                'Typecast': GTypecast.name },
              'rows': {
                 'Typecast': GTypecast.whole},
              'rowSpacer': {
--- 158,163 ----