Changeset 3630

Timestamp:

17/03/08 15:14:19 (14 years ago)

Author:

astephen

Message:

Fixed defaults for delimiter and float format so read from nappy.ini config file.

Location:

nappy/trunk

Files:

• nappy.ini (modified) (1 diff)
• nappy/nappy_api.py (modified) (1 diff)
• nappy/nc_interface/nc_to_na.py (modified) (2 diffs)
• nappy/utils/__init__.py (modified) (1 diff)
• nappy/utils/common_utils.py (modified) (1 diff)

nappy/trunk/nappy.ini

@@ -2 +2 @@
 version = 0.3.0
 DEBUG = False
+default_delimiter = __space____space____space____space__
+default_float_format = %g
 annotations_file = annotations.ini
 

nappy/trunk/nappy/nappy_api.py

@@ -141 +141 @@
 getNAFileClass = nappy.utils.common_utils.getNAFileClass
 __version__ = nappy.utils.common_utils.getVersion()
+default_delimiter = nappy.utils.common_utils.getDefault("default_delimiter")
+default_float_format = nappy.utils.common_utils.getDefault("default_float_format")
 
 

nappy/trunk/nappy/nc_interface/nc_to_na.py

@@ -35 +35 @@
 # Define global variables
 DEBUG = nappy.utils.getDebug() 
+default_delimiter = nappy.utils.getDefault("default_delimiter")
+default_float_format = nappy.utils.getDefault("default_float_format")
+
 
 class NCToNA(nappy.nc_interface.cdms_to_na.CDMSToNA):
@@ -118 +121 @@
         return file_names
 
-    def writeNAFiles(self, na_file=None, delimiter="    ", 
-                     float_format="%g", size_limit=None):
+    def writeNAFiles(self, na_file=None, delimiter=default_delimiter, 
+                     float_format=default_float_format, size_limit=None):
         """
         Writes the self.na_dict_list content to one or more NASA Ames files.

nappy/trunk/nappy/utils/__init__.py

@@ -1 +1 @@
 from parse_config import getConfigDict
-from common_utils import getDebug, getVersion
+from common_utils import getDebug, getVersion, getDefault

nappy/trunk/nappy/utils/common_utils.py

@@ -152 +152 @@
     return d
 
-def getAnnotation(item, annotation, delimiter = ',   '):
+
+def getAnnotation(item, annotation, delimiter=None):
     """
     Returns the annotation string for a given NASA Ames item.
     """
-    
+    if delimiter == None:
+        delimiter = getDefault("default_delimiter") 
     dict = parse_config.getAnnotationsConfigDict()
     if annotation: return dict[item] + delimiter
     else: return ''
+
 
 def annotateLines(item_name, annotate, delimiter, lines):