Write hdf5 through (pip install -U h5py), fix fields

diff --git a/timeside/models.py b/timeside/models.py
index 5a576504ec6835b3f9fb1819dbfa0b3812b5d2e8..0210ddf6c85b949938349e5ed20ecc6e0fcfd780 100644 (file)
--- a/timeside/models.py
+++ b/timeside/models.py
@@ -222,7 +222,7 @@ class Task(models.Model):
 
             item.lock_setter(True)
             pipe.run()
-            #pipe.results.to_hdf5(item.hdf5.path)
+            pipe.results.to_hdf5(item.hdf5.path)
             item.lock_setter(False)
             
             for processor in proc_dict.keys():
@@ -234,7 +234,7 @@ class Task(models.Model):
                         parameters, c = Parameters.objects.get_or_create(processor=processor, parameters=unicode(parameters))
                         result, c = Result.objects.get_or_create(parameters=parameters, item=item)
                         result.hdf5 = path + item.uuid + '_' + str(proc.UUID) + '.hdf5'
-                        #proc.results.to_hdf5(result.hdf5.path)
+                        proc.results.to_hdf5(result.hdf5.path)
                         result.save()
         
                 if proc.type == 'grapher':

diff --git a/timeside/serializers.py b/timeside/serializers.py
index 5a1a4661fc9f0f047d0e14d248249a66c0f99da9..94e451bbf760ce875faa74fc7e47c7b502e867b1 100644 (file)
--- a/timeside/serializers.py
+++ b/timeside/serializers.py
@@ -36,7 +36,7 @@ class ResultSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Result
-        fields = ('id', 'item', 'processor', 'status')
+        fields = ('id', 'item', 'parameters', 'status')
 
 
 class ParametersSerializer(serializers.ModelSerializer):