OAIPMH server / Fix base URL

geonetwork · Jan 9, 2024 · 17a700d · 17a700d
1 parent 4c4943e
commit 17a700d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/java/org/fao/geonet/kernel/oaipmh/OaiPmhDispatcher.java b/core/src/main/java/org/fao/geonet/kernel/oaipmh/OaiPmhDispatcher.java
@@ -113,7 +113,7 @@ private Element dispatchI(Element request, ServiceContext context) {
         SettingInfo si = context.getBean(SettingInfo.class);
 
         try {
-            url = si.getSiteUrl() + context.getBaseUrl() + "/" + Jeeves.Prefix.SERVICE + "/en/" + context.getService();
+            url = si.getSiteUrl() + context.getBaseUrl() + "/" + Jeeves.Prefix.SERVICE + "/" + context.getService();
             params = OaiPmhFactory.extractParams(request);
 
             AbstractRequest req = OaiPmhFactory.parse(context.getApplicationContext(), params);

diff --git a/core/src/main/java/org/fao/geonet/kernel/oaipmh/services/Identify.java b/core/src/main/java/org/fao/geonet/kernel/oaipmh/services/Identify.java
@@ -55,7 +55,7 @@ public AbstractResponse execute(AbstractRequest request, ServiceContext context)
         IdentifyResponse res = new IdentifyResponse();
         SettingInfo si = context.getBean(SettingInfo.class);
 
-        String baseUrl = si.getSiteUrl() + context.getBaseUrl() + "/" + Jeeves.Prefix.SERVICE + "/en/" + context.getService();
+        String baseUrl = si.getSiteUrl() + context.getBaseUrl() + "/" + Jeeves.Prefix.SERVICE + "/" + context.getService();
 
         res.setRepositoryName(si.getSiteName());
         res.setBaseUrl(baseUrl);

diff --git a/services/src/main/java/org/fao/geonet/api/oaipmh/OaiPmhApi.java b/services/src/main/java/org/fao/geonet/api/oaipmh/OaiPmhApi.java
@@ -39,7 +39,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Locale;
 
 @RequestMapping(value = {
     "/{portal}/api/oaipmh"
@@ -74,8 +73,9 @@ public Element dispatch(
         @RequestParam(required = false) final String resumptionToken,
         final HttpServletRequest request
     ) {
-        Locale locale = languageUtils.parseAcceptLanguage(request.getLocales());
-        ServiceContext serviceContext = ApiUtils.createServiceContext(request, locale.getISO3Country());
+        ServiceContext serviceContext = ApiUtils.createServiceContext(request);
+        // Set the service name, used in OaiPmhDispatcher to build the oaiphm endpoint URL
+        serviceContext.setService("api/oaipmh");
 
         Element params = new Element("params");
         if (StringUtils.isNotEmpty(verb)) {