Changeset 3988 for nappy/trunk

Timestamp:

04/06/08 14:12:18 (12 years ago)

Author:

astephen

Message:

Further nappy work to get comments inserted in correct place.

Location:

nappy/trunk

Files:

• nappy.ini (modified) (2 diffs)
• nappy/na_file/na_file.py (modified) (2 diffs)
• nappy/nc_interface/na_content_collector.py (modified) (2 diffs)
• nappy/nc_interface/nc_to_na.py (modified) (3 diffs)
• nappy/utils/__init__.py (modified) (1 diff)
• nappy/utils/common_utils.py (modified) (2 diffs)
• nappy/utils/parse_config.py (modified) (2 diffs)
• setup_env.sh (modified) (1 diff)

nappy/trunk/nappy.ini

@@ -4 +4 @@
 default_delimiter = __space____space____space____space__
 default_float_format = %g
+comment_override_rule = replace
 annotations_file = annotations.ini
 local_attributes_file = local_attributes.ini
@@ -32 +33 @@
 file_number_in_set = IVOL
 first_valid_date_of_data = DATE
+
+

nappy/trunk/nappy/na_file/na_file.py

@@ -31 +31 @@
 wrapLine = nappy.utils.common_utils.annotateLine
 wrapLines = nappy.utils.common_utils.annotateLines
+stripQuotes = nappy.utils.common_utils.stripQuotes
 
 
@@ -190 +191 @@
         self.header.write(wrapLine("NLHEAD_FFI", self.annotation, self.delimiter, "%d%s%d\n" % (self.NLHEAD, self.delimiter, self.FFI)))
         #print ("ONAME", self.annotation, self.delimiter, self.ONAME)
-        self.header.write(getAnnotation("ONAME", self.annotation, delimiter = self.delimiter) + `self.ONAME` + "\n")
-        self.header.write(getAnnotation("ORG", self.annotation, delimiter = self.delimiter) + `self.ORG` + "\n")
-        self.header.write(getAnnotation("SNAME", self.annotation, delimiter = self.delimiter) + `self.SNAME` + "\n")
-        self.header.write(getAnnotation("MNAME", self.annotation, delimiter = self.delimiter) + `self.MNAME` + "\n")
+        self.header.write(getAnnotation("ONAME", self.annotation, delimiter = self.delimiter) + stripQuotes(self.ONAME) + "\n")
+        self.header.write(getAnnotation("ORG", self.annotation, delimiter = self.delimiter) + stripQuotes(self.ORG) + "\n")
+        self.header.write(getAnnotation("SNAME", self.annotation, delimiter = self.delimiter) + stripQuotes(self.SNAME) + "\n")
+        self.header.write(getAnnotation("MNAME", self.annotation, delimiter = self.delimiter) + stripQuotes(self.MNAME) + "\n")
         self.header.write(wrapLine("IVOL_NVOL", self.annotation, self.delimiter, "%d%s%d\n" % (self.IVOL, self.delimiter, self.NVOL)))
         line = "%d %d %d%s%d %d %d\n" % (self.DATE[0], self.DATE[1], self.DATE[2], self.delimiter, self.RDATE[0], self.RDATE[1], self.RDATE[2])

nappy/trunk/nappy/nc_interface/na_content_collector.py

@@ -330 +330 @@
             self.na_dict["VSCAL"].append(1)
             # Populate the variable list with the array
-            self.na_dict["V"].append(var._data)
+            #print var._data.tolist()
+            self.na_dict["V"].append(var.tolist())
 
             # Create independent variable info
