r6192 - trunk/gnue-common/src/definitions

[johannes]

Author: johannes
Date: 2004-08-16 04:05:14 -0500 (Mon, 16 Aug 2004)
New Revision: 6192

Modified:
   trunk/gnue-common/src/definitions/GParser.py
Log:
Renamed some formatstrings, so they're working correctly.


Modified: trunk/gnue-common/src/definitions/GParser.py
===================================================================
--- trunk/gnue-common/src/definitions/GParser.py        2004-08-16 07:16:52 UTC 
(rev 6191)
+++ trunk/gnue-common/src/definitions/GParser.py        2004-08-16 09:05:14 UTC 
(rev 6192)
@@ -254,8 +254,9 @@
         baseAttrs = self.xmlElements[name].get('Attributes',{})
 
       except KeyError:
-        raise MarkupError, u_("Error processing <%(tag)s> tag [I do not know "
-                              "what a <%(tag)s> tag does]") % {'tag': name}
+        raise MarkupError, \
+            u_("Error processing <%(tagname)s> tag [I do not know what a "
+               "<%(tagname)s> tag does]") % {'tagname': name}
 
       xmlns = {}
 
@@ -277,10 +278,11 @@
             attrs [attr] = baseAttrs [attr].get ('Typecast', 
GTypecast.text)(saxattrs[qattr])
             loadedxmlattrs[attr] = attrs[attr]
           except KeyError:
-            raise MarkupError, u_('Error processing <%(tag)s> tag [I do not '
-                                  'recognize the "%(attribute)s" attribute') \
-                               % {'tag': name,
-                                  'attribute': attr}
+            raise MarkupError, \
+                u_('Error processing <%(tagname)s> tag [I do not '
+                   'recognize the "%(attribute)s" attribute]') \
+                % {'tagname': name,
+                   'attribute': attr}
 
           # this error shouldn't occure anymore
           #except UnicodeError:
@@ -305,6 +307,11 @@
                         'duplicate': saxattrs [qattr]}
               raise MarkupError, tmsg
 
+            # FIXME: If we really want to have a working 'Unique'-Attribute, we
+            # would add the following line. But this would break forms atm.
+            # self.uniqueIDs ["%s" % saxattrs [qattr]] = True
+
+
       for attr in baseAttrs.keys():
         if not attrs.has_key(attr):
 
@@ -314,9 +321,9 @@
 
           # Check for missing required attributes
           elif baseAttrs[attr].get('Required', 0): #default(baseAttrs[attr], 
'Required', 0):
-            tmsg = u_('Error processing <%(tag)s> tag [required attribute '
+            tmsg = u_('Error processing <%(tagname)s> tag [required attribute '
                       '"%(attribute)s" not present]') \
-                   % {'tag'      : name,
+                   % {'tagname'  : name,
                       'attribute': attr}
             raise MarkupError, tmsg