r6387 - in trunk/gnue-designer/src: base/tools forms/LayoutEditor forms/wizards

[jcater]

Author: jcater
Date: 2004-09-23 23:31:27 -0500 (Thu, 23 Sep 2004)
New Revision: 6387

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:
Yet more case-sensitive datasource fixes


Modified: trunk/gnue-designer/src/base/tools/DataSourceEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/DataSourceEditor.py      2004-09-24 
04:24:45 UTC (rev 6386)
+++ trunk/gnue-designer/src/base/tools/DataSourceEditor.py      2004-09-24 
04:31:27 UTC (rev 6387)
@@ -120,7 +120,7 @@
 
   def initialInventory(self, object):
     if isinstance(object, GDataSource.GDataSource):
-      self.datasourceMap[string.lower(object.name)] = object
+      self.datasourceMap[(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[string.lower(object.master)]
+          object.__master = self.datasourceMap[(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(
-             string.lower(object.foreign_key),'.')
+             (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[string.lower(object.datasource)]
+      ds = self.datasourceMap[(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[string.lower(object.master)]
+      ds = self.datasourceMap[(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[string.lower(object.name)]
+      del self.datasourceMap[(object.name)]
       del self.datasourceMap[id(object)]
 
 
@@ -451,7 +451,6 @@
     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 04:24:45 UTC (rev 6386)
+++ trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py     
2004-09-24 04:31:27 UTC (rev 6387)
@@ -95,12 +95,12 @@
             if  not attributes.has_key('block') and \
                 attributes.has_key('datasource'):
 
-              datasource = string.lower(attributes['datasource'])
+              datasource = (attributes['datasource'])
 
               for child in self.editor.page._children:
                 if child._type == 'GFBlock' and \
                   hasattr(child,'datasource') and \
-                  string.lower(child.datasource) == datasource:
+                  (child.datasource) == datasource:
                   parent = child
                   break
 
@@ -260,8 +260,8 @@
       for test in set:
         try:
           datasource = instance.datasources[test.datasource]
-          if datasource.connection.lower() == table['connection'].lower() and \
-             datasource.table.lower() == table['name'].lower():
+          if datasource.connection == table['connection'] and \
+             datasource.table == table['name']:
             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 
04:24:45 UTC (rev 6386)
+++ trunk/gnue-designer/src/forms/wizards/CreateSchema.py       2004-09-24 
04:31:27 UTC (rev 6387)
@@ -138,7 +138,7 @@
         newtable.name=obj.table
         GSFields(newtable)
         GSConstraints(newtable)
-        self.tablelist[string.lower(obj.name)]=newtable
+        self.tablelist[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(string.lower(myblock.datasource)):
+             self.tablelist.has_key(myblock.datasource):
 
-        table=self.tablelist[string.lower(myblock.datasource)]
+        table=self.tablelist[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(string.lower(obj.fk_source)):
+             self.tablelist.has_key(obj.fk_source):
         
-        table=self.tablelist[string.lower(obj.fk_source)]
+        table=self.tablelist[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[string.lower(obj.name)]
+          table=self.tablelist[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[string.lower(obj.master)]:
+          if self.tablelist[obj.master]:
             
-            mtable=self.tablelist[string.lower(obj.master)]
+            mtable=self.tablelist[obj.master]
             # set table name for foreign key
             nfk_ref.table=mtable.name