From 9c2d23483e147e8ea7eb579cd4772709c3d0cdc0 Mon Sep 17 00:00:00 2001
From: Arjo Segers <Arjo.Segers@met.no>
Date: Fri, 10 Oct 2025 13:33:21 +0200
Subject: [PATCH 1/2] Fixed record selection.

---
 src/cso/cso_file.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cso/cso_file.py b/src/cso/cso_file.py
index 55b1764..b1f2d85 100644
--- a/src/cso/cso_file.py
+++ b/src/cso/cso_file.py
@@ -55,6 +55,9 @@
 # 2025-09, Arjo Segers
 #   Improved speed of CSO_Listing.Selection method.
 #
+# 2025-10, Arjo Segers
+#   Replace ' and ' by ' & ' when selecting records.
+#
 
 ########################################################################
 ###
@@ -1661,6 +1664,8 @@ class CSO_Listing(object):
                 # endfor
                 # testing ...
                 logging.info(f"{indent}selection `{selection}` ...")
+                # adhoc: replace some operators that are not allowded anymore ...
+                selection = selection.replace( " and ", " & " )
                 # evaluate:
                 xdf = df[ eval(selection) ]
                 # any?
-- 
GitLab


From dfbce942b3ac5d92a751317c6bef3f220f2f061d Mon Sep 17 00:00:00 2001
From: Arjo Segers <Arjo.Segers@met.no>
Date: Fri, 10 Oct 2025 13:33:39 +0200
Subject: [PATCH 2/2] Commented debug statement.

---
 src/cso/cso_s5p.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cso/cso_s5p.py b/src/cso/cso_s5p.py
index 1acfefb..602bdf3 100644
--- a/src/cso/cso_s5p.py
+++ b/src/cso/cso_s5p.py
@@ -2860,11 +2860,11 @@ class CSO_S5p_Convert(utopya.UtopyaRc):
             # info ...
             logging.info(indent + '  orbit "%s" ...' % orbit)
 
-            # TESTING ..
-            if orbit != "21861":
-                logging.warning(f"{indent}    skip!")
-                continue
-            #endif
+            ## TESTING ..
+            #if orbit != "21861":
+            #    logging.warning(f"{indent}    skip!")
+            #    continue
+            ##endif
 
             # select single orbit matching expression:
             odf = xlst.Select(
@@ -3226,8 +3226,8 @@ class CSO_S5p_Download(utopya.UtopyaRc):
     The expressions should include templates '%{header}' for the column values.
     Example to select files from collection '03', preferably from processing 'RPRO' but otherwise from 'OFFL'::
 
-        <rcbase>.selection           :  (%{collection} == '03') and (%{processing} == 'RPRO') ; \\
-                                        (%{collection} == '03') and (%{processing} == 'OFFL')
+        <rcbase>.selection           :  (%{collection} == '03') & (%{processing} == 'RPRO') ; \\
+                                        (%{collection} == '03') & (%{processing} == 'OFFL')
 
     Sometimes a file cannot be converted, for example because it is corrupted or could not be downloaded at all.
     Specify an (optional) blacklist::
-- 
GitLab