[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-designer/src base/TemplateBase.py base/too...
|
From: |
Jason Cater |
|
Subject: |
gnue-designer/src base/TemplateBase.py base/too... |
|
Date: |
Tue, 25 Nov 2003 14:52:37 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue-designer
Branch:
Changes by: Jason Cater <address@hidden> 03/11/25 14:52:37
Modified files:
src/base : TemplateBase.py
src/base/tools : DataSourceEditor.py SchemaNavigator.py
SchemaViewer.py
src/templates/forms: FormBuilder.py Simple.py
src/templates/reports: Labels.py MailMerge.py SimpleReport.py
src/templates/schema: Introspection.py
Log message:
moving to the new simplified introspection API
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/base/TemplateBase.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/base/tools/DataSourceEditor.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/base/tools/SchemaNavigator.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/base/tools/SchemaViewer.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/forms/FormBuilder.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/forms/Simple.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/reports/Labels.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/reports/MailMerge.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/reports/SimpleReport.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/schema/Introspection.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: gnue-designer/src/base/TemplateBase.py
diff -c gnue-designer/src/base/TemplateBase.py:1.24
gnue-designer/src/base/TemplateBase.py:1.25
*** gnue-designer/src/base/TemplateBase.py:1.24 Mon Feb 17 02:32:50 2003
--- gnue-designer/src/base/TemplateBase.py Tue Nov 25 14:52:34 2003
***************
*** 176,182 ****
if not self.__cachedSources.has_key(connection_name):
self.__cachedSources[connection_name] = \
! self.GetTemporaryConnection(connection_name).getSchemaList()
list = []
for schema in self.__cachedSources[connection_name]:
--- 176,182 ----
if not self.__cachedSources.has_key(connection_name):
self.__cachedSources[connection_name] = \
! self.GetTemporaryConnection(connection_name).find()
list = []
for schema in self.__cachedSources[connection_name]:
***************
*** 187,200 ****
def GetSourceSchema(self, connection_name, source_name):
return self.GetTemporaryConnection(connection_name)\
! .getSchemaByName(source_name)
def GetAvailableFields(self, connection_name, source_name):
list = []
source = self.GetSourceSchema(connection_name, source_name)
if source != None:
! for schema in source.getChildSchema(source):
list.append((schema.name, hasattr(schema,'description') \
and schema.description or schema.name))
--- 187,200 ----
def GetSourceSchema(self, connection_name, source_name):
return self.GetTemporaryConnection(connection_name)\
! .findone(name=source_name)
def GetAvailableFields(self, connection_name, source_name):
list = []
source = self.GetSourceSchema(connection_name, source_name)
if source != None:
! for schema in source.fields():
list.append((schema.name, hasattr(schema,'description') \
and schema.description or schema.name))
Index: gnue-designer/src/base/tools/DataSourceEditor.py
diff -c gnue-designer/src/base/tools/DataSourceEditor.py:1.37
gnue-designer/src/base/tools/DataSourceEditor.py:1.38
*** gnue-designer/src/base/tools/DataSourceEditor.py:1.37 Wed Jun 4
19:24:12 2003
--- gnue-designer/src/base/tools/DataSourceEditor.py Tue Nov 25 14:52:35 2003
***************
*** 569,584 ****
# TODO: trapped so the designing session can continue,
# TODO: albeit without schema support.
dataObject = self.editor.connections.getDataObject(conn, "object")
self.editor.connections.requestConnection(dataObject, conn)
! schema = dataObject.getSchemaByName(self.editor.current.table)
index = 0
self.list.DeleteAllItems()
if schema:
! for field in schema.getChildSchema(schema):
self.list.InsertStringItem(index, field.name)
self.list.SetStringItem(index, SCH_TYPE,
string.upper(field.datatype[0]) + field.datatype[1:])
--- 569,587 ----
# TODO: trapped so the designing session can continue,
# TODO: albeit without schema support.
+
+ # TODO: This is the old, deprecated syntax
dataObject = self.editor.connections.getDataObject(conn, "object")
self.editor.connections.requestConnection(dataObject, conn)
! schema =
dataObject._connection.introspector.findone(name=self.editor.current.table)
!
index = 0
self.list.DeleteAllItems()
if schema:
! for field in schema.fields():
self.list.InsertStringItem(index, field.name)
self.list.SetStringItem(index, SCH_TYPE,
string.upper(field.datatype[0]) + field.datatype[1:])
Index: gnue-designer/src/base/tools/SchemaNavigator.py
diff -c gnue-designer/src/base/tools/SchemaNavigator.py:1.13
gnue-designer/src/base/tools/SchemaNavigator.py:1.14
*** gnue-designer/src/base/tools/SchemaNavigator.py:1.13 Tue Nov 18
21:59:21 2003
--- gnue-designer/src/base/tools/SchemaNavigator.py Tue Nov 25 14:52:35 2003
***************
*** 234,241 ****
class ConnectionNode(Node):
! # TODO: This method works with the datasource cleanup
! def __REWRITE__expand(self):
self.expanded = 1
connection = self.navigator.connections.getConnection(self.connection,
login=1)
--- 234,240 ----
class ConnectionNode(Node):
! def expand(self):
self.expanded = 1
connection = self.navigator.connections.getConnection(self.connection,
login=1)
***************
*** 250,275 ****
SchemaTypeNode(self.navigator, self.tree, self.node,
introspector=connection.introspector, type=schema,
name=name)
- return
-
- def expand(self):
- self.expanded = 1
- connections = self.navigator.connections
- dataObject = connections.getDataObject(self.connection, "object")
- connections.requestConnection(dataObject, self.connection)
-
- schemaTypes = dataObject.getSchemaTypes()
- if not schemaTypes:
- return
-
- schemaTypes.sort()
- for schema, name, keep in schemaTypes:
- if keep:
- SchemaTypeNode(self.navigator, self.tree, self.node,
- introspector=dataObject, type=schema, name=name)
-
- return
-
def getLabel(self):
return self.connection
--- 249,254 ----
***************
*** 289,295 ****
def expand(self):
self.expanded = 1
tree = self.tree
! schemas = self.introspector.getSchemaList(self.type)
if not schemas:
return
schemas.sort()
--- 268,274 ----
def expand(self):
self.expanded = 1
tree = self.tree
! schemas = self.introspector.find(type=self.type)
if not schemas:
return
schemas.sort()
***************
*** 305,311 ****
return ""
def expand(self):
self.expanded = 1
! for field in self.schema.getChildSchema(self.schema):
FieldNode(self.navigator, self.tree, self.node, field=field)
--- 284,290 ----
return ""
def expand(self):
self.expanded = 1
! for field in self.schema.fields():
FieldNode(self.navigator, self.tree, self.node, field=field)
Index: gnue-designer/src/base/tools/SchemaViewer.py
diff -c gnue-designer/src/base/tools/SchemaViewer.py:1.16
gnue-designer/src/base/tools/SchemaViewer.py:1.17
*** gnue-designer/src/base/tools/SchemaViewer.py:1.16 Wed Jun 4 19:24:12 2003
--- gnue-designer/src/base/tools/SchemaViewer.py Tue Nov 25 14:52:35 2003
***************
*** 139,146 ****
self.connections.requestConnection(dataObject, conn)
! schemaTypes = dataObject.getSchemaTypes()
! schemas = dataObject.getSchemaList()
schemas.sort()
self.connectionCache[conn] = (schemaTypes, schemas)
--- 139,146 ----
self.connections.requestConnection(dataObject, conn)
! schemaTypes = dataObject.types
! schemas = dataObject.find()
schemas.sort()
self.connectionCache[conn] = (schemaTypes, schemas)
***************
*** 351,357 ****
try:
self.table.__childCache
except AttributeError:
! self.table.__childCache = self.table.getChildSchema(self.table)
for field in self.table.__childCache:
--- 351,357 ----
try:
self.table.__childCache
except AttributeError:
! self.table.__childCache = self.table.fields()
for field in self.table.__childCache:
Index: gnue-designer/src/templates/forms/FormBuilder.py
diff -c gnue-designer/src/templates/forms/FormBuilder.py:1.14
gnue-designer/src/templates/forms/FormBuilder.py:1.15
*** gnue-designer/src/templates/forms/FormBuilder.py:1.14 Wed May 28
18:19:32 2003
--- gnue-designer/src/templates/forms/FormBuilder.py Tue Nov 25 14:52:36 2003
***************
*** 422,428 ****
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.getChildSchema(schema):
if field.name in self.variables['tablefields%s' % count]:
fields[field.name] = field
--- 422,428 ----
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.fields():
if field.name in self.variables['tablefields%s' % count]:
fields[field.name] = field
Index: gnue-designer/src/templates/forms/Simple.py
diff -c gnue-designer/src/templates/forms/Simple.py:1.19
gnue-designer/src/templates/forms/Simple.py:1.20
*** gnue-designer/src/templates/forms/Simple.py:1.19 Mon Aug 4 18:02:01 2003
--- gnue-designer/src/templates/forms/Simple.py Tue Nov 25 14:52:36 2003
***************
*** 211,217 ****
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.getChildSchema(schema):
if field.name in self.variables['fields']:
fields[field.name] = field
--- 211,217 ----
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.fields():
if field.name in self.variables['fields']:
fields[field.name] = field
Index: gnue-designer/src/templates/reports/Labels.py
diff -c gnue-designer/src/templates/reports/Labels.py:1.7
gnue-designer/src/templates/reports/Labels.py:1.8
*** gnue-designer/src/templates/reports/Labels.py:1.7 Wed May 28 18:19:32 2003
--- gnue-designer/src/templates/reports/Labels.py Tue Nov 25 14:52:36 2003
***************
*** 170,176 ****
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.getChildSchema(schema):
if field.name in self.variables['fields']:
fields[field.name] = field
--- 170,176 ----
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.fields():
if field.name in self.variables['fields']:
fields[field.name] = field
Index: gnue-designer/src/templates/reports/MailMerge.py
diff -c gnue-designer/src/templates/reports/MailMerge.py:1.7
gnue-designer/src/templates/reports/MailMerge.py:1.8
*** gnue-designer/src/templates/reports/MailMerge.py:1.7 Wed May 28
18:19:32 2003
--- gnue-designer/src/templates/reports/MailMerge.py Tue Nov 25 14:52:36 2003
***************
*** 168,174 ****
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.getChildSchema(schema):
if field.name in self.variables['fields']:
fields[field.name] = field
--- 168,174 ----
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.fields():
if field.name in self.variables['fields']:
fields[field.name] = field
Index: gnue-designer/src/templates/reports/SimpleReport.py
diff -c gnue-designer/src/templates/reports/SimpleReport.py:1.9
gnue-designer/src/templates/reports/SimpleReport.py:1.10
*** gnue-designer/src/templates/reports/SimpleReport.py:1.9 Wed May 28
18:19:32 2003
--- gnue-designer/src/templates/reports/SimpleReport.py Tue Nov 25 14:52:37 2003
***************
*** 175,181 ****
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.getChildSchema(schema):
if field.name in self.variables['fields']:
fields[field.name] = field
--- 175,181 ----
# because we want to keep in the order that the user
# specified
fields = {}
! for field in schema.fields():
if field.name in self.variables['fields']:
fields[field.name] = field
Index: gnue-designer/src/templates/schema/Introspection.py
diff -c gnue-designer/src/templates/schema/Introspection.py:1.11
gnue-designer/src/templates/schema/Introspection.py:1.12
*** gnue-designer/src/templates/schema/Introspection.py:1.11 Wed Aug 13
17:53:22 2003
--- gnue-designer/src/templates/schema/Introspection.py Tue Nov 25 14:52:37 2003
***************
*** 152,158 ****
fields = self.AddElement('fields', table, {})
# Add each field
! for field in schema.getChildSchema(schema):
print " Adding <field> %s" % field.name
attrs = { 'name': field.name,
'type': field.datatype }
--- 152,158 ----
fields = self.AddElement('fields', table, {})
# Add each field
! for field in schema.fields():
print " Adding <field> %s" % field.name
attrs = { 'name': field.name,
'type': field.datatype }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-designer/src base/TemplateBase.py base/too...,
Jason Cater <=