diff -r eddfb2cd3793 -r b51ba2647b41 scc_access/scc_access.py
--- 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 = "
Measurement (?P.{12}) "
+regex = "Measurement (?P.{12,15}) " # {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.")