HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1433:aaf8b0146447

Few fixes with merging empty csv files from Web Services...

jeandet -

r1433:aaf8b0146447

parent child

Context file:

r1433:aaf8b0146447

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 9a080a34054c21a67236f761e8843005c07ff0ba		1	Subproject commit 5f1aaa704ac36252027b9da0064bdf1de063df0d

plugins/python_providers/resources/amda.py +4 -3

             def get_sample(metadata,start,stop):
                 ts_type = pysciqlopcore.ScalarTimeSerie
+                default_ctor_args = 1
                 try:
                     param_id = None
                     for key,value in metadata:
                                 ts_type = pysciqlopcore.VectorTimeSerie
                             elif value == 'multicomponent':
                                 ts_type = pysciqlopcore.MultiComponentTimeSerie
+                                default_ctor_args = (0,2)
                     tstart=datetime.datetime.fromtimestamp(start, tz=timezone.utc)
                     tend=datetime.datetime.fromtimestamp(stop, tz=timezone.utc)
-                    df = amda.get_parameter(start_time=tstart, stop_time=tend, parameter_id=param_id)
+                    df = amda.get_parameter(start_time=tstart, stop_time=tend, parameter_id=param_id, method="REST")
                     #t = np.array([d.timestamp()-7200 for d in df.index])
                     t = np.array([d.timestamp() for d in df.index])
                     values = df.values
                     return ts_type(t,values.transpose())
-                    return ts_type(1)
                 except Exception as e:
                     print(traceback.format_exc())
                     print("Error in amda.py ",str(e))
-                    return ts_type(1)
+                    return ts_type(default_ctor_args)
             if len(amda.component) is 0:

plugins/python_providers/resources/test.py +2 -1

             import PythonProviders
             import pysciqlopcore
             import numpy as np
+            import math
             someglobal = 1
             def get_data(metadata,start,stop):
-                x = np.arange(start, stop)
+                x = np.arange(math.ceil(start), math.floor(stop))
                 for key,value in metadata:
                     if key == 'xml:id':
                         param_id = value

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages