Skip to content

Commit 7b52bc0

Browse files
PadeanuPadeanu
committed
Updated ADGS with new attributes
1 parent ad000e0 commit 7b52bc0

File tree

6 files changed

+97
-97
lines changed

6 files changed

+97
-97
lines changed

‎services/adgs/config/adgs_ws_config.template.yaml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ template:
4242
need_auth: true
4343
results_entry: $.value | $
4444
metadata_mapping:
45-
id:
45+
auxip:id:
4646
- null
4747
- "$.Id"
4848
Name:
@@ -78,15 +78,18 @@ template:
7878
attr_ptype:
7979
- null
8080
- "$.attr_ptype"
81-
attr_serial_identif:
81+
platformSerialIdentifier:
8282
- null
83-
- "$.attr_serial_identif"
84-
attr_platform_short_name:
83+
- "$.platformSerialIdentifier"
84+
platformShortName:
8585
- null
86-
- "$.attr_platform_short_name"
87-
attr_processing_date:
86+
- "$.platformShortName"
87+
processing:datetime:
8888
- null
89-
- "$.attr_processing_date"
89+
- "$.processing:datetime"
90+
processing:facility:
91+
- null
92+
- "$.processing:facility"
9093
attrs:
9194
- null
9295
- "$.Attributes"
@@ -102,14 +105,15 @@ template:
102105
operations:
103106
and:
104107
- "contains(Name, '{Name}')"
108+
- "contains(Id, '{auxip:id}')"
105109
- "PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}"
106110
- "PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}"
107111
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"
108112
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType' and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')"
109-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')"
110-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')"
111-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')"
112-
113+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')"
114+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')"
115+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
116+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')"
113117
sort:
114118
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
115119
sort_param_mapping:

‎services/adgs/config/adgs_ws_config.yaml‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ adgs:
4646
need_auth: true
4747
results_entry: $.value | $
4848
metadata_mapping:
49-
id:
49+
auxip:id:
5050
- null
5151
- $.Id
5252
Name:
@@ -82,15 +82,18 @@ adgs:
8282
attr_ptype:
8383
- null
8484
- $.attr_ptype
85-
attr_serial_identif:
85+
platformSerialIdentifier:
8686
- null
87-
- $.attr_serial_identif
88-
attr_platform_short_name:
87+
- $.platformSerialIdentifier
88+
platformShortName:
8989
- null
90-
- $.attr_platform_short_name
91-
attr_processing_date:
90+
- $.platformShortName
91+
processing:datetime:
9292
- null
93-
- $.attr_processing_date
93+
- $.processing:datetime
94+
processing:facility:
95+
- null
96+
- $.processing:facility
9497
attrs:
9598
- null
9699
- $.Attributes
@@ -107,17 +110,20 @@ adgs:
107110
operations:
108111
and:
109112
- contains(Name, '{Name}')
113+
- contains(Id, '{auxip:id}')
110114
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
111115
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
112116
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
113117
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
114118
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
115119
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier'
116-
and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')
120+
and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')
117121
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName'
118-
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')
122+
and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')
119123
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
120-
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
124+
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
125+
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
126+
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
121127
sort:
122128
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
123129
sort_param_mapping:
@@ -172,7 +178,7 @@ adgs2:
172178
need_auth: true
173179
results_entry: $.value | $
174180
metadata_mapping:
175-
id:
181+
auxip:id:
176182
- null
177183
- $.Id
178184
Name:
@@ -208,15 +214,18 @@ adgs2:
208214
attr_ptype:
209215
- null
210216
- $.attr_ptype
211-
attr_serial_identif:
217+
platformSerialIdentifier:
218+
- null
219+
- $.platformSerialIdentifier
220+
platformShortName:
212221
- null
213-
- $.attr_serial_identif
214-
attr_platform_short_name:
222+
- $.platformShortName
223+
processing:datetime:
215224
- null
216-
- $.attr_platform_short_name
217-
attr_processing_date:
225+
- $.processing:datetime
226+
processing:facility:
218227
- null
219-
- $.attr_processing_date
228+
- $.processing:facility
220229
attrs:
221230
- null
222231
- $.Attributes
@@ -233,17 +242,20 @@ adgs2:
233242
operations:
234243
and:
235244
- contains(Name, '{Name}')
245+
- contains(Id, '{auxip:id}')
236246
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
237247
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
238248
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
239249
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
240250
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
241251
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier'
242-
and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')
252+
and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')
243253
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName'
244-
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')
254+
and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')
245255
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
246-
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
256+
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
257+
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
258+
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
247259
sort:
248260
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
249261
sort_param_mapping:

