[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6390 - in trunk/gnue-designer/src: base/tools forms/LayoutEditor forms/
From: |
reinhard |
Subject: |
r6390 - in trunk/gnue-designer/src: base/tools forms/LayoutEditor forms/wizards |
Date: |
Sat, 25 Sep 2004 08:45:01 -0500 (CDT) |
Author: reinhard
Date: 2004-09-25 08:44:59 -0500 (Sat, 25 Sep 2004)
New Revision: 6390
Modified:
trunk/gnue-designer/src/base/tools/DataSourceEditor.py
trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
trunk/gnue-designer/src/forms/wizards/CreateSchema.py
Log:
Undid last change because we are fixing gnue-common.
Modified: trunk/gnue-designer/src/base/tools/DataSourceEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/DataSourceEditor.py 2004-09-24
07:46:27 UTC (rev 6389)
+++ trunk/gnue-designer/src/base/tools/DataSourceEditor.py 2004-09-25
13:44:59 UTC (rev 6390)
@@ -120,7 +120,7 @@
def initialInventory(self, object):
if isinstance(object, GDataSource.GDataSource):
- self.datasourceMap[(object.name)] = object
+ self.datasourceMap[string.lower(object.name)] = object
self.datasourceMap[id(object)] = object
self.datasources.append(object)
object._fieldFkReferences = {}
@@ -134,7 +134,7 @@
if isinstance(object, GDataSource.GDataSource):
if hasattr(object,'master') and object.master:
try:
- object.__master = self.datasourceMap[(object.master)]
+ object.__master = self.datasourceMap[string.lower(object.master)]
except KeyError:
# TODO: Something better than this
print "DataSource %s references non-existent master %s" % \
@@ -152,7 +152,7 @@
len(object.foreign_key):
ds, field = string.split(
- (object.foreign_key),'.')
+ string.lower(object.foreign_key),'.')
try:
self.datasourceMap[ds]._fieldFkReferences[field].append(object)
@@ -163,7 +163,7 @@
hasattr(object,'datasource') and \
len(object.datasource):
- ds = self.datasourceMap[(object.datasource)]
+ ds = self.datasourceMap[string.lower(object.datasource)]
if not object in ds._blockReferences:
ds._blockReferences.append(object)
@@ -173,7 +173,7 @@
hasattr(object,'master') and \
object.master:
- ds = self.datasourceMap[(object.master)]
+ ds = self.datasourceMap[string.lower(object.master)]
if not object in ds._datasourceReferences:
ds._datasourceReferences.append(object)
@@ -258,7 +258,7 @@
self.datasources.pop(j)
self.list.DeleteItem(index)
- del self.datasourceMap[(object.name)]
+ del self.datasourceMap[string.lower(object.name)]
del self.datasourceMap[id(object)]
@@ -451,6 +451,7 @@
self.lines = {}
def addLine(self, name, referrer, type):
+ name = string.lower(name)
if not self.lines.has_key(name):
self.lines[name] = []
Modified: trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
2004-09-24 07:46:27 UTC (rev 6389)
+++ trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
2004-09-25 13:44:59 UTC (rev 6390)
@@ -95,12 +95,12 @@
if not attributes.has_key('block') and \
attributes.has_key('datasource'):
- datasource = (attributes['datasource'])
+ datasource = string.lower(attributes['datasource'])
for child in self.editor.page._children:
if child._type == 'GFBlock' and \
hasattr(child,'datasource') and \
- (child.datasource) == datasource:
+ string.lower(child.datasource) == datasource:
parent = child
break
@@ -260,8 +260,8 @@
for test in set:
try:
datasource = instance.datasources[test.datasource]
- if datasource.connection == table['connection'] and \
- datasource.table == table['name']:
+ if datasource.connection.lower() == table['connection'].lower() and \
+ datasource.table.lower() == table['name'].lower():
blocks.append(test)
except (KeyError, AttributeError):
pass
Modified: trunk/gnue-designer/src/forms/wizards/CreateSchema.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/CreateSchema.py 2004-09-24
07:46:27 UTC (rev 6389)
+++ trunk/gnue-designer/src/forms/wizards/CreateSchema.py 2004-09-25
13:44:59 UTC (rev 6390)
@@ -138,7 +138,7 @@
newtable.name=obj.table
GSFields(newtable)
GSConstraints(newtable)
- self.tablelist[obj.name]=newtable
+ self.tablelist[string.lower(obj.name)]=newtable
else:
print "WARNING: You defined a datasource without an 'table' "+\
@@ -161,9 +161,9 @@
# add a simple field to the table
#
if hasattr(obj,'field') and hasattr(myblock,'datasource') and \
- self.tablelist.has_key(myblock.datasource):
+ self.tablelist.has_key(string.lower(myblock.datasource)):
- table=self.tablelist[myblock.datasource]
+ table=self.tablelist[string.lower(myblock.datasource)]
type = self.DEFAULT_TYPE # standart type
@@ -208,9 +208,9 @@
# add fields to the table referenced in dropdowns
#
if hasattr(obj,'fk_key') and hasattr(obj,'fk_source') and\
- self.tablelist.has_key(obj.fk_source):
+ self.tablelist.has_key(string.lower(obj.fk_source)):
- table=self.tablelist[obj.fk_source]
+ table=self.tablelist[string.lower(obj.fk_source)]
# add 'fk_key' field
if type == self.STRING_TYPE:
@@ -236,7 +236,7 @@
if hasattr(obj,'master') and hasattr(obj,'masterlink') and \
hasattr(obj,'detaillink'):
- table=self.tablelist[obj.name]
+ table=self.tablelist[string.lower(obj.name)]
# create a foreign key on this table
newconstraint=GSConstraint(table.findChildOfType('GSConstraints'))
@@ -253,9 +253,9 @@
# if it one of the two is defined, then use the definition for both
self.AddField(table, obj.detaillink, self.DEFAULT_TYPE)
- if self.tablelist[obj.master]:
+ if self.tablelist[string.lower(obj.master)]:
- mtable=self.tablelist[obj.master]
+ mtable=self.tablelist[string.lower(obj.master)]
# set table name for foreign key
nfk_ref.table=mtable.name
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6390 - in trunk/gnue-designer/src: base/tools forms/LayoutEditor forms/wizards,
reinhard <=