Mercurial > public > scc_access / file comparison
comparison: scc_access/scc_access.py
scc_access/scc_access.py
- changeset 73
- a7685a98dfcd
- parent 72
- 3de925f654ad
equal
deleted
inserted
replaced
| 72:3de925f654ad | 73:a7685a98dfcd |
|---|---|
| 692 return None | 692 return None |
| 693 | 693 |
| 694 logger.info("Deleted measurement {0}".format(measurement_id)) | 694 logger.info("Deleted measurement {0}".format(measurement_id)) |
| 695 return True | 695 return True |
| 696 | 696 |
| 697 def available_measurements(self, start_gte=None, stop_lte=None, is_being_processed=None, is_queued=None): | 697 def available_measurements(self, start_gte=None, stop_lte=None, is_being_processed=None, is_queued=None, |
| 698 creation_gte=None, creation_lte=None, automatic_upload=None): | |
| 698 """ Get a list of available measurement on the SCC. | 699 """ Get a list of available measurement on the SCC. |
| 699 | 700 |
| 700 The methods is currently not used, could be merged with list_measurements. | 701 The methods is currently not used, could be merged with list_measurements. |
| 701 """ | 702 """ |
| 702 | 703 |
| 707 params['stop__lte'] = stop_lte | 708 params['stop__lte'] = stop_lte |
| 708 if is_being_processed is not None: | 709 if is_being_processed is not None: |
| 709 params['is_being_processed'] = is_being_processed | 710 params['is_being_processed'] = is_being_processed |
| 710 if is_queued is not None: | 711 if is_queued is not None: |
| 711 params['is_queued'] = is_queued | 712 params['is_queued'] = is_queued |
| 712 | 713 if creation_gte is not None: |
| 714 params['creation_date__gte'] = creation_gte | |
| 715 if creation_lte is not None: | |
| 716 params['creation_date__lte'] = creation_lte | |
| 717 if automatic_upload is not None: | |
| 718 params['system__automatic_upload'] = automatic_upload | |
| 713 | 719 |
| 714 response = self.session.get(self.api_measurements_url, params=params) | 720 response = self.session.get(self.api_measurements_url, params=params) |
| 715 response_dict = response.json() | 721 response_dict = response.json() |
| 716 | 722 |
| 717 if response_dict: | 723 if response_dict: |
| 1094 | 1100 |
| 1095 scc.logout() | 1101 scc.logout() |
| 1096 | 1102 |
| 1097 | 1103 |
| 1098 def automatic_upload(settings): | 1104 def automatic_upload(settings): |
| 1099 date_time_start = datetime.datetime.now() - datetime.timedelta(hours=8) | 1105 date_time_start = datetime.datetime.utcnow() - datetime.timedelta(hours=8) |
| 1100 date_time_start = date_time_start.replace(minute=0, second=0) | 1106 date_time_start = date_time_start.replace(minute=0, second=0) |
| 1101 start_parameter = date_time_start.strftime("%Y-%m-%dT%H:%M:%S") | 1107 start_parameter = date_time_start.strftime("%Y-%m-%dT%H:%M:%S") |
| 1102 date_time_stop = date_time_start + datetime.timedelta(hours=6) | 1108 date_time_stop = date_time_start + datetime.timedelta(hours=6) |
| 1103 stop_parameter = date_time_stop.strftime("%Y-%m-%dT%H:%M:%S") | 1109 stop_parameter = date_time_stop.strftime("%Y-%m-%dT%H:%M:%S") |
| 1104 | 1110 |
| 1108 #date_time_stop = datetime.datetime.combine(date_time_stop, datetime.time.max) | 1114 #date_time_stop = datetime.datetime.combine(date_time_stop, datetime.time.max) |
| 1109 | 1115 |
| 1110 with SCC(settings['basic_credentials'], settings['output_dir'], settings['base_url'], settings['sccdb_host'], settings['sccdb_credentials'], settings['sccdb']) as scc: | 1116 with SCC(settings['basic_credentials'], settings['output_dir'], settings['base_url'], settings['sccdb_host'], settings['sccdb_credentials'], settings['sccdb']) as scc: |
| 1111 scc.login(settings['website_credentials']) | 1117 scc.login(settings['website_credentials']) |
| 1112 | 1118 |
| 1113 measurements = scc.available_measurements(start_gte=start_parameter, stop_lte=stop_parameter, is_queued=False, is_being_processed=False) | 1119 measurements = scc.available_measurements(creation_gte=start_parameter, creation_lte=stop_parameter, |
| 1120 is_queued=False, is_being_processed=False, automatic_upload=True) | |
| 1114 is_automatic_upload = True | 1121 is_automatic_upload = True |
| 1115 if measurements is not None: | 1122 if measurements is not None: |
| 1116 for meas in measurements: | 1123 for meas in measurements: |
| 1117 #Create SQL query to compose | 1124 #Create SQL query to compose |
| 1118 mySql_insert_query = ("INSERT INTO scctoearlinettransfer_log (__measurements__ID, creation_date, " | 1125 mySql_insert_query = ("INSERT INTO scctoearlinettransfer_log (__measurements__ID, creation_date, " |
