[Formed-commits] r443 - in trunk: . formed/formed formed/formed/plugins/export

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-03-14 10:50:50 +0100 (Mon, 14 Mar 2011)
New Revision: 443

Modified:
   trunk/ChangeLog
   trunk/formed/formed/config.py
   trunk/formed/formed/plugins/export/xsd.py
Log:
Generate correct XSD if there are conditionals in Choices

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-03-08 14:00:30 UTC (rev 442)
+++ trunk/ChangeLog	2011-03-14 09:50:50 UTC (rev 443)
@@ -1,3 +1,10 @@
+2011-03-14  Roland Geider  <roland.geider at intevation.de>
+
+	* formed/formed/plugins/export/xsd.py,
+	  formed/formed/config.py: Generate correct XSD if there are
+	  conditionals in Choices. Also deactivate the webserver nobody is
+	  using.
+
 2011-03-08  Roland Geider  <roland.geider at intevation.de>
 
 	* formed/formed/plugins/export/xsd.py: Updated XSD

Modified: trunk/formed/formed/config.py
===================================================================
--- trunk/formed/formed/config.py	2011-03-08 14:00:30 UTC (rev 442)
+++ trunk/formed/formed/config.py	2011-03-14 09:50:50 UTC (rev 443)
@@ -49,7 +49,7 @@
 
         # add your plug-ins here
         self.plugins = [
-            WebPlugIn()
+            #WebPlugIn()
         ]
 
         # add your filters here

Modified: trunk/formed/formed/plugins/export/xsd.py
===================================================================
--- trunk/formed/formed/plugins/export/xsd.py	2011-03-08 14:00:30 UTC (rev 442)
+++ trunk/formed/formed/plugins/export/xsd.py	2011-03-14 09:50:50 UTC (rev 443)
@@ -752,6 +752,9 @@
                     if cc: stack.extend(cc)
                 elif isinstance(c, data.GroupNode):
                     stack.extend(c.children)
+                # Also add options if they are defined in a conditional
+                elif isinstance(c, data.ConditionalNode):
+                    stack.extend(c.children)
                 elif isinstance(c, data.BoolLeaf):
                     desc = c.getDescription()
                     if not desc: desc = ""