Mercurial > public > scc_access / changeset

--- a/CHANGELOG.rst	Fri Jan 11 19:28:49 2019 +0200
+++ b/CHANGELOG.rst	Thu Dec 05 18:27:15 2019 +0200
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.7.1 - 2019-12-05
+------------------
+* Fixed handling of both old- and new-style measurement ids.
+
 0.7.0 - 2019-01-11
 ------------------
 * Download method for HiRElPP, cloudmask, and other new datasets.

--- a/README.rst	Fri Jan 11 19:28:49 2019 +0200
+++ b/README.rst	Thu Dec 05 18:27:15 2019 +0200
@@ -27,6 +27,10 @@
     
     pip install hg+https://bitbucket.org/iannis_b/scc-access#egg=scc-access
 
+or, if you don't have mercurial on your system::
+
+   pip install https://bitbucket.org/iannis_b/scc-access/get/tip.zip
+
 You can also use the script by cloning this mercurial repository.
 
 

--- a/scc_access/__init__.py	Fri Jan 11 19:28:49 2019 +0200
+++ b/scc_access/__init__.py	Thu Dec 05 18:27:15 2019 +0200
@@ -1,1 +1,1 @@
-__version__ = "0.7.0"
\ No newline at end of file
+__version__ = "0.7.1"
\ No newline at end of file

--- a/scc_access/scc_access.py	Fri Jan 11 19:28:49 2019 +0200
+++ b/scc_access/scc_access.py	Thu Dec 05 18:27:15 2019 +0200
@@ -23,7 +23,7 @@
 
 # The regex to find the measurement id from the measurement page
 # This should be read from the uploaded file, but would require an extra NetCDF module.
-regex = "<h3>Measurement (?P<measurement_id>.{12}) <small>"
+regex = "<h3>Measurement (?P<measurement_id>.{12,15}) <small>"  # {12, 15} to handle both old- and new-style measurement ids.
 
 
 class SCC:
@@ -714,8 +714,8 @@
     delete_parser = subparsers.add_parser("delete", help="Deletes a measurement.")
     rerun_all_parser = subparsers.add_parser("rerun-all", help="Reprocess a measurement on the SCC.")
     rerun_processing_parser = subparsers.add_parser("rerun-processing",
-                                                    help="Rerun processing routings for a measurement.")
-    process_file_parser = subparsers.add_parser("process-file", help="Upload a file and download procesing results.")
+                                                    help="Rerun processing routines for a measurement.")
+    process_file_parser = subparsers.add_parser("process-file", help="Upload a file and download processing results.")
     upload_file_parser = subparsers.add_parser("upload-file", help="Upload a file.")
     list_parser = subparsers.add_parser("list", help="List measurements registered on the SCC.")
     download_parser = subparsers.add_parser("download", help="Download selected measurements.")