Merge pull request #458 from ufal/issue_457

Issue 457
ufal · Jan 4, 2016 · ba0de2a · ba0de2a
2 parents 9917a43 + e43f048
commit ba0de2a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java
@@ -91,7 +91,7 @@ private Element disseminateItem(Item item) throws CrosswalkException, IOExceptio
         String remSource = ConfigurationManager.getProperty("oai", "ore.authoritative.source");
     	if (remSource == null || remSource.equalsIgnoreCase("oai"))
         {
-            oaiUrl = ConfigurationManager.getProperty("lr", "lr.dspace.oai.url");
+            oaiUrl = ConfigurationManager.getProperty("oai", "dspace.oai.url");
         }
     	else if (remSource.equalsIgnoreCase("xmlui") || remSource.equalsIgnoreCase("manakin"))
         {

diff --git a/...cz/cuni/mff/ufal/dspace/app/xmlui/aspect/administrative/ControlPanelConfigurationTab.java b/...cz/cuni/mff/ufal/dspace/app/xmlui/aspect/administrative/ControlPanelConfigurationTab.java
@@ -45,7 +45,7 @@ public void addBody(Map objectModel, Division div) throws WingException {
 		dspace.addItem(Site.getSiteHandle());
 
 		dspace.addLabel("OAI url");
-		String oai_url = notempty(ConfigurationManager.getProperty("lr", "lr.dspace.oai.url"));
+		String oai_url = notempty(ConfigurationManager.getProperty("oai", "dspace.oai.url"));
 		dspace.addItemXref(oai_url, oai_url);
 
 		dspace.addLabel("Solr log url");

diff --git a/dspace-xmlui/src/main/webapp/themes/UFAL/lib/xsl/core/global-variables.xsl b/dspace-xmlui/src/main/webapp/themes/UFAL/lib/xsl/core/global-variables.xsl
@@ -52,7 +52,7 @@
 
 	<xsl:variable name="query-string" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='request'][@qualifier='queryString']" />
 
-	<xsl:variable name="oai-url" select="confman:getProperty('lr', 'lr.dspace.oai.url')" />
+	<xsl:variable name="oai-url" select="confman:getProperty('oai', 'dspace.oai.url')" />
 
 	<!-- dynamically select the static html file based on requested page name -->
     <xsl:variable name="static-page-name">

diff --git a/dspace/config/modules/lr.cfg b/dspace/config/modules/lr.cfg
@@ -142,9 +142,6 @@ lr.shibboleth.discofeed.url = ${lr.shibboleth.discofeed.url}
 
 lr.aai.url = ${lr.aai.url}
 
-# The base URL of the OAI webapp (do not include /request).
-lr.dspace.oai.url = ${dspace.baseUrl}/oai
-
 # page with info about harvesting the repository
 lr.harvester.info.url = ${harvesterInfo.url}
 

diff --git a/dspace/config/modules/oai.cfg b/dspace/config/modules/oai.cfg
@@ -98,7 +98,7 @@ harvester.unknownSchema = fail
 # format: [baseURI]/metadata/handle/[theHandle]/ore.xml
 # Default value is oai
 #ore.authoritative.source = oai
-dspace.oai.url = ${dspace.baseUrl}/oai
+dspace.oai.url = ${dspace.oai.url}
 
 # A harvest process will attempt to scan the metadata of the incoming items
 # (dc.identifier.uri field, to be exact) to see if it looks like a handle.

diff --git a/utilities/project_helpers/config/local.conf.dist b/utilities/project_helpers/config/local.conf.dist
@@ -32,6 +32,10 @@ dspace.hostname = ufal-point-dev.ms.mff.cuni.cz
 # !!! URL must NOT contain trailing slash !!!
 dspace.baseUrl = https://ufal-point-dev.ms.mff.cuni.cz/repository
 
+# OAI webapp url without context (eg. /request) use http
+# in theory ${dspace.baseUrl}/oai except for the http requirement
+dspace.oai.url = http://ufal-point-dev.ms.mff.cuni.cz/repository/oai
+
 # DSpace URL, usually ending with /xmlui
 # DSpace base URL.  Include port number etc., but NOT trailing slash
 dspace.url = ${dspace.baseUrl}/xmlui