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

Fix rebase, since mapOut is a static

Browse Source
This commit is contained in:
Peter Dietz
2014-10-20 17:55:16 -04:00
parent 12e36fa8bd
commit d1a540a2f1
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
View File

@@ -43,17 +43,8 @@ import org.apache.xpath.XPathAPI;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.AuthorizeManager; import org.dspace.authorize.AuthorizeManager;
import org.dspace.authorize.ResourcePolicy; import org.dspace.authorize.ResourcePolicy;
import org.dspace.content.Bitstream; import org.dspace.content.*;
import org.dspace.content.BitstreamFormat;
import org.dspace.content.Bundle;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.FormatIdentifier;
import org.dspace.content.InstallItem;
import org.dspace.content.Item;
import org.dspace.content.ItemIterator;
import org.dspace.content.MetadataField;
import org.dspace.content.MetadataSchema;
import org.dspace.content.WorkspaceItem;
import org.dspace.core.ConfigurationManager; import org.dspace.core.ConfigurationManager;
import org.dspace.core.Constants; import org.dspace.core.Constants;
import org.dspace.core.Context; import org.dspace.core.Context;
@@ -106,6 +97,8 @@ public class ItemImport
private static boolean template = false; private static boolean template = false;
private static PrintWriter mapOut = null;
private static final String tempWorkDir = ConfigurationManager.getProperty("org.dspace.app.batchitemimport.work.dir"); private static final String tempWorkDir = ConfigurationManager.getProperty("org.dspace.app.batchitemimport.work.dir");
static { static {
@@ -668,7 +661,6 @@ public class ItemImport
{ {
// create the mapfile // create the mapfile
File outFile = null; File outFile = null;
PrintWriter mapOut = null;
try { try {
Map<String, String> skipItems = new HashMap<String, String>(); // set of items to skip if in 'resume' Map<String, String> skipItems = new HashMap<String, String>(); // set of items to skip if in 'resume'
@@ -677,10 +669,6 @@ public class ItemImport
System.out.println("Adding items from directory: " + sourceDir); System.out.println("Adding items from directory: " + sourceDir);
System.out.println("Generating mapfile: " + mapFile); System.out.println("Generating mapfile: " + mapFile);
// create the mapfile
File outFile = null;
PrintWriter mapOut = null;
boolean directoryFileCollections = false; boolean directoryFileCollections = false;
if (mycollections == null) if (mycollections == null)
{ {