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

Merge pull request #798 from antoine-atmire/DS-2330

Browse Source 
DS-2330 bug fix: lost authors when using ORCID column
This commit is contained in:
Hardy Pottinger
2014-12-12 14:49:44 -06:00
parent 2b1f27a84e 53d387fed2
commit c417798a79
3 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java
View File

@@ -7,6 +7,7 @@
*/ */
package org.dspace.app.bulkedit; package org.dspace.app.bulkedit;
import org.apache.commons.lang3.StringUtils;
import org.dspace.authority.AuthorityValue; import org.dspace.authority.AuthorityValue;
import org.dspace.app.bulkedit.DSpaceCSVLine; import org.dspace.app.bulkedit.DSpaceCSVLine;
import org.dspace.app.bulkedit.MetadataImport; import org.dspace.app.bulkedit.MetadataImport;
@@ -14,6 +15,7 @@ import org.dspace.app.bulkedit.MetadataImportInvalidHeadingException;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.*; import org.dspace.content.*;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.authority.Choices;
import org.dspace.core.ConfigurationManager; import org.dspace.core.ConfigurationManager;
import org.dspace.core.Context; import org.dspace.core.Context;
@@ -185,7 +187,7 @@ public class DSpaceCSV implements Serializable
StringBuilder lineBuilder = new StringBuilder(); StringBuilder lineBuilder = new StringBuilder();
String lineRead; String lineRead;
while ((lineRead = input.readLine()) != null) while (StringUtils.isNotBlank(lineRead = input.readLine()))
{ {
if (lineBuilder.length() > 0) { if (lineBuilder.length() > 0) {
// Already have a previously read value - add this line // Already have a previously read value - add this line
@@ -449,7 +451,7 @@ public class DSpaceCSV implements Serializable
String mdValue = value.value; String mdValue = value.value;
if (value.authority != null && !"".equals(value.authority)) if (value.authority != null && !"".equals(value.authority))
{ {
mdValue += authoritySeparator + value.authority + authoritySeparator + value.confidence; mdValue += authoritySeparator + value.authority + authoritySeparator + (value.confidence != -1 ? value.confidence : Choices.CF_ACCEPTED);
} }
line.add(key, mdValue); line.add(key, mdValue);
if (!headings.contains(key)) if (!headings.contains(key))
@@ -610,8 +612,9 @@ public class DSpaceCSV implements Serializable
// Create the headings line // Create the headings line
String[] csvLines = new String[counter + 1]; String[] csvLines = new String[counter + 1];
csvLines[0] = "id" + fieldSeparator + "collection"; csvLines[0] = "id" + fieldSeparator + "collection";
Collections.sort(headings); List<String> headingsCopy = new ArrayList<String>(headings);
for (String value : headings) Collections.sort(headingsCopy);
for (String value : headingsCopy)
{ {
csvLines[0] = csvLines[0] + fieldSeparator + value; csvLines[0] = csvLines[0] + fieldSeparator + value;
} }
@@ -620,7 +623,7 @@ public class DSpaceCSV implements Serializable
int c = 1; int c = 1;
while (i.hasNext()) while (i.hasNext())
{ {
csvLines[c++] = i.next().toCSV(headings); csvLines[c++] = i.next().toCSV(headingsCopy);
} }
return csvLines; return csvLines;

37
dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSVLine.java
View File

@@ -7,12 +7,10 @@
*/ */
package org.dspace.app.bulkedit; package org.dspace.app.bulkedit;
import org.dspace.authority.AuthorityValue;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
/** /**
* Utility class to store a line from a CSV file * Utility class to store a line from a CSV file
@@ -21,12 +19,35 @@ import java.util.Set;
*/ */
public class DSpaceCSVLine implements Serializable public class DSpaceCSVLine implements Serializable
{ {
/** The item id of the item represented by this line. -1 is for a new item */ /** The item id of the item represented by this line. -1 is for a new item */
private int id; private int id;
/** The elements in this line in a hashtable, keyed by the metadata type */ /** The elements in this line in a hashtable, keyed by the metadata type */
private Map<String, ArrayList> items; private Map<String, ArrayList> items;
/** ensuring that the order-sensible columns of the csv are processed in the correct order */
private final Comparator<? super String> headerComparator = new Comparator<String>() {
@Override
public int compare(String md1, String md2) {
// The metadata coming from an external source should be processed after the others
AuthorityValue source1 = MetadataImport.getAuthorityValueType(md1);
AuthorityValue source2 = MetadataImport.getAuthorityValueType(md2);
int compare;
if (source1 == null && source2 != null) {
compare = -1;
}
else if (source1 != null && source2 == null) {
compare = 1;
} else {
// the order of the rest does not matter
compare = md1.compareTo(md2);
}
return compare;
}
};
/** /**
* Create a new CSV line * Create a new CSV line
* *
@@ -36,7 +57,8 @@ public class DSpaceCSVLine implements Serializable
{ {
// Store the ID + separator, and initialise the hashtable // Store the ID + separator, and initialise the hashtable
this.id = itemId; this.id = itemId;
items = new HashMap<String, ArrayList>(); items = new TreeMap<String, ArrayList>(headerComparator);
// this.items = new HashMap<String, ArrayList>();
} }
/** /**
@@ -46,7 +68,8 @@ public class DSpaceCSVLine implements Serializable
{ {
// Set the ID to be -1, and initialise the hashtable // Set the ID to be -1, and initialise the hashtable
this.id = -1; this.id = -1;
this.items = new HashMap<String, ArrayList>(); this.items = new TreeMap<String, ArrayList>(headerComparator);
// this.items = new HashMap<String, ArrayList>();
} }
/** /**

50
dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
View File

@@ -166,7 +166,7 @@ public class MetadataImport
} }
// Compare // Compare
compare(item, fromCSV, change, md, whatHasChanged); compare(item, fromCSV, change, md, whatHasChanged, line);
} }
} }
@@ -412,11 +412,12 @@ public class MetadataImport
* @param md The element to compare * @param md The element to compare
* @param changes The changes object to populate * @param changes The changes object to populate
* *
* @param line
* @throws SQLException if there is a problem accessing a Collection from the database, from its handle * @throws SQLException if there is a problem accessing a Collection from the database, from its handle
* @throws AuthorizeException if there is an authorization problem with permissions * @throws AuthorizeException if there is an authorization problem with permissions
*/ */
private void compare(Item item, String[] fromCSV, boolean change, private void compare(Item item, String[] fromCSV, boolean change,
String md, BulkEditChange changes) throws SQLException, AuthorizeException String md, BulkEditChange changes, DSpaceCSVLine line) throws SQLException, AuthorizeException
{ {
// Log what metadata element we're looking at // Log what metadata element we're looking at
String all = ""; String all = "";
@@ -473,25 +474,25 @@ public class MetadataImport
",looking_for_element=" + element + ",looking_for_element=" + element +
",looking_for_qualifier=" + qualifier + ",looking_for_qualifier=" + qualifier +
",looking_for_language=" + language)); ",looking_for_language=" + language));
Metadatum[] current = item.getMetadata(schema, element, qualifier, language); String[] dcvalues = new String[0];
if(fromAuthority==null) {
String[] dcvalues = new String[current.length]; Metadatum[] current = item.getMetadata(schema, element, qualifier, language);
int i = 0; dcvalues = new String[current.length];
for (Metadatum dcv : current) int i = 0;
{ for (Metadatum dcv : current) {
if (dcv.authority == null || !isAuthorityControlledField(md)) if (dcv.authority == null || !isAuthorityControlledField(md)) {
{ dcvalues[i] = dcv.value;
dcvalues[i] = dcv.value; } else {
dcvalues[i] = dcv.value + DSpaceCSV.authoritySeparator + dcv.authority;
dcvalues[i] += DSpaceCSV.authoritySeparator + (dcv.confidence != -1 ? dcv.confidence : Choices.CF_ACCEPTED);
}
i++;
log.debug(LogManager.getHeader(c, "metadata_import",
"item_id=" + item.getID() + ",fromCSV=" + all +
",found=" + dcv.value));
} }
else }else{
{ dcvalues = line.get(md).toArray(new String[line.get(md).size()]);
dcvalues[i] = dcv.value + DSpaceCSV.authoritySeparator + dcv.authority;
dcvalues[i] += DSpaceCSV.authoritySeparator + (dcv.confidence != -1 ? dcv.confidence : Choices.CF_ACCEPTED);
}
i++;
log.debug(LogManager.getHeader(c, "metadata_import",
"item_id=" + item.getID() + ",fromCSV=" + all +
",found=" + dcv.value));
} }
// Compare from current->csv // Compare from current->csv
@@ -530,7 +531,9 @@ public class MetadataImport
dcv.confidence = (parts.length > 2 ? Integer.valueOf(parts[2]) : Choices.CF_ACCEPTED); dcv.confidence = (parts.length > 2 ? Integer.valueOf(parts[2]) : Choices.CF_ACCEPTED);
} }
if ((value != null) && (!"".equals(value)) && (!contains(value, fromCSV))) if ((value != null) && (!"".equals(value)) && (!contains(value, fromCSV)) && fromAuthority==null)
// fromAuthority==null: with the current implementation metadata values from external authority sources can only be used to add metadata, not to change or remove them
// because e.g. an author that is not in the column "ORCID:dc.contributor.author" could still be in the column "dc.contributor.author" so don't remove it
{ {
// Remove it // Remove it
log.debug(LogManager.getHeader(c, "metadata_import", log.debug(LogManager.getHeader(c, "metadata_import",
@@ -862,7 +865,8 @@ public class MetadataImport
} }
// look up the value and authority in solr // look up the value and authority in solr
List<AuthorityValue> byValue = authorityValueFinder.findByValue(c, schema, element, qualifier, value); AuthorityValue example = fromAuthority.newInstance(value);
List<AuthorityValue> byValue = authorityValueFinder.findByValue(c, schema, element, qualifier, example.getValue());
AuthorityValue authorityValue = null; AuthorityValue authorityValue = null;
if (byValue.isEmpty()) { if (byValue.isEmpty()) {
String toGenerate = fromAuthority.generateString() + value; String toGenerate = fromAuthority.generateString() + value;
@@ -1167,6 +1171,8 @@ public class MetadataImport
{ {
int pos = md.indexOf("["); int pos = md.indexOf("[");
String mdf = (pos > -1 ? md.substring(0, pos) : md); String mdf = (pos > -1 ? md.substring(0, pos) : md);
pos = md.indexOf(":");
mdf = (pos > -1 ? md.substring(pos+1) : md);
return authorityControlled.contains(mdf); return authorityControlled.contains(mdf);
} }