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

Fixes

Browse Source 
- Warnings
- https://jira.duraspace.org/browse/DS-1307 (partial)
- https://jira.duraspace.org/browse/DS-1300
- https://jira.duraspace.org/browse/DS-1309
This commit is contained in:
Lyncode
2012-10-16 00:04:33 +01:00
committed by lyncodev
parent 708b93ef6d
commit bb118de181
11 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceDatabaseItem.java
View File

@@ -11,25 +11,19 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.regex.Pattern;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.Item;
import org.dspace.xoai.util.MetadataNamePredicate;
import org.dspace.xoai.util.XOAICacheManager;
import org.dspace.xoai.util.XOAIDatabaseManager;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.lyncode.xoai.dataprovider.core.ItemMetadata;
import com.lyncode.xoai.dataprovider.core.ReferenceSet;
import com.lyncode.xoai.dataprovider.data.AbstractAbout;
import com.lyncode.xoai.dataprovider.exceptions.MetadataBindException;
import com.lyncode.xoai.dataprovider.xml.xoai.Element;
import com.lyncode.xoai.dataprovider.xml.xoai.Element.Field;
/**
*
@@ -103,15 +97,6 @@ public class DSpaceDatabaseItem extends DSpaceItem
return item.isWithdrawn();
}
private static Element getElement(List<Element> list, String name)
{
for (Element e : list)
if (name.equals(e.getName()))
return e;
return null;
}
private ItemMetadata metadata = null;
@Override

5
dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSet.java
View File

@@ -20,10 +20,9 @@ public class DSpaceSet extends Set {
private static final String DefaultName = "undefined";
public static String checkName(String name) {
if (name == null || name.trim().equals(""))
return DefaultName;
else
if (name != null && !name.trim().equals(""))
return name;
return DefaultName;
}
public static Set newDSpaceCommunitySet(String handle, String name) {

1
dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSolrItem.java
View File

@@ -35,6 +35,7 @@ public class DSpaceSolrItem extends DSpaceItem
private boolean deleted;
public DSpaceSolrItem (SolrDocument doc) {
log.debug("Creating OAI Item from Solr source");
unparsedMD = (String) doc.getFieldValue("item.compile");
handle = (String) doc.getFieldValue("item.handle");
lastMod = (Date) doc.getFieldValue("item.lastmodified");

1
dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceFilter.java
View File

@@ -10,7 +10,6 @@ package org.dspace.xoai.filter;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.dspace.core.Context;
import org.dspace.xoai.data.DSpaceDatabaseItem;
import org.dspace.xoai.data.DSpaceItem;
import com.lyncode.xoai.dataprovider.data.AbstractItemIdentifier;

1
dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceMetadataExistsFilter.java
View File

@@ -12,7 +12,6 @@ import java.sql.SQLException;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.dspace.core.Context;
import org.dspace.xoai.data.DSpaceDatabaseItem;
import org.dspace.xoai.data.DSpaceItem;
import org.dspace.xoai.exceptions.InvalidMetadataFieldException;
import org.dspace.xoai.util.MetadataFieldManager;

1
dspace-oai/src/main/java/org/dspace/xoai/filter/DateFromFilter.java
View File

@@ -11,7 +11,6 @@ import java.util.Date;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.dspace.core.Context;
import org.dspace.xoai.data.DSpaceDatabaseItem;
import org.dspace.xoai.data.DSpaceItem;
import org.dspace.xoai.util.DateUtils;

3
dspace-oai/src/main/java/org/dspace/xoai/filter/DateUntilFilter.java
View File

@@ -9,10 +9,9 @@ package org.dspace.xoai.filter;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.dspace.core.Context;
import org.dspace.xoai.data.DSpaceDatabaseItem;
import org.dspace.xoai.data.DSpaceItem;
/**

8
dspace-oai/src/main/java/org/dspace/xoai/filter/DspaceSetSpecFilter.java
View File

@@ -12,16 +12,10 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.dspace.core.Context;
import java.sql.SQLException;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.DSpaceObject;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.handle.HandleManager;
import org.dspace.xoai.data.DSpaceDatabaseItem;
import org.dspace.xoai.data.DSpaceItem;
import org.dspace.xoai.util.XOAIDatabaseManager;

2
dspace/config/crosswalks/oai/metadataFormats/didl.xsl
View File

@@ -31,7 +31,7 @@
</xsl:if>
<d:Item>
<xsl:attribute name="id">
<xsl:value-of select="translate(doc:metadata/doc:element[@name='others']/doc:field[@name='handle']/text(),'/','_')" />
<xsl:value-of select="concat('hdl_', translate(doc:metadata/doc:element[@name='others']/doc:field[@name='handle']/text(),'/','_'))" />
</xsl:attribute>
<d:Descriptor>
<d:Statement mimeType="application/xml; charset=utf-8">

2
dspace/config/crosswalks/oai/metadataFormats/oai_dc.xsl
View File

@@ -20,7 +20,7 @@
<xsl:template match="/">
<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
xmlns:dc="http://purl.org/dc/doc:elements/1.1/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
<xsl:for-each select="doc:metadata/doc:element[@name='dc']/doc:element[@name='title']/doc:element/doc:field[@name='value']">

2
dspace/config/crosswalks/oai/metadataFormats/ore.xsl
View File

@@ -19,7 +19,7 @@
<xsl:template match="/">
<atom:entry xmlns:atom="http://www.w3.org/2005/Atom"
xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:oreatom="http://www.openarchives.org/ore/atom/"
xmlns:dcterms="http://purl.org/dc/terms/">
xmlns:dcterms="http://purl.org/dc/terms/" xsi:schemaLocation="http://www.w3.org/2005/Atom http://www.kbcafe.com/rss/atom.xsd.xml">
<atom:id>
<xsl:value-of select="concat(doc:metadata/doc:element[@name='dc']/doc:element[@name='identifier']/doc:element[@name='uri']/doc:element/doc:field[@name='value']/text(), '/ore.xml')"></xsl:value-of>
</atom:id>