diff --git a/src/main/java/org/gcube/datatransfer/resolver/gis/GeonetworkServiceInterface.java b/src/main/java/org/gcube/datatransfer/resolver/gis/GeonetworkServiceInterface.java index 2c5a9aa..ea9a9c9 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/gis/GeonetworkServiceInterface.java +++ b/src/main/java/org/gcube/datatransfer/resolver/gis/GeonetworkServiceInterface.java @@ -26,7 +26,7 @@ public interface GeonetworkServiceInterface { /** - * Gets the geonetwork instance. + * Gets the geonetwork instance with authenticate = false and LoginLevel = null * * @return the geonetwork instance * @throws Exception the exception diff --git a/src/main/java/org/gcube/datatransfer/resolver/gis/geonetwork/GeonetworkResolver.java b/src/main/java/org/gcube/datatransfer/resolver/gis/geonetwork/GeonetworkResolver.java index e2e4465..833f3bd 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/gis/geonetwork/GeonetworkResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/gis/geonetwork/GeonetworkResolver.java @@ -137,13 +137,17 @@ public class GeonetworkResolver extends HttpServlet{ logger.info("SCOPE: " + scopeValue +", Query String: " + req.getQueryString()); try { - ServerParameters geonetworkParams = getGeonetworkCachedServerParameters(scopeValue); +// ServerParameters geonetworkParams = getGeonetworkCachedServerParameters(scopeValue); + GeonetworkServiceInterface gntwAccess = new GeonetworkAccessParameter(scopeValue, null); + GeonetworkInstance gnInstance = gntwAccess.getGeonetworkInstance(); HTTPCallsUtils httpUtils = new HTTPCallsUtils(); + Configuration config = gnInstance.getGeonetworkPublisher().getConfiguration(); + String geonetworkUrl = config.getGeoNetworkEndpoint(); // boolean authorized = GNAuthentication.login(httpUtils, geonetworkParams.getUrl(), geonetworkParams.getUser(), geonetworkParams.getPassword()); // logger.trace("Authorized on "+geonetworkParams +" ? "+authorized); String newQueryString = purgeScopeFromQueryString(scopeValue, req.getQueryString()); logger.trace("Purged query string from "+scopeValue+" is: "+newQueryString); - String baseURL = remainValue==null ||remainValue.isEmpty()?geonetworkParams.getUrl()+"/"+CSW_SERVER:geonetworkParams.getUrl()+"/"+CSW_SERVER+remainValue; + String baseURL = remainValue==null ||remainValue.isEmpty()?geonetworkUrl+"/"+CSW_SERVER:geonetworkUrl+"/"+CSW_SERVER+remainValue; logger.trace("New base URL "+baseURL); newQueryString = purgeRemainFromQueryString(remainValue, newQueryString); logger.trace("Purged query string from "+remainValue+" is: "+newQueryString);