Skip to content

Commit 5986760

Browse files
committed
Added new queries texts
1 parent 7b52bc0 commit 5986760

9 files changed

+33
-0
lines changed

services/adgs/config/adgs_ws_config.template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ template:
114114
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')"
115115
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
116116
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')"
117+
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
118+
- "ContentDate/Stop lt {Stop#to_iso_utc_datetime}"
117119
sort:
118120
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
119121
sort_param_mapping:

services/adgs/config/adgs_ws_config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ adgs:
124124
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
125125
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
126126
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
127+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
128+
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
127129
sort:
128130
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
129131
sort_param_mapping:
@@ -256,6 +258,8 @@ adgs2:
256258
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
257259
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
258260
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
261+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
262+
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
259263
sort:
260264
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
261265
sort_param_mapping:

services/adgs/config/adgs_ws_config_token_module.template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ template:
101101
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')"
102102
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
103103
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')"
104+
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
105+
- "ContentDate/Stop lt {Stop#to_iso_utc_datetime}"
104106
sort:
105107
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
106108
sort_param_mapping:

services/adgs/config/adgs_ws_config_token_module.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ adgs:
111111
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
112112
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
113113
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
114+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
115+
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
114116
sort:
115117
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
116118
sort_param_mapping:
@@ -230,6 +232,8 @@ adgs2:
230232
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
231233
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
232234
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
235+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
236+
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
233237
sort:
234238
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
235239
sort_param_mapping:

services/cadip/config/cadip_ws_config.template_session.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ template:
135135
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
136136
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
137137
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
138+
- Id eq {id}
138139
- DownlinkOrbit eq {DownlinkOrbit}
139140
- DownlinkStart eq {DownlinkStart}
140141
- DownlinkStop eq {DownlinkStop}

services/cadip/config/cadip_ws_config.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -765,6 +765,7 @@ cadip_session:
765765
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
766766
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
767767
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
768+
- Id eq {id}
768769
- DownlinkOrbit eq {DownlinkOrbit}
769770
- DownlinkStart eq {DownlinkStart}
770771
- DownlinkStop eq {DownlinkStop}
@@ -941,6 +942,7 @@ ins_session:
941942
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
942943
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
943944
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
945+
- Id eq {id}
944946
- DownlinkOrbit eq {DownlinkOrbit}
945947
- DownlinkStart eq {DownlinkStart}
946948
- DownlinkStop eq {DownlinkStop}
@@ -1117,6 +1119,7 @@ mps_session:
11171119
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
11181120
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
11191121
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1122+
- Id eq {id}
11201123
- DownlinkOrbit eq {DownlinkOrbit}
11211124
- DownlinkStart eq {DownlinkStart}
11221125
- DownlinkStop eq {DownlinkStop}
@@ -1293,6 +1296,7 @@ mti_session:
12931296
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
12941297
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
12951298
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1299+
- Id eq {id}
12961300
- DownlinkOrbit eq {DownlinkOrbit}
12971301
- DownlinkStart eq {DownlinkStart}
12981302
- DownlinkStop eq {DownlinkStop}
@@ -1469,6 +1473,7 @@ nsg_session:
14691473
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
14701474
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
14711475
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1476+
- Id eq {id}
14721477
- DownlinkOrbit eq {DownlinkOrbit}
14731478
- DownlinkStart eq {DownlinkStart}
14741479
- DownlinkStop eq {DownlinkStop}
@@ -1645,6 +1650,7 @@ sgs_session:
16451650
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
16461651
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
16471652
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1653+
- Id eq {id}
16481654
- DownlinkOrbit eq {DownlinkOrbit}
16491655
- DownlinkStart eq {DownlinkStart}
16501656
- DownlinkStop eq {DownlinkStop}

services/cadip/config/cadip_ws_config_token_module.template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ template:
8686
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
8787
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
8888
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
89+
- Id eq {id}
8990
- DownlinkOrbit eq {DownlinkOrbit}
9091
- DownlinkStart eq {DownlinkStart}
9192
- DownlinkStop eq {DownlinkStop}

