hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Ilja Sidoroff
2016-09-13 09:54:58 +00:00
parent 08b691624c 560d280d9e
commit 174ac771b6
6 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/browse/ItemCounter.java
View File

@@ -49,7 +49,7 @@ public class ItemCounter
protected ConfigurationService configurationService;
/**
* Construct a new item counter which will use the give DSpace Context
* Construct a new item counter which will use the given DSpace Context
*
* @param context current context
* @throws ItemCountException if count error

2
dspace-api/src/main/java/org/dspace/submit/lookup/PubmedService.java
View File

@@ -76,7 +76,7 @@ public class PubmedService
if (StringUtils.isNotBlank(title))
{
query.append("((").append(title).append("[TI]) OR (");
// [TI] non funziona sempre, titolo di capitoli di libro
// [TI] does not always work, book chapter title
query.append("(").append(title).append("[book]))");
}
if (StringUtils.isNotBlank(author))

6
dspace-sword/src/main/java/org/dspace/sword/ItemCollectionGenerator.java
View File

@@ -32,11 +32,11 @@ public class ItemCollectionGenerator extends ATOMCollectionGenerator
}
/**
* Build the collection around the give DSpaceObject. If the object
* Build the collection around the given DSpaceObject. If the object
* is not an instance of a DSpace Item this method will throw an
* exception.
*
* @param dso the dso for which the collection should be build
* @param dso the dso for which the collection should be built
* @throws DSpaceSWORDException if the dso is not an instance of Item
*/
public Collection buildCollection(DSpaceObject dso)
@@ -95,7 +95,7 @@ public class ItemCollectionGenerator extends ATOMCollectionGenerator
scol.setAbstract(dcAbstract);
}
// do we suppot mediated deposit
// do we support mediated deposit
scol.setMediation(swordConfig.isMediated());
// the list of mime types that we accept, which we take from the

4
dspace-xmlui-mirage2/src/main/webapp/xsl/core/page-structure.xsl
View File

@@ -237,12 +237,12 @@
<!-- The following javascript removes the default text of empty text areas when they are focused on or submitted -->
<!-- There is also javascript to disable submitting a form when the 'enter' key is pressed. -->
<script>
//Clear default text of emty text areas on focus
//Clear default text of empty text areas on focus
function tFocus(element)
{
if (element.value == '<i18n:text>xmlui.dri2xhtml.default.textarea.value</i18n:text>'){element.value='';}
}
//Clear default text of emty text areas on submit
//Clear default text of empty text areas on submit
function tSubmit(form)
{
var defaultedElements = document.getElementsByTagName("textarea");

39
dspace/config/crosswalks/oai/xoai.xml
View File

@@ -16,7 +16,7 @@
<Contexts>
<Context baseurl="request" name="Default Context">
<!-- Restrict access to hidden items by default -->
<Filter ref="defaultFilter" />
<Filter ref="defaultFilter"/>
<Format ref="oaidc"/>
<Format ref="mets"/>
@@ -60,9 +60,9 @@
</Context>
<!--
OpenAIRE Guidelines 1.1:
OpenAIRE Guidelines 3.0:
- https://guidelines.openaire.eu/en/latest/
- https://guidelines.openaire.eu/
There is a limitation over the embargoedEndDate parameter:
@@ -79,7 +79,7 @@
<Format ref="oaidc"/>
<Format ref="mets"/>
<Description>
This context complies with OpenAIRE rules.
This contexts complies with OpenAIRE Guidelines for Literature Repositories v3.0.
</Description>
</Context>
</Contexts>
@@ -243,19 +243,23 @@
<LeftCondition>
<And>
<LeftCondition>
<Custom ref="titleExistsCondition"/>
<And>
<LeftCondition>
<Custom ref="titleExistsCondition"/>
</LeftCondition>
<RightCondition>
<Custom ref="authorExistsCondition"/>
</RightCondition>
</And>
</LeftCondition>
<RightCondition>
<Custom ref="authorExistsCondition"/>
<Custom ref="driverDocumentTypeCondition"/>
</RightCondition>
</And>
</LeftCondition>
<RightCondition>
<And>
<Or>
<LeftCondition>
<Custom ref="driverDocumentTypeCondition"/>
</LeftCondition>
<RightCondition>
<And>
<LeftCondition>
<Or>
@@ -268,11 +272,14 @@
</Or>
</LeftCondition>
<RightCondition>
<Custom ref="openaireRelationCondition"/>
<Custom ref="driverAccessCondition"/>
</RightCondition>
</And>
</LeftCondition>
<RightCondition>
<Custom ref="openaireRelationCondition"/>
</RightCondition>
</And>
</Or>
</RightCondition>
</And>
</Definition>
@@ -360,6 +367,7 @@
<string>annotation</string>
<string>contributionToPeriodical</string>
<string>patent</string>
<string>dataset</string>
<string>other</string>
</list>
</Configuration>
@@ -374,7 +382,6 @@
<string name="field">dc.rights</string>
<string name="operator">contains</string>
<list name="values">
<string>open access</string>
<string>openAccess</string>
</list>
</Configuration>
@@ -400,7 +407,7 @@
<Configuration>
<string name="field">dc.relation</string>
<string name="operator">starts_with</string>
<string name="value">info:eu-repo/grantAgreement/EC</string>
<string name="value">info:eu-repo/grantAgreement/</string>
</Configuration>
</CustomCondition>
</Filters>
@@ -412,8 +419,8 @@
<!-- Just an alias -->
</Set>
<Set id="openaireSet">
<Spec>ec_fundedresources</Spec>
<Name>EC_fundedresources set</Name>
<Spec>openaire</Spec>
<Name>OpenAIRE</Name>
<!-- Just an alias -->
</Set>
</Sets>

4
pom.xml
View File

@@ -1140,12 +1140,12 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.0</version>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
<version>2.0.0</version>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>