Changeset 1799

Timestamp:

26.01.2012 16:25:22 (4 weeks ago)

Author:

fhoffmann

Message:

SQL-Model-Mapper patched for SQLite handling of quotation marks

File:

• ZMS/trunk/zmssqldb.py (modified) (3 diffs)

ZMS/trunk/zmssqldb.py

@@ -187 +187 @@
       container = self.getModelContainer()
       container_xml = container.raw
-      model_xml =  getattr(self,'model_xml','<list>\n</list>')
+      model_xml =  getattr(self,'model_xml',None)
+      if model_xml is None:
+        model_xml = '<list>\n</list>'
+        self.model_xml = model_xml
+        self.model = []
       if container_xml != model_xml:
         self.model_xml = container_xml
@@ -446 +450 @@
       except:
         pass
+      print "getEntities"
       
       entities = []
@@ -486 +491 @@
                       if len(l) > 0:
                         c += l + ' '
-                    if c.startswith('"') and c.find(' ') > 0:
-                      col = {}
-                      col["id"] = str(c[1:c.find(' ')-1])
-                      col["description"] =str(c[c.find(' ')+1:])
-                      columnBrwsrs.append(col)
+                    cl = filter(lambda x: len(x.strip()) > 0, c.split(' '))
+                    if len(cl) >= 2:
+                      cid = cl[0]
+                      if cid.startswith('"') and cid.endswith('"'):
+                        cid = cid[1:-1]
+                      ucid = cid.upper() 
+                      uctype = cl[1].upper()
+                      if not ucid == 'CHECK' and not uctype=='KEY' and not uctype.startswith('('):
+                        col = {}
+                        col["id"] = cid
+                        col["description"] = ' '.join(cl[1:])
+                        columnBrwsrs.append(col)
               else:
                 for columnBrwsr in tableBrwsr.tpValues():