From 1b3008e654118eee3ce8372bfdf9e6db3317768a Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Mon, 23 Mar 2020 18:05:02 +0100
Subject: [PATCH] Fixed rules and test data

---
 .../Thredds/Thredds_METADATA::COLLECTION.csv     | 16 +++++++++++++++-
 .../Thredds/Thredds_METADATA::COLLECTION.json    |  2 +-
 .../rules/Thredds/Thredds_METADATA::OTHER.csv    |  2 +-
 .../Thredds/Thredds_PROTOCOL::COLLECTION.csv     | 16 +++++++++++++++-
 .../Thredds/Thredds_PROTOCOL::COLLECTION.json    |  2 +-
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.csv b/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.csv
index 39b42b7..12efb2e 100644
--- a/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.csv
+++ b/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.csv
@@ -39501,4 +39501,18 @@ SDI,Thredds,/dodsC/public/netcdf/myCatalog/oscar_vel2011_180.nc.html
 SDI,Thredds,/dodsC/public/netcdf/myCatalog/oscar_vel_1992-2017_180.nc.html
 SDI,Thredds,/dodsC/public/netcdf/oscar_vel/oscar_vel1999_2015.nc.dds
 SDI,Thredds,/dodsC/public/netcdf/oscar_vel/oscar_vel1999_2015.nc.dods
-SDI,Thredds,/dodsC/public/netcdf/oscar_vel/oscar_vel1999_2015.nc.html
\ No newline at end of file
+SDI,Thredds,/dodsC/public/netcdf/oscar_vel/oscar_vel1999_2015.nc.html
+SDI,Thredds,/dodsC/public/netcdf/Test%20by%20Francesco/geoserver-GetCoverage.image.nc.html
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20Francesco/apparent_oxygen_utilization_monthly_5deg_ENVIRONMENT_BIOTA_.nc.html
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20francesco/apparent_oxygen_utilization_monthly_5deg_ENVIRONMENT_BIOTA_.nc.html
+SDI,Thredds,/dodsC/public/netcdf/Test%20by%20Francesco/apparent_oxygen_utilization_monthly_5deg_ENVIRONMENT_BIOTA_.nc.html
+SDI,Thredds,/dodsC/public/netcdf/Second%20Run/oscar_vel_1992-1993_180.nc.html
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20francesco/HadCRUT.4.2.0.0.median_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc.html
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20Francesco/dissolved_oxygen_annual_5deg_ENVIRONMENT_BIOTA_.nc.html
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20Francesco/HadCRUT.4.2.0.0.median_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc.html
+SDI,Thredds,/dodsC/public/netcdf/Test%20by%20Francesco/HadCRUT.4.2.0.0.median_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc.html
+SDI,Thredds,/dodsC/public/netcdf/Test%20by%20Francesco/dissolved_oxygen_annual_5deg_ENVIRONMENT_BIOTA_.nc.html
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20francesco/dissolved_oxygen_annual_5deg_ENVIRONMENT_BIOTA_.nc.html
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20Francesco/geoserver-GetCoverage.image.nc.html
+SDI,Thredds,/dodsC/public/netcdf/Second%20Run/oscar_vel2011_180.nc.html
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20francesco/geoserver-GetCoverage.image.nc.html
\ No newline at end of file
diff --git a/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.json b/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.json
index 2c97102..dc9c942 100644
--- a/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.json
+++ b/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.json
@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "SDI",
 		"serviceNameRegex": "Thredds",
