[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue gnue-common/src/GConnections.py gnue-commo...
|
From: |
James Thompson |
|
Subject: |
gnue gnue-common/src/GConnections.py gnue-commo... |
|
Date: |
Mon, 03 Sep 2001 20:11:09 -0700 |
CVSROOT: /cvs
Module name: gnue
Changes by: James Thompson <address@hidden> 01/09/03 20:11:09
Modified files:
gnue-common/src: GConnections.py GDataObjects.py
gnue-common/src/dbdrivers/_dbsig: DBdriver.py
gnue-common/src/dbdrivers/postgresql: DBdriver.py
gnuef/samples/trigger: trigger.gfd
gnuef/src : GFForm.py GFTrigger.py UIwxpython.py
gnuef/src/GFObjects: GFBlock.py GFDataSource.py
Log message:
added quick type converter to postgresql and _dbsig driver
(ints were being loaded where 20 = 20L - long int)
added check for tabs in triggers as they where stripping as a single
char
added a rowcount to the _dbsig driver (have not implemented in forms
yet)
modified the trigger namespace to match the old database driver system
without this the datasource names were pointing to the TriggerExtension
class in the dbdriver which prevented me from using datasource based
queires in triggers
(this is a temp change pending the new trigger system)
removed misc debug output
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/GConnections.py.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/GDataObjects.py.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/postgresql/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/trigger/trigger.gfd.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.116&tr2=1.117&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFTrigger.py.diff?cvsroot=OldCVS&tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.109&tr2=1.110&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFBlock.py.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFDataSource.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gnue/gnue-common/src/GConnections.py
diff -u gnue/gnue-common/src/GConnections.py:1.11
gnue/gnue-common/src/GConnections.py:1.12
--- gnue/gnue-common/src/GConnections.py:1.11 Mon Aug 13 16:15:40 2001
+++ gnue/gnue-common/src/GConnections.py Mon Sep 3 20:11:08 2001
@@ -155,7 +155,6 @@
def setDataConnection(self, dataSource):
connection_name = dataSource.database
dataObject = dataSource.getDataObject()
- print "*** GConnections.setDataConnection.dataObject=%s" % dataObject
if self._openConnections.has_key(string.lower(connection_name)):
# If a database connetion has already been established, use it
Index: gnue/gnue-common/src/GDataObjects.py
diff -u gnue/gnue-common/src/GDataObjects.py:1.13
gnue/gnue-common/src/GDataObjects.py:1.14
--- gnue/gnue-common/src/GDataObjects.py:1.13 Mon Sep 3 10:29:14 2001
+++ gnue/gnue-common/src/GDataObjects.py Mon Sep 3 20:11:08 2001
@@ -236,6 +236,7 @@
self._readonly = 0
self._boundFields = {}
self._unboundFields = {}
+ self._recordCount = 0
self._defaultValues = {}
for key in defaultValues.keys():
@@ -266,6 +267,9 @@
def getCacheCount(self):
return len(self._cachedRecords)
+ # returns # of records the
+ def getRecordCount(self):
+ return self._recordCount
# Get a specific record (0=based)
def getRecord(self, record):
Index: gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py:1.13
gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py:1.14
--- gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py:1.13 Thu Aug 30
15:28:27 2001
+++ gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py Mon Sep 3 20:11:08 2001
@@ -100,7 +100,7 @@
for field in self._fields.keys():
fields.append (field)
if self._fields[field] == None or self._fields[field] == '':
- vals.append ("NULL" % (self._fields[field]))
+ vals.append ("NULL") # % (self._fields[field]))
else:
vals.append ("'%s'" % (self._fields[field]))
@@ -183,7 +183,10 @@
if rs:
i = 0
dict = {}
- for f in (rs):
+ for f in (rs):
+ # TODO - There has got to be a better way
+ if type(f) == type(1L):
+ f = "%g" % f
dict[self._fieldNames[i]] = f
i = i + 1
self._cachedRecords.append (self._recordSetClass(parent=self, \
@@ -234,9 +237,11 @@
try:
cursor = self._dataConnection.cursor()
cursor.execute(self._buildQuery(conditions))
+
except self._DatabaseError, err:
raise GDataObjects.ConnectionError, err
rs = self._resultSetClass(self, cursor=cursor,
masterRecordSet=masterRecordSet)
+ rs._recordCount = cursor.rowcount
if readOnly:
rs._readonly = readOnly
return rs
Index: gnue/gnue-common/src/dbdrivers/postgresql/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/postgresql/DBdriver.py:1.10
gnue/gnue-common/src/dbdrivers/postgresql/DBdriver.py:1.11
--- gnue/gnue-common/src/dbdrivers/postgresql/DBdriver.py:1.10 Wed Aug 29
11:21:22 2001
+++ gnue/gnue-common/src/dbdrivers/postgresql/DBdriver.py Mon Sep 3
20:11:08 2001
@@ -71,7 +71,10 @@
if rs:
i = 0
dict = {}
- for f in(rs):
+ for f in(rs):
+ # TODO - There has got to be a better way
+ if type(f) == type(1L):
+ f = "%g" % f
dict[self._fieldNames[i]] = f
i = i + 1
self._cachedRecords.append(self._recordSetClass(parent=self,initialData=dict))
Index: gnue/gnuef/samples/trigger/trigger.gfd
diff -u gnue/gnuef/samples/trigger/trigger.gfd:1.10
gnue/gnuef/samples/trigger/trigger.gfd:1.11
--- gnue/gnuef/samples/trigger/trigger.gfd:1.10 Mon Sep 3 10:29:14 2001
+++ gnue/gnuef/samples/trigger/trigger.gfd Mon Sep 3 20:11:09 2001
@@ -32,7 +32,7 @@
#print block1.fields.two
#block1.fields.one =
import sys
-
+ print "Value is ",self.getValue()
if (block1.fields.one == "") or (block1.fields.two == ""):
messageValue = "Both Fields One and Two Must Have Data!"
else:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.116 gnue/gnuef/src/GFForm.py:1.117
--- gnue/gnuef/src/GFForm.py:1.116 Wed Aug 29 17:20:36 2001
+++ gnue/gnuef/src/GFForm.py Mon Sep 3 20:11:09 2001
@@ -153,6 +153,9 @@
elif object.getObjectType() =='GFDataSource':
self._datasourceDictionary[object.name]=object
+ try:
+ self._triggerns[object.name] = GFTrigger.GFTriggerHelper( object )
+ except AttributeError: pass
def setFocus(self,object):
if object.getObjectType() == 'GFBlock' and self._currentBlock == None:
@@ -517,7 +520,6 @@
# fireTrigger
#
def fireTrigger(self, triggerName):
- print self._triggerDictionary.keys()
self._triggerDictionary[triggerName](self)
#
Index: gnue/gnuef/src/GFObjects/GFBlock.py
diff -u gnue/gnuef/src/GFObjects/GFBlock.py:1.11
gnue/gnuef/src/GFObjects/GFBlock.py:1.12
--- gnue/gnuef/src/GFObjects/GFBlock.py:1.11 Thu Aug 30 14:34:48 2001
+++ gnue/gnuef/src/GFObjects/GFBlock.py Mon Sep 3 20:11:09 2001
@@ -116,6 +116,7 @@
if self._resultSet.firstRecord():
self.switchRecord(0)
self._recordCount = self._resultSet.getCacheCount()
+ #self._recordCount = self._resultSet.getRecordCount()
else:
# TODO: This means no results were returned from a query.
# TODO: It probably shouldn't create a new record :) Display a message?
@@ -142,12 +143,14 @@
def newRecord(self):
if self._resultSet.insertRecord():
self._recordCount = self._resultSet.getCacheCount()
+ #self._recordCount = self._resultSet.getRecordCount()
self.switchRecord(1)
self.processTrigger('on-newrecord')
def nextRecord(self):
if self._resultSet.nextRecord():
self._recordCount = self._resultSet.getCacheCount()
+ #self._recordCount = self._resultSet.getRecordCount()
self.switchRecord(1)
elif int(GConfig.get('autocreate')) and not
self._resultSet.current.isEmpty():
self.newRecord()
@@ -257,6 +260,7 @@
self._dataSourceLink.createResultSet(conditions)
self._recordCount = self._resultSet.getCacheCount()
+ #self._recordCount = self._resultSet.getRecordCount()
self.processTrigger('Post-Query')
Index: gnue/gnuef/src/GFObjects/GFDataSource.py
diff -u gnue/gnuef/src/GFObjects/GFDataSource.py:1.5
gnue/gnuef/src/GFObjects/GFDataSource.py:1.6
--- gnue/gnuef/src/GFObjects/GFDataSource.py:1.5 Sun Aug 12 12:55:27 2001
+++ gnue/gnuef/src/GFObjects/GFDataSource.py Mon Sep 3 20:11:09 2001
@@ -59,7 +59,8 @@
self.setConnectionManager(self._form._connections)
self.initialize()
self.connect()
- self._form._triggerns[self.name] = self._dataObject.triggerExtensions
+ # TODO Removing for now - jamest
+ #self._form._triggerns[self.name] = self._dataObject.triggerExtensions
if hasattr(self, 'master') and self.master:
GDebug.printMesg(3,"Linking detail '%s' to master '%s'" \
@@ -73,9 +74,6 @@
raise StandardError, \
"Detail source '%s' references non-existant master '%s'" \
% (self.name, self.master)
-
-
- print "GFDataSource.py - dataobject name ",self.getDataObject().name
def createResultSet(self, conditions={}):
resultSet = GDataSource.createResultSet(self, conditions=conditions)
Index: gnue/gnuef/src/GFTrigger.py
diff -u gnue/gnuef/src/GFTrigger.py:1.47 gnue/gnuef/src/GFTrigger.py:1.48
--- gnue/gnuef/src/GFTrigger.py:1.47 Mon Sep 3 10:29:14 2001
+++ gnue/gnuef/src/GFTrigger.py Mon Sep 3 20:11:09 2001
@@ -27,7 +27,6 @@
#
# NOTES:
#
-
import sys
from GFEvent import *
from GFTriggerError import *
@@ -147,6 +146,12 @@
print "Language %s not implemented" % self.language
sys.exit()
+
+ # Verify that the trigger contains no tabs
+ if string.find('\t', self._text) >= 0:
+ print "The trigger named %s contains a tab character which is not
allowed at pos %s" % ( self.name, string.find('\t', self._text) )
+ sys.exit()
+
# Remove whitespace from last line
self._text = string.rstrip(self._text)
@@ -287,7 +292,6 @@
self.object = object
def getattribute( self, name ):
- print "Object %s name %s" % ( self.object, name )
return getattr( self.object, name )
def setattribute( self, name, value ):
@@ -314,8 +318,7 @@
class GFTriggerDatasource(GFTriggerHelperBase ):
def __init__(self, object):
GFTriggerHelperBase.__init__(self, object)
-
-
+
class GFTriggerFields( GFTriggerHelperBase ):
def getattribute( self, name ):
for item in self.object._entryList:
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.109 gnue/gnuef/src/UIwxpython.py:1.110
--- gnue/gnuef/src/UIwxpython.py:1.109 Thu Aug 30 11:48:47 2001
+++ gnue/gnuef/src/UIwxpython.py Mon Sep 3 20:11:09 2001
@@ -165,7 +165,6 @@
# SplashScreen
#
if not self._disableSplash:
- print GConfig.get('splashScreenPNG')
self.splash =
SplashScreen(None,bitmapfile=GConfig.get('splashScreenPNG'),
# duration=65535, callback=self.onMain,
duration = 4000, callback=self.onCloseSplash,
- gnue gnue-common/src/GConnections.py gnue-commo...,
James Thompson <=