Changeset 7710

Timestamp:

08/11/10 11:42:54 (9 years ago)

Author:

astephen

Message:

Added in right-stripping of any annotations included in curly braces "{...}" on the
end of any input lines in NASA Ames.

Location:

nappy/trunk

Files:

• data_files/1001_cb.na (added)
• nappy/nappy_api.py (modified) (1 diff)
• nappy/utils/common_utils.py (modified) (2 diffs)
• nappy/utils/right_strip.py (added)
• nappy/utils/text_parser.py (modified) (6 diffs)
• setup.py (modified) (1 diff)
• tests/test_na_file_1001.py (modified) (1 diff)

nappy/trunk/nappy/nappy_api.py

@@ -140 +140 @@
 import nappy.utils.common_utils
 import nappy.utils.compare_na
+import nappy.utils.text_parser
 
 # Bring some utils into the API

nappy/trunk/nappy/utils/common_utils.py

@@ -16 +16 @@
 # Imports from local package
 import parse_config
+import text_parser as text_parser
 
 logging.basicConfig()
@@ -36 +37 @@
     the File Format Index (FFI) and return it as an integer.
     """
-    topline = open(filename).readline()
-    return int(topline.split()[-1])
+    fin = open(filename)
+    topline = fin.readline()
+    fin.close()
+
+    ffi = text_parser.readItemsFromLine(topline, 2, int)[-1]
+    return ffi
 
 

nappy/trunk/nappy/utils/text_parser.py

@@ -12 +12 @@
 """
 
+# Standard library imports
 import re
 import string
 
+# Local imports
+from nappy.utils.right_strip import *
+
+# Global variables
 pattnNoQuotes = re.compile("^[\"'].*\1$")
+
 
 def readItemFromLine(line, rttype=str):
     """
+    Reads an item of type ``rttype`` from ``line``.
+    """
+    line = rightStripCurlyBraces(line)
+    rtitem = pattnNoQuotes.sub("", line.strip())
 
-    """
-    rtitem = pattnNoQuotes.sub("", line.strip())
     if rttype is not str:
         rtitem = rttype(rtitem)   
@@ -28 +36 @@
 def readItemsFromLine(line, nitems=None, rttype=str):
     """
+    Reads ``nitems`` items of type ``rttype`` from ``line``.
+    """
+    line = rightStripCurlyBraces(line)
+    rtitems = re.split(r"\s+", line.strip())
 
-    """
-    rtitems = re.split(r"\s+", line.strip())
     if nitems and len(rtitems) != nitems:
         raise "Incorrect number of items (%s) found in line: \n'%s'" % (nitems, line)
@@ -39 +49 @@
 def readItemsFromLines(lines, nitems, rttype=str):
     """
-
+    Reads ``nitems`` items of type ``rttype`` from ``lines``
     """
+    lines = [rightStripCurlyBraces(line) for line in lines]
     rtitems = []
     for line in lines:
@@ -59 +70 @@
     rtitems = []
     lines = []        
+
     if type(object) == type([2,3]): 
 
@@ -64 +76 @@
             nextitem = object[0]
             object = object[1:]
-            items = nextitem.strip().split()
+            items = rightStripCurlyBraces(nextitem).strip().split()
             lines.append(items)
             (rtitems, extras) = (rtitems + items[:nitems], items[nitems:])
@@ -70 +82 @@
     else:
         while len(rtitems) < nitems:
-            items = object.readline().strip().split()
+            items = rightStripCurlyBraces(object.readline()).strip().split()
             lines.append(items)
             (rtitems, extras) = (rtitems + items[:nitems], items[nitems:])

nappy/trunk/setup.py

@@ -10 +10 @@
 setup(
       name='nappy',
-      version='0.9.9',
+      version='0.9.9c',
 
       description = 'NASA Ames Processing in Python',

nappy/trunk/tests/test_na_file_1001.py

@@ -63 +63 @@
 
 
+    def test_na1001CurlyWithCurlyBraces(self):
+        "Tests an input file with curly braces."
+        cb_file = os.path.join(data_files, "1001_cb.na")
+        fin = nappy.openNAFile(cb_file)
+        fin.readData()
+        na_dict = fin.getNADict()
+        foutname = os.path.join(test_outputs, "test_1001_cb_rewritten.na")
+        fobj = nappy.openNAFile(foutname, mode="w", na_dict=na_dict)
+        fobj.write()
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
 if __name__ ==  "__main__":