tested

file_extractor.py

@@ -2,6 +2,7 @@
 file_extractor.py
 '''
 import fileinput
+import toml
 
 
 class FileExtractor:
@@ -16,27 +17,35 @@ class FileExtractor:
         # public:
         self.file = file
         # private:
-        self.__hash = {}
+        self.__headeer = {}
+        self.__data = {}
         # constructor build objet by reading the file
-        self.read()
 
     # overloading operators
+
     def __str__(self):
         ''' overload string representation '''
         return 'Class FileExtractor, file: %s, size = %d' % (self.file, len(self))
 
    # read code roscop file
-    def read(self):
+    def read(self, keys, dic):
         for line in fileinput.input(
                 self.file, openhook=fileinput.hook_encoded("ISO-8859-1")):
+            if line[0] == '#' or line[0] == '*':
+                continue
 
             # iterate over the lines of opened file "fileName"
             # ------------------------------------------------
-            print(line)
+            p = line.split()
+            for k in keys:
+                print("{} ".format(p[dic[k]]), end='')
+            print()
 
 
 # for testing in standalone context
 # ---------------------------------
 if __name__ == "__main__":
     fe = FileExtractor('data/cnv/fr29001.cnv')
-    fe.read()
+    cfg = toml.load('tests/test.toml')
+    dic = cfg['split']['ctd']
+    fe.read(['PRES', 'TEMP', 'PSAL', 'DOX2'], dic)

tests/test_roscop.py

@@ -43,7 +43,7 @@ class testRoscop(unittest.TestCase):
         self.assertEqual(self.r.returnCode('PSAL')[
                          'standard_name'], 'sea_water_salinity')
         self.assertEqual(self.r.returnCode('PSAL')[
-                         'units'], '1')
+                         'conventions'], 'PSU')
         self.assertEqual(self.r.returnCode('PSAL')[
                          'comment'], 'Ocean practical salinity (PSS-78)')