diff --git a/scraper/oracle/connectors/lta.py b/scraper/oracle/connectors/lta.py index 6f7fbcd5b454051bfeeb50d1d6e89ad8f724ca93..64cfd1e3c91fae0969617da417517f37389addcc 100644 --- a/scraper/oracle/connectors/lta.py +++ b/scraper/oracle/connectors/lta.py @@ -37,8 +37,10 @@ class SkyImages(): def __init__(self): self.sql_select_statement = """ - SELECT * + SELECT * FROM AWOPER.SkyImageDataProduct dp + JOIN AWOPER.Pointing P ON P.OBJECT_ID = dp.OBSERVATIONPOINTING + JOIN AWOPER.ProjectInformation PR ON PR.OBJECT_ID = dp.PROJECTINFORMATION """ def translate(self, row, args): """ @@ -50,16 +52,17 @@ class SkyImages(): :return: payload: the json payload for the post to the ADEX backend """ payload = dict( - pid=str(row[32]), + pid=str(row[15]), + project_name = row[74], name=row[11], dp_type="skyimage", format=row[14], #this yields 'archive/tar', which is not a defined format by stakeholders locality="tape", #access_url=row['access_url'], - ra=float(row[38]/10), - dec=float(row[39]/10), - equinox="J2000.0", + ra=float(row[61]), + dec=float(row[59]), + equinox=str(row[60]), #timestamp=row[10], data_provider="ASTRON", @@ -67,8 +70,8 @@ class SkyImages(): dataset_id=row[11].split('_')[0], collection=args.collection, - pipeline_url=row[21], - pipeline_version = row[23], + pipeline_url=row[23], + direction_coordinate = str(row[32]) )