Skip to content

Commit 91ce542

Browse files
PadeanuPadeanu
committed
Fix ADGS datetime overlap
1 parent c2a6e0c commit 91ce542

File tree

5 files changed

+25
-1
lines changed

5 files changed

+25
-1
lines changed

‎services/adgs/config/adgs_stac_mapper.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"id": "Name",
33
"auxip:id": "id",
44
"created": "PublicationDate",
5-
"datetime": "Start",
5+
"datetime": "DatetimeStart",
66
"start_datetime": "Start",
77
"end_datetime": "End",
88
"file:size": "ContentLength",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ template:
6363
EvictionDate:
6464
- null
6565
- "$.EvictionDate"
66+
DatetimeStart:
67+
- null
68+
- "$.ContentDate.Start"
6669
Start:
6770
- null
6871
- "$.ContentDate.Start"
@@ -118,6 +121,7 @@ template:
118121
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
119122
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')"
120123
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
124+
- "ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}"
121125
- "ContentDate/Stop lt {Stop#to_iso_utc_datetime}"
122126
sort:
123127
sort_by_tpl: '&$orderby={sort_param} {sort_order}'

‎services/adgs/config/adgs_ws_config.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ adgs:
6767
EvictionDate:
6868
- null
6969
- $.EvictionDate
70+
DatetimeStart:
71+
- null
72+
- $.ContentDate.Start
7073
Start:
7174
- null
7275
- $.ContentDate.Start
@@ -128,6 +131,7 @@ adgs:
128131
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
129132
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
130133
- ContentDate/Start gt {Start#to_iso_utc_datetime}
134+
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
131135
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
132136
sort:
133137
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
@@ -204,6 +208,9 @@ adgs2:
204208
EvictionDate:
205209
- null
206210
- $.EvictionDate
211+
DatetimeStart:
212+
- null
213+
- $.ContentDate.Start
207214
Start:
208215
- null
209216
- $.ContentDate.Start
@@ -265,6 +272,7 @@ adgs2:
265272
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
266273
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
267274
- ContentDate/Start gt {Start#to_iso_utc_datetime}
275+
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
268276
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
269277
sort:
270278
sort_by_tpl: '&$orderby={sort_param} {sort_order}'

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ template:
5050
EvictionDate:
5151
- null
5252
- "$.EvictionDate"
53+
DatetimeStart:
54+
- null
55+
- "$.ContentDate.Start"
5356
Start:
5457
- null
5558
- "$.ContentDate.Start"
@@ -105,6 +108,7 @@ template:
105108
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
106109
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')"
107110
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
111+
- "ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}"
108112
- "ContentDate/Stop lt {Stop#to_iso_utc_datetime}"
109113
sort:
110114
sort_by_tpl: '&$orderby={sort_param} {sort_order}'

‎services/adgs/config/adgs_ws_config_token_module.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ adgs:
5454
EvictionDate:
5555
- null
5656
- $.EvictionDate
57+
DatetimeStart:
58+
- null
59+
- $.ContentDate.Start
5760
Start:
5861
- null
5962
- $.ContentDate.Start
@@ -115,6 +118,7 @@ adgs:
115118
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
116119
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
117120
- ContentDate/Start gt {Start#to_iso_utc_datetime}
121+
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
118122
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
119123
sort:
120124
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
@@ -178,6 +182,9 @@ adgs2:
178182
EvictionDate:
179183
- null
180184
- $.EvictionDate
185+
DatetimeStart:
186+
- null
187+
- $.ContentDate.Start
181188
Start:
182189
- null
183190
- $.ContentDate.Start
@@ -239,6 +246,7 @@ adgs2:
239246
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
240247
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
241248
- ContentDate/Start gt {Start#to_iso_utc_datetime}
249+
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
242250
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
243251
sort:
244252
sort_by_tpl: '&$orderby={sort_param} {sort_order}'

0 commit comments

Comments
 (0)