Merge branch 'feature/18053' of gitea@code-repo.d4science.org:gCubeSystem/accounting-lib.git into feature/18053

This commit is contained in:
Luca Frosini 2021-04-13 21:26:47 +02:00
commit d516325660
2 changed files with 5 additions and 5 deletions

View File

@ -1170,7 +1170,7 @@
"match": { "match": {
"serviceClassRegex": "SDI|DataAnalysis", "serviceClassRegex": "SDI|DataAnalysis",
"serviceNameRegex": "Thredds", "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}(thredds\/){0,1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*(?<!(..\\.nc)))(\/){1}.*(?<!(..\\.nc|.\\.asc|\\.tiff))$"
}, },
"replace": { "replace": {
"serviceClass": "SDI", "serviceClass": "SDI",
@ -1181,7 +1181,7 @@
"match": { "match": {
"serviceClassRegex": "SDI|DataAnalysis", "serviceClassRegex": "SDI|DataAnalysis",
"serviceNameRegex": "Thredds", "serviceNameRegex": "Thredds",
"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}[^\/]*((?<!(..\\.nc|.\\.asc|\\.tiff))|\/wfs)$" "calledMethodRegex": "^(\/){1}(thredds\/){0,1}(?<Protocol>[a-zA-Z0-9]*){1}(\/grid){0,1}(\/public\/netcdf\/){1}[^\/]*((?<!(..\\.nc|.\\.asc|\\.tiff))|((\/wfs)|(\/(pointD|d)ataset\\.(html|xml))))$"
}, },
"replace": { "replace": {
"serviceClass": "SDI", "serviceClass": "SDI",
@ -1203,7 +1203,7 @@
"match": { "match": {
"serviceClassRegex": "SDI|DataAnalysis", "serviceClassRegex": "SDI|DataAnalysis",
"serviceNameRegex": "Thredds", "serviceNameRegex": "Thredds",
"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*)(\/){1}(.*\\.(nc|asc|tiff))$" "calledMethodRegex": "^(\/){1}(thredds\/){0,1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*)(\/){1}(.*\\.(nc|asc|tiff))$"
}, },
"replace": { "replace": {
"serviceClass": "SDI", "serviceClass": "SDI",
@ -1214,7 +1214,7 @@
"match": { "match": {
"serviceClassRegex": "SDI|DataAnalysis", "serviceClassRegex": "SDI|DataAnalysis",
"serviceNameRegex": "Thredds", "serviceNameRegex": "Thredds",
"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}[^\/]*(\\.(nc|asc|tiff))$" "calledMethodRegex": "^(\/){1}(thredds\/){0,1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}[^\/]*(\\.(nc|asc|tiff))$"
}, },
"replace": { "replace": {
"serviceClass": "SDI", "serviceClass": "SDI",

File diff suppressed because one or more lines are too long