‎services/adgs/config/adgs_ws_config_token_module.template.yaml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ template:
2929
need_auth: true
3030
results_entry: $.value | $
3131
metadata_mapping:
32-
id:
32+
auxip:id:
3333
- null
3434
- "$.Id"
3535
Name:
@@ -65,15 +65,18 @@ template:
6565
attr_ptype:
6666
- null
6767
- "$.attr_ptype"
68-
attr_serial_identif:
68+
platformSerialIdentifier:
6969
- null
70-
- "$.attr_serial_identif"
71-
attr_platform_short_name:
70+
- "$.platformSerialIdentifier"
71+
platformShortName:
7272
- null
73-
- "$.attr_platform_short_name"
74-
attr_processing_date:
73+
- "$.platformShortName"
74+
processing:datetime:
7575
- null
76-
- "$.attr_processing_date"
76+
- "$.processing:datetime"
77+
processing:facility:
78+
- null
79+
- "$.processing:facility"
7780
attrs:
7881
- null
7982
- "$.Attributes"
@@ -89,14 +92,15 @@ template:
8992
operations:
9093
and:
9194
- "contains(Name, '{Name}')"
95+
- "contains(Id, '{auxip:id}')"
9296
- "PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}"
9397
- "PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}"
9498
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"
9599
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType' and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')"
96-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')"
97-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')"
98-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')"
99-
100+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')"
101+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')"
102+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
103+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')"
100104
sort:
101105
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
102106
sort_param_mapping:

‎services/adgs/config/adgs_ws_config_token_module.yaml‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ adgs:
3333
need_auth: true
3434
results_entry: $.value | $
3535
metadata_mapping:
36-
id:
36+
auxip:id:
3737
- null
3838
- $.Id
3939
Name:
@@ -69,15 +69,18 @@ adgs:
6969
attr_ptype:
7070
- null
7171
- $.attr_ptype
72-
attr_serial_identif:
72+
platformSerialIdentifier:
7373
- null
74-
- $.attr_serial_identif
75-
attr_platform_short_name:
74+
- $.platformSerialIdentifier
75+
platformShortName:
7676
- null
77-
- $.attr_platform_short_name
78-
attr_processing_date:
77+
- $.platformShortName
78+
processing:datetime:
7979
- null
80-
- $.attr_processing_date
80+
- $.processing:datetime
81+
processing:facility:
82+
- null
83+
- $.processing:facility
8184
attrs:
8285
- null
8386
- $.Attributes
@@ -94,17 +97,20 @@ adgs:
9497
operations:
9598
and:
9699
- contains(Name, '{Name}')
100+
- contains(Id, '{auxip:id}')
97101
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
98102
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
99103
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
100104
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
101105
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
102106
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier'
103-
and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')
107+
and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')
104108
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName'
105-
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')
109+
and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')
106110
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
107-
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
111+
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
112+
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
113+
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
108114
sort:
109115
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
110116
sort_param_mapping:
@@ -146,7 +152,7 @@ adgs2:
146152
need_auth: true
147153
results_entry: $.value | $
148154
metadata_mapping:
149-
id:
155+
auxip:id:
150156
- null
151157
- $.Id
152158
Name:
@@ -182,15 +188,18 @@ adgs2:
182188
attr_ptype:
183189
- null
184190
- $.attr_ptype
185-
attr_serial_identif:
191+
platformSerialIdentifier:
192+
- null
193+
- $.platformSerialIdentifier
194+
platformShortName:
186195
- null
187-
- $.attr_serial_identif
188-
attr_platform_short_name:
196+
- $.platformShortName
197+
processing:datetime:
189198
- null
190-
- $.attr_platform_short_name
191-
attr_processing_date:
199+
- $.processing:datetime
200+
processing:facility:
192201
- null
193-
- $.attr_processing_date
202+
- $.processing:facility
194203
attrs:
195204
- null
196205
- $.Attributes
@@ -207,17 +216,20 @@ adgs2:
207216
operations:
208217
and:
209218
- contains(Name, '{Name}')
219+
- contains(Id, '{auxip:id}')
210220
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
211221
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
212222
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
213223
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
214224
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
215225
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier'
216-
and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')
226+
and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')
217227
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName'
218-
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')
228+
and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')
219229
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
220-
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
230+
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
231+
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
232+
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
221233
sort:
222234
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
223235
sort_param_mapping:

‎services/adgs/rs_server_adgs/api/adgs_search.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ def process_search(
111111
"""Search adgs products for the given collection and OData parameters."""
112112
# Update odata names that shadow eodag builtins (productype)
113113
odata_params["Name"] = odata_params.pop("Name", [None])[0]
114-
odata_params["attr_platform_short_name"] = odata_params.pop("platformShortName", None)
115-
odata_params["attr_serial_identif"] = odata_params.pop("platformSerialIdentifier", None)
116114
odata_params["attr_ptype"] = odata_params.pop("productType", None)
117115

118116
return process_product_search(

0 commit comments

Comments
 (0)