Merge pull request #18 from gisce/fix_schema_measures_float

FIX fields.Float() for power measures

Author: ecarreras

sippers/adapters/hidrocantabrico.py

@@ -108,7 +108,7 @@ class HidrocantabricoMeasuresAdapter(MeasuresAdapter, MeasuresSchema):
     @pre_load
     def fix_numbers(self, data):
         for attr, field in self.fields.iteritems():
-            if isinstance(field, fields.Integer):
+            if isinstance(field, (fields.Integer, fields.Float)):
                 if not data.get(attr):
                     data[attr] = 0
                 else:

sippers/file.py

@@ -196,7 +196,7 @@ def next(self):
             except Exception as exc:
                 logger.critical(
                     "Error in %s L:%s: %s %s", self.path, self.stats.line_number,
-                    str(exc), data.get('orig'), exc_info=True
+                    str(exc), line, exc_info=True
                 )
                 self.stats.errors.append(
                     (self.stats.line_number, str(exc))

sippers/models/__init__.py

@@ -121,15 +121,15 @@ class MeasuresSchema(Schema):
     tipo_r5 = fields.String()
     reactiva_6 = fields.Integer()
     tipo_r6 = fields.String()
-    potencia_1 = fields.Integer()
+    potencia_1 = fields.Float()
     tipo_p1 = fields.String()
-    potencia_2 = fields.Integer()
+    potencia_2 = fields.Float()
     tipo_p2 = fields.String()
-    potencia_3 = fields.Integer()
+    potencia_3 = fields.Float()
     tipo_p3 = fields.String()
-    potencia_4 = fields.Integer()
+    potencia_4 = fields.Float()
     tipo_p4 = fields.String()
-    potencia_5 = fields.Integer()
+    potencia_5 = fields.Float()
     tipo_p5 = fields.String()
-    potencia_6 = fields.Integer()
+    potencia_6 = fields.Float()
     tipo_p6 = fields.String()