Changeset 4699

Timestamp:

22/12/08 22:37:11 (12 years ago)

Author:

astephen

Message:

Various nappy updates to improve comments and combining them with inserted comments.

Location:

nappy/trunk

Files:

• nappy.ini (modified) (2 diffs)
• nappy/nc_interface/na_content_collector.py (modified) (2 diffs)
• nappy/nc_interface/nc_to_na.py (modified) (5 diffs)

nappy/trunk/nappy.ini

@@ -4 +4 @@
 default_delimiter = __space____space____space____space__
 default_float_format = %g
-comment_override_rule = extend
+comment_override_rule = insert 
 add_column_headers = True
 annotations_file = annotations.ini
@@ -10 +10 @@
 
 [header_partitions]
-sc_start = "=== Special Comments follow ==="
-sc_end = "=== Special Comments end ==="
-nc_start = "=== Normal Comments follow ==="
-nc_end = "=== Normal Comments end ==="
+sc_start = "==== Special Comments follow ===="
+sc_end = "==== Special Comments end ===="
+nc_start = "==== Normal Comments follow ===="
+nc_end = "==== Normal Comments end ===="
 data_next = "=== Data Section begins on the next line ==="
-sing_start = "=== Singleton Variables defined in the source file follow ==="
-sing_end = "=== Singleton Variables defined in the source file end ==="
-ncatts_start = "=== Variable attributes from source (NetCDF) file follow ==="
-ncatts_end = "=== Variable attributes from source (NetCDF) file end ==="
-addl_globals = "Additional Global Attributes defined in the source file and not translated elsewhere:"
-addl_vatts = "Additional Variable Attributes defined in the source file and not translated elsewhere:"
+sing_start = "== Singleton Variables defined in the source file follow =="
+sing_end = "== Singleton Variables defined in the source file end =="
+ncatts_start = "== Variable attributes from source (NetCDF) file follow =="
+ncatts_end = "== Variable attributes from source (NetCDF) file end =="
+addl_globals = "=== Additional Global Attributes defined in the source file ==="
+addl_vatts = "=== Additional Variable Attributes defined in the source file ==="
 
 [na_to_nc_map]

nappy/trunk/nappy/nc_interface/na_content_collector.py

@@ -731 +731 @@
                 print msg
                 self.output_message.append(msg)
-                self.na_dict["DATE"] = [-999] * 3 
+                self.na_dict["DATE"] = [999] * 3 
         else: 
             if not self.na_dict.has_key("DATE"):
@@ -737 +737 @@
                 print msg
                 self.output_message.append(msg)
-                self.na_dict["DATE"] = [-999] * 3 
+                self.na_dict["DATE"] = [999] * 3 
             else:
                 pass # i.e. use existing DATE

nappy/trunk/nappy/nc_interface/nc_to_na.py

@@ -44 +44 @@
 add_column_headers = bool(nappy.utils.getDefault("add_column_headers"))
 
+config_dict = nappy.utils.getConfigDict()
+header_partitions = config_dict["header_partitions"]
+hp = header_partitions
+
 # Define global variables
 permitted_overwrite_metadata = ("DATE",  "RDATE", "ANAME", "MNAME",
@@ -188 +192 @@
                         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 in ("insert", "extend"):
+                            comments_list = self._cleanWrapComments(existing_comments, new_comments, key, comment_override_rule)
+                        else:
+                            raise Exception("Did not recognise comment_override_rule: " + str(comment_override_rule))
+
+                        """elif comment_override_rule == "insert":
+                            new_comments = new_items[:]
+                            existing_comments = this_na_dict.get(key, [])
+                            comments_list = self._cleanWrapComments(existing_comments, new_comments, key, comment_override_rule)
+                            #comments_list = new_item[:] + this_na_dict.get(key, [])
                         elif comment_override_rule == "extend": 
-                            comments_list = this_na_dict.get(key, []) + new_item[:]
+                            comments_list = this_na_dict.get(key, []) + new_item[:]  """
 
                         this_na_dict[key] = comments_list
@@ -225 +237 @@
 
             # Report on what has been written
-            msg = "\nWrote the following variables:" + "\n\t" + ("\n\t".join(vars_to_write[0]))
+            msg = "\nWrote the following variables:" + "\n  " + ("\n  ".join(vars_to_write[0]))
             if DEBUG: print msg
             self.output_message.append(msg)
@@ -232 +244 @@
             aux_var_count = vars_to_write[1]
             if len(aux_var_count) > 0:
-                msg = "\nWrote the following auxiliary variables:" + "\n\t" + ("\n\t".join(aux_var_count))      
+                msg = "\nWrote the following auxiliary variables:" + "\n  " + ("\n  ".join(aux_var_count))      
             
             singleton_var_count = vars_to_write[2]
             if len(singleton_var_count) > 0:
-                msg = "\nWrote the following Singleton variables:" + "\n\t" + ("\n\t".join(singleton_var_count))
+                msg = "\nWrote the following Singleton variables:" + "\n  " + ("\n  ".join(singleton_var_count))
 
             if len(file_list) > 0:
@@ -348 +360 @@
         na_dict["NNCOML"] = len(na_dict["NCOM"])
         return  
+
+
+    def _cleanWrapComments(self, existing_comments, new_comments, key, comment_override_rule):
+        """
+        Combines new_comments with existing_comments where comments are
+        either Special or Normal. 'key' defines this being defined as either
+        "SCOM" or "NCOM". 'comment_override_rule' is either "insert" (new_comments first)
+        or "extend" (existing_comments first).
+        Returns a new list of combined_comments.
+        """
+        # Strip start header if used
+        c1 = key[0].lower()
+        start_line = hp[c1 + "c_start"]
+        start_used = False
+
+        if existing_comments[0] == start_line:
+            existing_comments = existing_comments[1:]
+            start_used = start_line
+        
+        # Now check last line
+        end_line = hp[c1 + "c_end"]
+        end_used = False
+
+        if existing_comments[-1] == end_line:
+            existing_comments = existing_comments[:-1]
+            end_used = end_line
+
+        # Check for alternative last line in NCOM
+        if end_used == False and key == "NCOM":
+            end_line2 = hp["data_next"]
+            if existing_comments[-1] == end_line2:
+                existing_comments = existing_comments[:-1]
+                end_used = end_line2 
+       
+        # Now put back together
+        ordered_comments = [existing_comments, new_comments]
+        if comment_override_rule == "insert":
+            ordered_comments.reverse() 
+
+        combined_comments = ordered_comments[0] + ordered_comments[1]
+        if start_used:
+            combined_comments.insert(0, start_used)
+        if end_used:
+            combined_comments.append(end_used)
+    
+        return combined_comments
+