diff --git a/src/cso/cso_file.py b/src/cso/cso_file.py index 55b176416f937c855e348fcabf521a9a270ecc50..b1f2d854a3f54aad86b9ab85265ac8f06067da6c 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? diff --git a/src/cso/cso_s5p.py b/src/cso/cso_s5p.py index 1acfefb0c0fe38280a897f701d8830ef7b221333..602bdf3a3a5276f58b054ebbe3cdb8fb2891f190 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':: - .selection : (%{collection} == '03') and (%{processing} == 'RPRO') ; \\ - (%{collection} == '03') and (%{processing} == 'OFFL') + .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::