Skip to content

Commit 68fe695

Browse files
PadeanuPadeanu
committed
Fixed templates
1 parent 14d28f5 commit 68fe695

File tree

4 files changed

+6
-16
lines changed

4 files changed

+6
-16
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ template:
119119
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')"
120120
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')"
121121
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
122-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')"
122+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')"
123123
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
124124
- "ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}"
125125
- "ContentDate/Stop lt {Stop#to_iso_utc_datetime}"

‎services/adgs/config/adgs_ws_config.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ adgs:
131131
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
132132
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
133133
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
134-
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
134+
and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')
135135
- ContentDate/Start gt {Start#to_iso_utc_datetime}
136136
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
137137
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
@@ -259,16 +259,11 @@ adgs2:
259259
operations:
260260
and:
261261
- contains(Name, '{Name}')
262-
<<<<<<< HEAD
263262
- contains(Id, '{auxip:id}')
264-
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
265-
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
266-
=======
267263
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
268264
eq {StartPublicationDate#to_iso_utc_datetime})
269265
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
270266
eq {StopPublicationDate#to_iso_utc_datetime})
271-
>>>>>>> develop
272267
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
273268
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
274269
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
@@ -279,7 +274,7 @@ adgs2:
279274
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
280275
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
281276
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
282-
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
277+
and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')
283278
- ContentDate/Start gt {Start#to_iso_utc_datetime}
284279
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
285280
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ template:
106106
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')"
107107
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')"
108108
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
109-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')"
109+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')"
110110
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
111111
- "ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}"
112112
- "ContentDate/Stop lt {Stop#to_iso_utc_datetime}"

‎services/adgs/config/adgs_ws_config_token_module.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ adgs:
118118
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
119119
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
120120
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
121-
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
121+
and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')
122122
- ContentDate/Start gt {Start#to_iso_utc_datetime}
123123
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
124124
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
@@ -233,16 +233,11 @@ adgs2:
233233
operations:
234234
and:
235235
- contains(Name, '{Name}')
236-
<<<<<<< HEAD
237236
- contains(Id, '{auxip:id}')
238-
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
239-
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
240-
=======
241237
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
242238
eq {StartPublicationDate#to_iso_utc_datetime})
243239
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
244240
eq {StopPublicationDate#to_iso_utc_datetime})
245-
>>>>>>> develop
246241
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
247242
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
248243
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
@@ -253,7 +248,7 @@ adgs2:
253248
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
254249
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
255250
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
256-
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
251+
and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')
257252
- ContentDate/Start gt {Start#to_iso_utc_datetime}
258253
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
259254
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}

0 commit comments

Comments
 (0)