Merge pull request #9 from Bugazelle/dev

[Feat] Release to 0.1.14

src/ExportCsvToInflux/__version__.py

@@ -1 +1 @@
-__version__ = '0.1.13'
+__version__ = '0.1.14'

src/ExportCsvToInflux/csv_object.py

@@ -156,6 +156,10 @@ def convert_csv_data_to_int_float(self, file_name):
             for row in csv_reader:
                 keys = row.keys()
                 for key in keys:
+                    value = row[key]
+                    # Continue if field no value
+                    if len(str(value)) == 0:
+                        continue
                     # Valid Int Type
                     try:
                         if float(row[key]).is_integer():
@@ -201,20 +205,23 @@ def convert_csv_data_to_int_float(self, file_name):
                 keys = row.keys()
                 for key in keys:
                     value = row[key]
+                    if len(str(value)) == 0:
+                        row[key] = ''
+                        continue
                     int_status = int_type[key]
                     if int_status is True:
                         row[key] = int(float(value)) if int_type[key] is True else value
                     else:
                         row[key] = float(value) if float_type[key] is True else value
-                yield row
+                yield row, int_type, float_type
                 if has_header is False and i == 1:
                     for key in keys:
                         int_status = int_type[key]
                         if int_status is True:
                             row[key] = int(float(key)) if int_type[key] is True else key
                         else:
                             row[key] = float(key) if float_type[key] is True else key
-                    yield row
+                    yield row, int_type, float_type
                 i += 1
 
     def add_columns_to_csv(self,

src/ExportCsvToInflux/exporter_object.py

@@ -283,7 +283,7 @@ def export_csv_to_influx(self,
             count = 0
             timestamp = 0
             convert_csv_data_to_int_float = csv_object.convert_csv_data_to_int_float(file_name=new_csv_file)
-            for row in convert_csv_data_to_int_float:
+            for row, int_type, float_type in convert_csv_data_to_int_float:
                 # Process Match & Filter: If match_columns exists and filter_columns not exists
                 match_status = self.__check_match_and_filter(row,
                                                              match_columns,
@@ -324,6 +324,14 @@ def export_csv_to_influx(self,
                         if limit_string_length_columns:
                             if tag_column in limit_string_length_columns:
                                 v = str(v)[:limit_length + 1]
+                        # If field is empty
+                        if len(str(v)) == 0:
+                            if int_type[tag_column] is True:
+                                v = -999
+                            elif float_type[tag_column] is True:
+                                v = -999.0
+                            else:
+                                v = '-'
                     tags[tag_column] = v
 
                 # Process fields
@@ -335,6 +343,14 @@ def export_csv_to_influx(self,
                         if limit_string_length_columns:
                             if field_column in limit_string_length_columns:
                                 v = str(v)[:limit_length + 1]
+                        # If field is empty
+                        if len(str(v)) == 0:
+                            if int_type[field_column] is True:
+                                v = -999
+                            elif float_type[field_column] is True:
+                                v = -999.9
+                            else:
+                                v = '-'
                     fields[field_column] = v
 
                 point = {'measurement': db_measurement, 'time': timestamp, 'fields': fields, 'tags': tags}