-		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_-]*(?<!(..\\.nc)))(\/){1}.*(?<!(..\\.nc|.\\.asc|\\.tiff))$"
+		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*(?<!(..\\.nc)))(\/){1}.*(?<!(..\\.nc|.\\.asc|\\.tiff))$"
 	},
 	"replace": {
 		"serviceClass": "SDI",
diff --git a/src/test/resources/rules/Thredds/Thredds_METADATA::OTHER.csv b/src/test/resources/rules/Thredds/Thredds_METADATA::OTHER.csv
index 6967ff9..49fc7fc 100644
--- a/src/test/resources/rules/Thredds/Thredds_METADATA::OTHER.csv
+++ b/src/test/resources/rules/Thredds/Thredds_METADATA::OTHER.csv
@@ -18930,4 +18930,4 @@ SDI,Thredds,/wms/public/netcdf/salinity_monthly_1deg_ENVIRONMENT_OCEANS_.nc/wfs
 SDI,Thredds,/wms/public/netcdf/salinity_seasonal_1deg_ENVIRONMENT_OCEANS_.nc/wfs
 SDI,Thredds,/wms/public/netcdf/temperature_annual_1deg_ENVIRONMENT_OCEANS_.nc/wfs
 SDI,Thredds,/wms/public/netcdf/temperature_monthly_1deg_ENVIRONMENT_OCEANS_.nc/wfs
-SDI,Thredds,/wms/public/netcdf/temperature_seasonal_1deg_ENVIRONMENT_OCEANS_.nc/wfs
+SDI,Thredds,/wms/public/netcdf/temperature_seasonal_1deg_ENVIRONMENT_OCEANS_.nc/wfs
\ No newline at end of file
diff --git a/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.csv b/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.csv
index 510a5b1..be8b2b8 100644
--- a/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.csv
+++ b/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.csv
@@ -803,4 +803,18 @@ SDI,Thredds,/wms/public/netcdf/TUNA_ATLAS/west_pacific_ocean_catch_5deg_1m_1950_
 SDI,Thredds,/wms/public/netcdf/TUNA_ATLAS/west_pacific_ocean_catch_5deg_1m_1950_06_01_2016_01_01_tunaatlasIRD_level2.nc
 SDI,Thredds,/wms/public/netcdf/myCatalog/oscar_vel2011_180.nc
 SDI,Thredds,/wms/public/netcdf/myCatalog/oscar_vel_1992-2017_180.nc
-SDI,Thredds,/wms/public/netcdf/oscar_vel/oscar_vel1999_2015.nc
\ No newline at end of file
+SDI,Thredds,/wms/public/netcdf/oscar_vel/oscar_vel1999_2015.nc
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20Francesco/HadCRUT.4.2.0.0.median_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20francesco/dissolved_oxygen_annual_5deg_ENVIRONMENT_BIOTA_.nc
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20francesco/geoserver-GetCoverage.image.nc
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20Francesco/apparent_oxygen_utilization_monthly_5deg_ENVIRONMENT_BIOTA_.nc
+SDI,Thredds,/dodsC/public/netcdf/Test%20by%20Francesco/geoserver-GetCoverage.image.nc
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20Francesco/dissolved_oxygen_annual_5deg_ENVIRONMENT_BIOTA_.nc
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20Francesco/geoserver-GetCoverage.image.nc
+SDI,Thredds,/dodsC/public/netcdf/Test%20by%20Francesco/HadCRUT.4.2.0.0.median_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20francesco/apparent_oxygen_utilization_monthly_5deg_ENVIRONMENT_BIOTA_.nc
+SDI,Thredds,/dodsC/public/netcdf/Test%20by%20Francesco/apparent_oxygen_utilization_monthly_5deg_ENVIRONMENT_BIOTA_.nc
+SDI,Thredds,/dodsC/public/netcdf/test%20by%20francesco/HadCRUT.4.2.0.0.median_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc
+SDI,Thredds,/dodsC/public/netcdf/Test%20by%20Francesco/dissolved_oxygen_annual_5deg_ENVIRONMENT_BIOTA_.nc
+SDI,Thredds,/dodsC/public/netcdf/Second%20Run/oscar_vel2011_180.nc
+SDI,Thredds,/dodsC/public/netcdf/Second%20Run/oscar_vel_1992-1993_180.nc
\ No newline at end of file
diff --git a/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.json b/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.json
index 7ff87ba..95185c2 100644
--- a/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.json
+++ b/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.json
@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "SDI",
 		"serviceNameRegex": "Thredds",
-		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_-]*)(\/){1}(.*\\.(nc|asc|tiff))$"
+		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*)(\/){1}(.*\\.(nc|asc|tiff))$"
 	},
 	"replace": {
 		"serviceClass": "SDI",