Mercurial > public > scc_access / file comparison
comparison: scc_access/scc_access.py
scc_access/scc_access.py
- branch
- send_rs_data
- changeset 23
- bbaf82cd6e71
- parent 21
- 4fcec88bfe3d
- child 24
- a6ed20f50a58
equal
deleted
inserted
replaced
| 22:5e3f107df50a | 23:bbaf82cd6e71 |
|---|---|
| 109 if upload_submit.url == self.upload_url: | 109 if upload_submit.url == self.upload_url: |
| 110 measurement_id = False | 110 measurement_id = False |
| 111 logger.error("Uploaded file rejected! Try to upload manually to see the error.") | 111 logger.error("Uploaded file rejected! Try to upload manually to see the error.") |
| 112 else: | 112 else: |
| 113 measurement_id = re.findall(regex, upload_submit.text)[0] | 113 measurement_id = re.findall(regex, upload_submit.text)[0] |
| 114 logger.error("Successfully uploaded measurement with id %s." % measurement_id) | 114 logger.info("Successfully uploaded measurement with id %s." % measurement_id) |
| 115 | 115 |
| 116 return measurement_id | 116 return measurement_id |
| 117 | 117 |
| 118 def download_files(self, measurement_id, subdir, download_url): | 118 def download_files(self, measurement_id, subdir, download_url): |
| 119 """ Downloads some files from the download_url to the specified | 119 """ Downloads some files from the download_url to the specified |
| 534 else: | 534 else: |
| 535 if (args.filename == '') or (args.system == 0): | 535 if (args.filename == '') or (args.system == 0): |
| 536 parser.error('Provide a valid filename and system parameters.\nRun with -h for help.\n') | 536 parser.error('Provide a valid filename and system parameters.\nRun with -h for help.\n') |
| 537 | 537 |
| 538 if args.process: | 538 if args.process: |
| 539 process_file(args.filename, args.system, settings) | 539 process_file(args.filename, args.system, settings, rs_filename=args.radiosounding) |
| 540 else: | 540 else: |
| 541 upload_file(args.filename, args.system, settings, rs_filename=args.radiosounding) | 541 upload_file(args.filename, args.system, settings, rs_filename=args.radiosounding) |
