fix using Path where string is needed

nansencenter · Dec 5, 2022 · b077245 · b077245
1 parent 5686f9b
commit b077245
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/geospaas_processing/converters/syntool/converter.py b/geospaas_processing/converters/syntool/converter.py
@@ -317,7 +317,7 @@ class CustomReaderSyntoolConverter(BasicSyntoolConverter):
             converter_type='roms_norkyst800',
             ingest_parameter_files=(
                 ParameterSelector(
-                    matches=lambda p: any(i in p for i in ('swt', 'salinity')),
+                    matches=lambda p: any(i in str(p) for i in ('swt', 'salinity')),
                     ingest_file='ingest_geotiff_3413_raster'),
                 ParameterSelector(
                     matches=lambda p: 'roms_norkyst800_current' in str(p),
@@ -341,7 +341,7 @@ class CustomReaderSyntoolConverter(BasicSyntoolConverter):
             converter_type='topaz_forecast',
             ingest_parameter_files=(
                 ParameterSelector(
-                    matches=lambda p: 'topaz_forecast_sea_surface_elevation' in p,
+                    matches=lambda p: 'topaz_forecast_sea_surface_elevation' in str(p),
                     ingest_file='ingest_geotiff_3413_raster'),
             ),),
         ParameterSelector(
@@ -350,10 +350,10 @@ class CustomReaderSyntoolConverter(BasicSyntoolConverter):
             converter_type='topaz_reanalysis',
             ingest_parameter_files=(
                 ParameterSelector(
-                    matches=lambda p: any(i in p for i in ('swt', 'salinity')),
+                    matches=lambda p: any(i in str(p) for i in ('swt', 'salinity')),
                     ingest_file='ingest_geotiff_3413_raster'),
                 ParameterSelector(
-                    matches=lambda p: 'current' in p,
+                    matches=lambda p: 'current' in str(p),
                     ingest_file='ingest_topaz_reanalysis_vector'),
             ),),
         ParameterSelector(
@@ -362,10 +362,10 @@ class CustomReaderSyntoolConverter(BasicSyntoolConverter):
             converter_type='topaz5_forecast_phy',
             ingest_parameter_files=(
                 ParameterSelector(
-                    matches=lambda p: any(i in p for i in ('swt', 'salinity')),
+                    matches=lambda p: any(i in str(p) for i in ('swt', 'salinity')),
                     ingest_file='ingest_geotiff_3413_raster'),
                 ParameterSelector(
-                    matches=lambda p: any(i in p for i in (
+                    matches=lambda p: any(i in str(p) for i in (
                         'current', 'sea_ice_velocity')),
                     ingest_file='ingest_topaz5_forecast_vector'),
             ),),
@@ -375,10 +375,10 @@ class CustomReaderSyntoolConverter(BasicSyntoolConverter):
             converter_type='topaz5_forecast_bgc',
             ingest_parameter_files=(
                 ParameterSelector(
-                    matches=lambda p: any(i in p for i in ('swt', 'salinity')),
+                    matches=lambda p: any(i in str(p) for i in ('chlorophyll', 'oxygen')),
                     ingest_file='ingest_geotiff_3413_raster'),
                 ParameterSelector(
-                    matches=lambda p: any(i in p for i in (
+                    matches=lambda p: any(i in str(p) for i in (
                         'current', 'sea_ice_velocity')),
                     ingest_file='ingest_topaz5_forecast_vector'),
             ),),