diff --git a/.gitignore b/.gitignore index 2d24db35..eb15fbb8 100755 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ services/demo _build/ docs/_build/ acquisition/ +.vscode \ No newline at end of file diff --git a/VERSION.txt b/VERSION.txt index 2bf1c1cc..e7034819 100755 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -2.3.1 +2.3.2 \ No newline at end of file diff --git a/scripts/converter/sts.py b/scripts/converter/sts.py index 7d267871..4250d909 100755 --- a/scripts/converter/sts.py +++ b/scripts/converter/sts.py @@ -108,9 +108,10 @@ def parse(self, fileObj, fileName): data, self.config["tz"]) # Removing seconds from date - data = datetime( - data.year, data.month, data.day, data.hour, - data.minute, 0, tzinfo=data.tzinfo) + if 'rmseconds' not in self.config or self.config['rmseconds'] is True: + data = datetime( + data.year, data.month, data.day, data.hour, + data.minute, 0, tzinfo=data.tzinfo) self.setEndPosition(data) self.addObservation( diff --git a/scripts/istsos2csv.py b/scripts/istsos2csv.py index 3da65081..2a6a52b8 100755 --- a/scripts/istsos2csv.py +++ b/scripts/istsos2csv.py @@ -50,21 +50,25 @@ isoop = "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601" -def makeFile(res, procedure, op, path): +def makeFile(res, procedure, op, path, qi, filename): text = res.text text = text.replace("%s," % procedure, "") lines = text.split('\n') + print('Lines: %s' % len(lines)) if lines[-1] == '': del lines[-1] tmpOp = op.replace("x-ist::", "x-istsos:1.0:") - lines[0] = "%s,%s,%s:qualityIndex" % (isoop, tmpOp, tmpOp) + if qi == 'True': + lines[0] = "%s,%s,%s:qualityIndex" % (isoop, tmpOp, tmpOp) + else: + lines[0] = "%s,%s" % (isoop, tmpOp) if len(lines) > 1: datenumber = iso.parse_datetime(lines[-1].split(",")[0]) print "File: %s/%s_%s.dat" % ( - path, procedure, datetime.datetime.strftime( + path, filename, datetime.datetime.strftime( datenumber, "%Y%m%d%H%M%S%f")) out_file = open("%s/%s_%s.dat" % ( - path, procedure, datetime.datetime.strftime( + path, filename, datetime.datetime.strftime( datenumber, "%Y%m%d%H%M%S%f")), "w") out_file.write("\n".join(lines)) out_file.close() @@ -78,6 +82,12 @@ def execute(args, logger=None): url = args['url'] procedure = args['procedure'] + + if 'filename' in args and args['filename'] is not None: + filename = args['filename'] + else: + filename = procedure + observedProperty = args['op'] begin = iso.parse_datetime(args['begin']) @@ -91,7 +101,7 @@ def execute(args, logger=None): password = None if 'password' in args: password = args['password'] - if auth and password: + if user and password: auth = HTTPBasicAuth(user, password) qi = 'True' @@ -116,7 +126,6 @@ def execute(args, logger=None): if (end-begin) > step: tmpEnd = tmpBegin + step - print params while tmpEnd <= end: print ("%s - %s") % (tmpBegin, tmpEnd) @@ -130,7 +139,7 @@ def execute(args, logger=None): res = req.get("%s?%s" % (url, urllib.urlencode(params)), auth=auth) - makeFile(res, procedure, observedProperty, d) + makeFile(res, procedure, observedProperty, d, qi, filename) tmpBegin = tmpEnd tmpEnd = tmpBegin + step @@ -147,7 +156,7 @@ def execute(args, logger=None): iso.datetime_isoformat(tmpEnd)) res = req.get("%s?%s" % (url, urllib.urlencode(params)), auth=auth) - makeFile(res, procedure, observedProperty, d) + makeFile(res, procedure, observedProperty, d, qi, filename) print " %s ************************** " % iso.datetime_isoformat( end) @@ -198,6 +207,12 @@ def execute(args, logger=None): dest='procedure', help='Procedure name') + parser.add_argument( + '-f', + action='store', + dest='filename', + help='filename') + parser.add_argument( '-o', action='store', diff --git a/walib/sqlschema.py b/walib/sqlschema.py index e7eb77c2..6eb027fd 100755 --- a/walib/sqlschema.py +++ b/walib/sqlschema.py @@ -441,7 +441,8 @@ INSERT INTO observed_properties VALUES ('river-discharge', 'urn:ogc:def:parameter:x-istsos:1.0:river:water:discharge', '', NULL, 7); INSERT INTO observed_properties VALUES ('soil-evapotranspiration', 'urn:ogc:def:parameter:x-istsos:1.0:meteo:soil:evapotranspiration', '', NULL, 8); INSERT INTO observed_properties VALUES ('air-heatindex', 'urn:ogc:def:parameter:x-istsos:1.0:meteo:air:heatindex', '', NULL, 9); -SELECT pg_catalog.setval('obs_pr_id_opr_seq', 9, true); +INSERT INTO observed_properties VALUES ('ground-water-height', 'urn:ogc:def:parameter:x-istsos:1.0:ground:water:height', '', NULL, 10); +SELECT pg_catalog.setval('obs_pr_id_opr_seq', 10, true); --===================================== -- ADDING UNIT OF MEASURES