Changeset 3742

Timestamp:

03/04/08 14:23:33 (11 years ago)

Author:

domlowe

Message:

changing entry points for python scripts

Location:

DPPP/kml/python/csml2kml

Files:

• csml2kml/__init__.py (modified) (1 diff)
• csml2kml/scripts/stations2kml.py (modified) (1 diff)
• csml2kml/scripts/wms2kml.py (modified) (1 diff)
• setup.py (modified) (1 diff)

DPPP/kml/python/csml2kml/csml2kml/__init__.py

@@ -9 +9 @@
 import WMSLayer
 import WMSLayerConvertor
+import scripts

DPPP/kml/python/csml2kml/csml2kml/scripts/stations2kml.py

@@ -3 +3 @@
 from csml2kml.ET import ElementTree
 
-# Get the config file name
-if len(sys.argv) != 2:
-    raise ValueError('The name of config file (and nothing more) required')
-configFileName = sys.argv[1]
-
-# Load the configuration XML element
-config = ElementTree().parse(configFileName)
-
-# Do the conversion
-StationConvertor(config).convert()
+def main():
+    # Get the config file name
+    if len(sys.argv) != 2:
+        raise ValueError('The name of config file (and nothing more) required')
+    configFileName = sys.argv[1]
+    
+    # Load the configuration XML element
+    config = ElementTree().parse(configFileName)
+    
+    # Do the conversion
+    StationConvertor(config).convert()

DPPP/kml/python/csml2kml/csml2kml/scripts/wms2kml.py

@@ -5 +5 @@
 from csml2kml.WMSLayerConvertor import WMSLayerConvertor
 
-# Get the config file name
-if len(sys.argv) != 2:
-    raise ValueError('The name of config file (and nothing more) required')
-configFileName = sys.argv[1]
 
-# Load the config file (in XML format)
-configElementTree = ElementTree()
-configElementTree.parse(configFileName)
-
-# Read the output root directory, and the root network URL where the output will be stored
-outputRootDirectory = configElementTree.getroot().find('OutputRootDirectory').text
-serverRootDirectory = configElementTree.getroot().find('ServerRootDirectory').text
-
-# Read in the Layers document from the source WMS service
-wmsRequestConfigElement = configElementTree.getroot().find('WMSRequest')
-wmsCapabilitiesUrl = wmsRequestConfigElement.find('URL').text + '?request=GetCapabilities'
-wmsCapabilitiesElement = XML( wget(wmsCapabilitiesUrl) )
-wmsCapabilities = WMSCapabilities()
-wmsCapabilities.parseXML(wmsCapabilitiesElement)
-
-# Initialise the convertor and perform the conversion
-wmsLayerConvertor = WMSLayerConvertor(
-    wmsCapabilities.topWmsLayer, wmsRequestConfigElement, outputRootDirectory, serverRootDirectory
-    )
-wmsLayerConvertor.convert()
+def main():
+    # Get the config file name
+    if len(sys.argv) != 2:
+        raise ValueError('The name of config file (and nothing more) required')
+    configFileName = sys.argv[1]
+    
+    # Load the config file (in XML format)
+    configElementTree = ElementTree()
+    configElementTree.parse(configFileName)
+    
+    # Read the output root directory, and the root network URL where the output will be stored
+    outputRootDirectory = configElementTree.getroot().find('OutputRootDirectory').text
+    serverRootDirectory = configElementTree.getroot().find('ServerRootDirectory').text
+    
+    # Read in the Layers document from the source WMS service
+    wmsRequestConfigElement = configElementTree.getroot().find('WMSRequest')
+    wmsCapabilitiesUrl = wmsRequestConfigElement.find('URL').text + '?request=GetCapabilities'
+    wmsCapabilitiesElement = XML( wget(wmsCapabilitiesUrl) )
+    wmsCapabilities = WMSCapabilities()
+    wmsCapabilities.parseXML(wmsCapabilitiesElement)
+    
+    # Initialise the convertor and perform the conversion
+    wmsLayerConvertor = WMSLayerConvertor(
+        wmsCapabilities.topWmsLayer, wmsRequestConfigElement, outputRootDirectory, serverRootDirectory
+        )
+    wmsLayerConvertor.convert()

DPPP/kml/python/csml2kml/setup.py

@@ -8 +8 @@
       author='Martin Kochan',
       description='Package converting CSML documents and context documents into KML documents, viawable in Google Earth.',
-      entry_points = {'console_scripts': ['wms2kml = csml2kml.scripts.wms2kml','stations2kml = csml2kml.scripts.stations2kml']}
+      entry_points = {'console_scripts': ['wms2kml = csml2kml.scripts.wms2kml:main','stations2kml = csml2kml.scripts.stations2kml:main']}
       )