Merge pull request #17 from metno/v2.0.0

ferrighi · web-flow · commit beadc0080b31 · 2020-10-19T09:57:12.000+02:00
V2.0.0
diff --git a/metsis/metsis_qsearch/metsis_qsearch.utils.inc b/metsis/metsis_qsearch/metsis_qsearch.utils.inc
@@ -464,16 +464,16 @@ function adc_get_chosen_dates($form_state) {
   $q = "";
   if (!empty($form_state['values']['finished_after']) && empty($form_state['values']['finished_before'])) {
     $finished_after = $form_state['values']['finished_after'];
-    $q = "mmd_temporal_extent_start_date:[" . msb_get_iso8601_date_time_zone($finished_after) . " TO *]";
+    $q = "mmd_temporal_extent_end_date:[" . msb_get_iso8601_date_time_zone($finished_after) . " TO *]";
   }
   if (empty($form_state['values']['finished_after']) && !empty($form_state['values']['finished_before'])) {
     $finished_before = $form_state['values']['finished_before'];
-    $q = "mmd_temporal_extent_end_date:[* TO " . msb_get_iso8601_date_time_zone($finished_before) . "]";
+    $q = "mmd_temporal_extent_start_date:[* TO " . msb_get_iso8601_date_time_zone($finished_before) . "]";
   }
   if (!empty($form_state['values']['finished_after']) && !empty($form_state['values']['finished_before'])) {
     $finished_after = $form_state['values']['finished_after'];
     $finished_before = $form_state['values']['finished_before'];
-    $q = "mmd_temporal_extent_start_date:[" . msb_get_iso8601_date_time_zone($finished_after) . " TO *]" . " AND " . "mmd_temporal_extent_end_date:[* TO " . msb_get_iso8601_date_time_zone($finished_before) . "]";
+    $q = "mmd_temporal_extent_end_date:[" . msb_get_iso8601_date_time_zone($finished_after) . " TO *]" . " AND " . "mmd_temporal_extent_start_date:[* TO " . msb_get_iso8601_date_time_zone($finished_before) . "]";
   }
   return $q;
 }

Original file line number	Diff line number	Diff line change
`@@ -464,16 +464,16 @@ function adc_get_chosen_dates($form_state) {`
`464`	`464`	`$q = "";`
`465`	`465`	`if (!empty($form_state['values']['finished_after']) && empty($form_state['values']['finished_before'])) {`
`466`	`466`	`$finished_after = $form_state['values']['finished_after'];`
`467`		`- $q = "mmd_temporal_extent_start_date:[" . msb_get_iso8601_date_time_zone($finished_after) . " TO *]";`
	`467`	`+ $q = "mmd_temporal_extent_end_date:[" . msb_get_iso8601_date_time_zone($finished_after) . " TO *]";`
`468`	`468`	`}`
`469`	`469`	`if (empty($form_state['values']['finished_after']) && !empty($form_state['values']['finished_before'])) {`
`470`	`470`	`$finished_before = $form_state['values']['finished_before'];`
`471`		`- $q = "mmd_temporal_extent_end_date:[* TO " . msb_get_iso8601_date_time_zone($finished_before) . "]";`
	`471`	`+ $q = "mmd_temporal_extent_start_date:[* TO " . msb_get_iso8601_date_time_zone($finished_before) . "]";`
`472`	`472`	`}`
`473`	`473`	`if (!empty($form_state['values']['finished_after']) && !empty($form_state['values']['finished_before'])) {`
`474`	`474`	`$finished_after = $form_state['values']['finished_after'];`
`475`	`475`	`$finished_before = $form_state['values']['finished_before'];`
`476`		`- $q = "mmd_temporal_extent_start_date:[" . msb_get_iso8601_date_time_zone($finished_after) . " TO ]" . " AND " . "mmd_temporal_extent_end_date:[ TO " . msb_get_iso8601_date_time_zone($finished_before) . "]";`
	`476`	`+ $q = "mmd_temporal_extent_end_date:[" . msb_get_iso8601_date_time_zone($finished_after) . " TO ]" . " AND " . "mmd_temporal_extent_start_date:[ TO " . msb_get_iso8601_date_time_zone($finished_before) . "]";`
`477`	`477`	`}`
`478`	`478`	`return $q;`
`479`	`479`	`}`