services/cadip/config/cadip_ws_config_token_module.template_session.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ template:
122122
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
123123
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
124124
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
125+
- Id eq {id}
125126
- DownlinkOrbit eq {DownlinkOrbit}
126127
- DownlinkStart eq {DownlinkStart}
127128
- DownlinkStop eq {DownlinkStop}

services/cadip/config/cadip_ws_config_token_module.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ cadip:
9191
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
9292
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
9393
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
94+
- Id eq {id}
9495
- DownlinkOrbit eq {DownlinkOrbit}
9596
- DownlinkStart eq {DownlinkStart}
9697
- DownlinkStop eq {DownlinkStop}
@@ -197,6 +198,7 @@ ins:
197198
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
198199
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
199200
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
201+
- Id eq {id}
200202
- DownlinkOrbit eq {DownlinkOrbit}
201203
- DownlinkStart eq {DownlinkStart}
202204
- DownlinkStop eq {DownlinkStop}
@@ -303,6 +305,7 @@ mps:
303305
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
304306
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
305307
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
308+
- Id eq {id}
306309
- DownlinkOrbit eq {DownlinkOrbit}
307310
- DownlinkStart eq {DownlinkStart}
308311
- DownlinkStop eq {DownlinkStop}
@@ -409,6 +412,7 @@ mti:
409412
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
410413
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
411414
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
415+
- Id eq {id}
412416
- DownlinkOrbit eq {DownlinkOrbit}
413417
- DownlinkStart eq {DownlinkStart}
414418
- DownlinkStop eq {DownlinkStop}
@@ -515,6 +519,7 @@ nsg:
515519
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
516520
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
517521
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
522+
- Id eq {id}
518523
- DownlinkOrbit eq {DownlinkOrbit}
519524
- DownlinkStart eq {DownlinkStart}
520525
- DownlinkStop eq {DownlinkStop}
@@ -621,6 +626,7 @@ sgs:
621626
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
622627
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
623628
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
629+
- Id eq {id}
624630
- DownlinkOrbit eq {DownlinkOrbit}
625631
- DownlinkStart eq {DownlinkStart}
626632
- DownlinkStop eq {DownlinkStop}
@@ -764,6 +770,7 @@ cadip_session:
764770
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
765771
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
766772
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
773+
- Id eq {id}
767774
- DownlinkOrbit eq {DownlinkOrbit}
768775
- DownlinkStart eq {DownlinkStart}
769776
- DownlinkStop eq {DownlinkStop}
@@ -926,6 +933,7 @@ ins_session:
926933
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
927934
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
928935
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
936+
- Id eq {id}
929937
- DownlinkOrbit eq {DownlinkOrbit}
930938
- DownlinkStart eq {DownlinkStart}
931939
- DownlinkStop eq {DownlinkStop}
@@ -1088,6 +1096,7 @@ mps_session:
10881096
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
10891097
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
10901098
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1099+
- Id eq {id}
10911100
- DownlinkOrbit eq {DownlinkOrbit}
10921101
- DownlinkStart eq {DownlinkStart}
10931102
- DownlinkStop eq {DownlinkStop}
@@ -1250,6 +1259,7 @@ mti_session:
12501259
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
12511260
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
12521261
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1262+
- Id eq {id}
12531263
- DownlinkOrbit eq {DownlinkOrbit}
12541264
- DownlinkStart eq {DownlinkStart}
12551265
- DownlinkStop eq {DownlinkStop}
@@ -1412,6 +1422,7 @@ nsg_session:
14121422
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
14131423
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
14141424
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1425+
- Id eq {id}
14151426
- DownlinkOrbit eq {DownlinkOrbit}
14161427
- DownlinkStart eq {DownlinkStart}
14171428
- DownlinkStop eq {DownlinkStop}
@@ -1574,6 +1585,7 @@ sgs_session:
15741585
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
15751586
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
15761587
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1588+
- Id eq {id}
15771589
- DownlinkOrbit eq {DownlinkOrbit}
15781590
- DownlinkStart eq {DownlinkStart}
15791591
- DownlinkStop eq {DownlinkStop}

0 commit comments

Comments
 (0)