[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/gnue-common/src GDataObjects.py GDataSourc...
From: |
Jason Cater |
Subject: |
gnue/gnue-common/src GDataObjects.py GDataSourc... |
Date: |
Wed, 18 Jul 2001 21:34:34 -0700 |
CVSROOT: /home/cvs
Module name: gnue
Branch: gnuef-new-datasources
Changes by: Jason Cater <address@hidden> 01/07/18 21:34:34
Modified files:
gnue-common/src: GDataObjects.py GDataSource.py
Log message:
Broken cvs; committed in order to synch machines
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.1&tr2=1.7.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/GDataSource.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.11&tr2=1.11.2.1&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/gnue-common/src/GDataSource.py
diff -u gnue/gnue-common/src/GDataSource.py:1.10
gnue/gnue-common/src/GDataSource.py:1.11
--- gnue/gnue-common/src/GDataSource.py:1.10 Tue Jun 26 21:18:28 2001
+++ gnue/gnue-common/src/GDataSource.py Wed Jul 4 17:24:11 2001
@@ -34,6 +34,7 @@
import GObjects
import sys
import GConnections
+import GTypecast
########################################################################
@@ -105,27 +106,27 @@
'name': {
'Required': 1,
'Unique': 1,
- 'Typecast': char },
+ 'Typecast': GTypecast.name },
'type': {
- 'Typecast': char,
+ 'Typecast': GTypecast.name,
'Default': "object" },
'database': {
- 'Typecast': char },
+ 'Typecast': GTypecast.name },
'table': {
- 'Typecast': char },
+ 'Typecast': GTypecast.name },
'cache': {
- 'Typecast': int },
+ 'Typecast': GTypecast.whole },
'prequery': {
'Typecast': bool,
'Default': 0 },
'order_by': {
- 'Typecast': char },
+ 'Typecast': GTypecast.text },
'master': {
- 'Typecast': char },
+ 'Typecast': GTypecast.name },
'masterlink': {
- 'Typecast': char },
+ 'Typecast': GTypecast.text },
'detaillink': {
- 'Typecast': char } }
+ 'Typecast': GTypecast.text } }
- gnue/gnue-common/src GDataObjects.py GDataSourc...,
Jason Cater <=