[cig-commits] r11836 - cs/spatialdata-0.1/trunk/spatialdata/utils

[brad at geodynamics.org]

Author: brad
Date: 2008-04-21 10:58:12 -0700 (Mon, 21 Apr 2008)
New Revision: 11836

Modified:
   cs/spatialdata-0.1/trunk/spatialdata/utils/ConvertApp.py
Log:
Specify default reader/writer for converter.

Modified: cs/spatialdata-0.1/trunk/spatialdata/utils/ConvertApp.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/utils/ConvertApp.py	2008-04-21 17:23:38 UTC (rev 11835)
+++ cs/spatialdata-0.1/trunk/spatialdata/utils/ConvertApp.py	2008-04-21 17:58:12 UTC (rev 11836)
@@ -48,9 +48,10 @@
     ## @li \b writer Writer to dump data
 
     import pyre.inventory
+    from PointsStream import PointsStream
 
     reader = pyre.inventory.facility("reader", family="reader",
-                                     factory=Dummy)
+                                     factory=PointsStream)
     reader.meta['tip'] = "Reader to load data."
 
     converter = pyre.inventory.facility("converter", family="converter",
@@ -58,7 +59,7 @@
     converter.meta['tip'] = "Converter to convert data."
 
     writer = pyre.inventory.facility("writer", family="writer",
-                                     factory=Dummy)
+                                     factory=PointsStream)
     writer.meta['tip'] = "Writer to dump data."
 
 
@@ -68,6 +69,10 @@
     """
     Main entry point for application.
     """
+    if None == self.reader:
+      raise UnboundLocalError, "convert needs a reader to load the data.\n" \
+            "Please specify an unpickler with --reader=myreader"
+    
     data = self.reader.read()
     if not self.converter is None:
       self.converter.convert(data)
@@ -91,8 +96,7 @@
     """
     Script._configure(self)
     if self.inventory.reader.name == "dummy":
-      raise UnboundLocalError, "convert needs a reader to load the data.\n" \
-            "Please specify an unpickler with --reader=myreader"
+      self.reader = None
     else:
       self.reader = self.inventory.reader