Changeset 168 for Xml/xsd-fu/trunk/xsd-fu

Timestamp:

04/11/08 13:59:39 (8 months ago)

Author:

callan

Message:

generateDS bug fixes:

• Nested simpleType definitions now handled universally (booleans are insufficient)
  
• New style classes throughout
  

xsd-fu additions:

• Basic support for OME XML 2003 model (some hacks required)
  
• Full support for OME XML 2008 model
  
• XML Schema namespace definition support with "-n" command line argument
  
• More configuration of certain overrides in xsd-fu mapping now available
  

Files:

• Xml/xsd-fu/trunk/xsd-fu (modified) (6 diffs)

Xml/xsd-fu/trunk/xsd-fu

@@ -46 +46 @@
         cmd = sys.argv[0]
         print """%s
-Usage: %s [-p package] -o <output_dir> <path/to/ome.xsd>
+Usage: %s [-n xsd_namespace] [-p package] -o <output_dir> <path/to/ome.xsd>
 Generates Java classes from an OME XML Schema definition.
 
+Default package: "%s"
+Default namespace: "%s"
+
 Examples:
-  %s -p ome.xml -o ome/xml schemas/ome.xsd
+  %s -n 'xs:' -p ome.xml -o ome/xml schemas/ome.xsd
 
-Report bugs to Chris Allan <callan@blackcat.ca>""" % (error, cmd, cmd)
+Report bugs to Chris Allan <callan@blackcat.ca>""" % \
+        (error, cmd, DEFAULT_PACKAGE, NAMESPACE, cmd)
         sys.exit(2)
 
@@ -61 +65 @@
         """
         try:
-                options, args = getopt(sys.argv[1:], "o:p:")
+                options, args = getopt(sys.argv[1:], "o:p:n:")
         except GetoptError, (msg, opt):
                 usage(msg)
@@ -70 +74 @@
         outputDirectory = None
         package = DEFAULT_PACKAGE
+        namespace = DEFAULT_NAMESPACE
         for option, argument in options:
                 if option == "-o":
@@ -75 +80 @@
                 if option == "-p":
                         package = argument
+                if option == "-n":
+                        namespace = argument
         if outputDirectory is None:
                 usage("Output directory must be specified!")
@@ -81 +88 @@
                 sys.exit(1)
 
-        model = parseXmlSchema(args[0])
+        model = parseXmlSchema(args[0], namespace)
         fu = TemplateInfo(outputDirectory, package)
         template = NewTextTemplate(open(CLASS_TEMPLATE).read())
@@ -97 +104 @@
         outputDirectory = None
         package = DEFAULT_PACKAGE
+        namespace = "xs:"
 
-        model = parseXmlSchema("tmp/ome.xsd")
+        model = parseXmlSchema("tmp/schemas/2003/ome.xsd", namespace)
         fu = TemplateInfo(outputDirectory, package)
         template = NewTextTemplate(open(CLASS_TEMPLATE).read())
         for obj in model.objects.values():
-                if obj.name == "Laser":
+                if obj.name == "Image":
                         print " +-- %s(%s)" % (obj.name, obj.base)
                         for prop in obj.properties.values():