@@ -484 +485 @@
         """
         # Check if we should add to it with locally set rules
-        local_attributes = nappy.utils.getConfigDict()["local_attributes"]
-        for att, value in local_attributes.items():
+        local_attributes = nappy.utils.getLocalAttributesConfigDict()
+        local_nc_atts = local_attributes["nc_attributes"]
+         
+        for att, value in local_nc_atts.items():
             if not nc_to_na_map.has_key(att):
                 nc_to_na_map[key] = value

nappy/trunk/nappy/nc_interface/nc_to_na.py

@@ -41 +41 @@
 default_delimiter = nappy.utils.getDefault("default_delimiter")
 default_float_format = nappy.utils.getDefault("default_float_format")
+comment_override_rule = nappy.utils.getDefault("comment_override_rule")
 
 # Define global variables
 permitted_overwrite_metadata = ("DATE",  "RDATE", "ANAME", "MNAME",
-           "ONAME", "ORG", "SNAME", "VNAME")
+           "ONAME", "ORG", "SNAME", "VNAME", "SCOM", "NCOM")
 items_as_lists = ["DATE", "RDATE", "ANAME", "VNAME"]
 
@@ -151 +152 @@
         full_file_counter = 1
 
+        # Get any NASA Ames dictionary values that should be overwritten with local values
+        local_attributes = nappy.utils.getLocalAttributesConfigDict()
+        local_na_atts = local_attributes["na_attributes"]
+
+        # define final override list by using defaults then locally provided changes
+        overriders = local_na_atts
+        for (okey, ovalue) in self.na_items_to_override.items():
+            overriders[okey] = ovalue
+
         # Now loop through writing the outputs
         for na_dict_and_var_ids in self.na_dict_list:
@@ -162 +172 @@
 
             # Override content of NASA Ames if they are permitted
-            for key in self.na_items_to_override.keys():
+            for key in overriders.keys():
+
                 if key in permitted_overwrite_metadata:    
                     if key in items_as_lists:
-                        new_item = self.na_items_to_override[key].split()                  
+                        new_item = overriders[key].split()                 
                     else:
-                        new_item = self.na_items_to_override[key]
+                        new_item = overriders[key]
+
+                    # Do specific overwrite for comments by inserting lines at start
+                    if key in ("SCOM", "NCOM"):
+
+                        # Use rule defined in config file in terms of where to put new comments
+                        if comment_override_rule == "replace":
+                            comments_list = new_item
+                        elif comment_override_rule == "insert":
+                            comments_list = new_item + this_na_dict.get(key, [])
+                        elif comment_override_rule == "extend": 
+                            comments_list = this_na_dict.get(key, []) + new_item
+
+                        this_na_dict[key] = comments_list
+                        this_na_dict["N%sL" % key] = len(comments_list)
+                        print "Added to comments:", key
                          
-                    tt = this_na_dict.keys()
-                    tt.sort; print tt   
-                    if new_item != this_na_dict[key]:
+                    elif not this_na_dict.has_key(key) or new_item != this_na_dict[key]:
                         this_na_dict[key] = new_item
                         msg = "Metadata overwritten in output file: '%s' is now '%s'" % (key, this_na_dict[key])

nappy/trunk/nappy/utils/__init__.py

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

nappy/trunk/nappy/utils/common_utils.py

@@ -131 +131 @@
 def getDefault(item):
     """
-    Returns value of item from 'mrain' config file section.
+    Returns value of item from 'main' config file section.
     """
     value =  parse_config.getConfigDict()["main"][item]
@@ -189 +189 @@
     else:
         return line
+
+
+def stripQuotes(s):
+    "Strips extra quotes"
+    if type(s) != type("string"): s  = str(s)
+    if s[0] in ("'", '"'): s = s[1:]
+    if s[-1] in ("'", '"'): s = s[:-1]
+    return s

nappy/trunk/nappy/utils/parse_config.py

@@ -16 +16 @@
 config_dict = None
 annotations_config_dict = None
-
+attributes_config_dict = None
 
 class MyCasePreservingConfigParser(ConfigParser.ConfigParser):
@@ -87 +87 @@
 
 
+def makeLocalAttributesConfigDict(laf):
+    """
+    Parses local attributes config file and returns dictionary.
+    """
+    lad = {}
+    conf = MyCasePreservingConfigParser()
+    conf.read(laf)
+
+    # Load up dict
+    for sect in ("nc_attributes", "na_attributes"):
+        lad[sect] = {}
+        for item in conf.options(sect):
+            value = conf.get(sect, item)
+            print value
+            lad[sect][item] = value
+
+    return lad
+
+
+def getLocalAttributesConfigDict():
+    "Checks if already made and only makes if required."
+    config_dict = getConfigDict()
+
+    local_attributes_config_file = os.environ.get("NAPPY_LOCAL_ATTRIBUTES", None) or \
+                                  config_dict["main"]["local_attributes_file"]
+    
+    laf = os.path.join(base_dir, local_attributes_config_file)
+    global attributes_config_dict
+
+    if attributes_config_dict == None:
+        attributes_config_dict = makeLocalAttributesConfigDict(laf)
+    return attributes_config_dict
+
+
+
 if __name__=="__main__":
 
     print getConfigDict()
     print getAnnotationsConfigDict()
+    print getLocalAttributesConfigDict()
+

nappy/trunk/setup_env.sh

@@ -3 +3 @@
 export PYTHONPATH=$NAPPY_BASE_DIR:$PYTHONPATH
 unset NAPPY_ANNOTATIONS
+unset NAPPY_LOCAL_ATTRIBUTES