Misc updates (#80)

* Preserve case in catalogs
* Use title-case for matching intervals
* Remove misc print statements

Author: perrymanmd

src/hecdss/__init__.py

@@ -2,6 +2,7 @@
 from hecdss.catalog import Catalog
 from hecdss.hecdss import HecDss
 from hecdss.dsspath import DssPath
+from hecdss.irregular_timeseries import IrregularTimeSeries
 from hecdss.regular_timeseries import RegularTimeSeries
 from hecdss.array_container import ArrayContainer
 from hecdss.paired_data import PairedData

src/hecdss/catalog.py

@@ -37,20 +37,23 @@ def __create_condensed_catalog(self):
           time-series records must match all parts except the D (date) part to be combined.
         """
         self.items = []
+        raw_paths = {}
         for i in range(len(self.uncondensed_paths)):
             rawPath = self.uncondensed_paths[i]
             recordType = RecordType.RecordTypeFromInt(self.rawRecordTypes[i])
             path = DssPath(rawPath,recordType)
             # if timeseries - accumulate dates within a dataset
             if path.is_time_series():
                 cleanPath = str(path.path_without_date())
+                raw_paths[cleanPath.lower()] = rawPath
                 self.recordTypeDict[cleanPath.lower()] = recordType
                 if(path.D != "TS-Pattern"):
                     tsRecords = self.timeSeriesDictNoDates.setdefault(cleanPath.lower(), [])
                     t = datetime.strptime(path.D,"%d%b%Y")
                     tsRecords.append(t)
             elif recordType in [RecordType.PairedData, RecordType.Grid, RecordType.Text,
                                 RecordType.LocationInfo, RecordType.Array]:
+                raw_paths[rawPath] = rawPath
                 self.recordTypeDict[str(path).lower()] = recordType
                 self.items.append(path)
             else:
@@ -67,7 +70,7 @@ def __create_condensed_catalog(self):
                 condensedDpart +="-"+ dateList[-1].strftime("%d%b%Y")
             # insert condensed D part into path used as key
             rt = self.recordTypeDict[key]
-            p = DssPath(key,rt)
+            p = DssPath(raw_paths[key],rt)
             p.D = condensedDpart
             self.items.append(p)
 

src/hecdss/dateconverter.py

@@ -144,7 +144,8 @@ def julian_array_from_date_times(date_times, time_granularity_seconds=60, start_
         return [int(((i-start_date_base).days*86400 + i.hour * 3600 + i.minute * 60 + i.second)/time_granularity_seconds) for i in date_times]
     @staticmethod
     def intervalString_to_sec(interval):
-
+        if isinstance(interval, str):
+            interval = interval.title()
         if _time_string.__contains__(interval):
             i = _time_string.index(interval)
             return _sec[i]

src/hecdss/hecdss.py

@@ -54,6 +54,15 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             exc_tb (traceback): The traceback object.
         """
         self.close()
+    @staticmethod
+    def set_global_debug_level(level: int) -> None:
+        """
+        Sets the library debug level
+
+        Args:
+            level (int): a value between 0 and 15. Larger for more output
+        """
+        _Native().hec_dss_set_debug_level(level)
     def close(self):
         """closes the DSS file and releases any locks
         """
@@ -506,7 +515,7 @@ def put(self, container) -> int:
                 raise Exception("Time Series has an empty times array")
 
             startDate, startTime = DateConverter.dss_datetime_strings_from_datetime(ts.times[0])
-            quality = []  # TO DO
+            quality = container.quality
 
             status = self._native.hec_dss_tsStoreRegular(
                 ts.id,
@@ -525,7 +534,7 @@ def put(self, container) -> int:
             #                           saveAsFloat, units, type):
             start_date_base = (datetime(1900, 1, 1)+timedelta(days=its.julian_base_date))
             startDate, startTime = DateConverter.dss_datetime_strings_from_datetime(start_date_base)
-            quality = []  # TO DO
+            quality = container.quality
             julian_times = DateConverter.julian_array_from_date_times(its.times, its.time_granularity_seconds, start_date_base)
             if max(julian_times) >= 2147483647:
                 raise Exception("Julian times contains value larger than 2147483647, increase granularity or change "

src/hecdss/native.py

@@ -59,9 +59,7 @@ def hec_dss_open(self, dss_filename: str) -> int:
         f.restype = c_int
         self.handle = c_void_p()
         rval = f(dss_filename.encode("utf-8"), ctypes.byref(self.handle))
-        if rval == 0:
-            print("DSS file opened successfully.")
-        else:
+        if rval != 0:
             raise Exception("Error opening DSS file.")
         return rval
 
@@ -524,7 +522,6 @@ def hec_dss_pdRetrieve(self, pathname: str,
             doubleValues.extend(list(c_doubleValues))
             numberOrdinates[0] = c_numberOrdinates
             numberCurves[0] = c_numberCurves
-            print(numberCurves[0])
             labels.extend(c_labels.raw.decode('utf-8').split("\0")[:c_numberCurves.value])
         else:
             print("Function call failed with result:", result)

src/hecdss/regular_timeseries.py

@@ -17,6 +17,7 @@ def __init__(self):
         self.interval = ""
         self.start_date = ""
         self.time_granularity_seconds = 1
+        self.julian_base_date = 0
         self.id = ""
         self.location_info = None
 
@@ -167,7 +168,6 @@ def _generate_times(self):
 
         x = [self._get_interval_times(), self._get_interval_path(), self._get_interval_interval()]
         x = [i for i in x if i != "empty"]
-        print(x)
         if(not all(i == x[0] for i in x)):
             raise ValueError("inconsistent interval within arguments")
         elif len(x) != 3 and len(x) != 0: