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

[DS-161] Bulk metadata editing - remove debug line, and make use of escaped field separator when splitting strings

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@3983 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Stuart Lewis
2009-06-30 02:27:25 +00:00
parent c05d70a67c
commit dbce1cc890
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ public class DSpaceCSV
protected static String fieldSeparator; protected static String fieldSeparator;
/** The field separator in an escaped form for using in regexs */ /** The field separator in an escaped form for using in regexs */
protected static String escpaedFieldSeparator; protected static String escapedFieldSeparator;
/** /**
@@ -126,7 +126,7 @@ public class DSpaceCSV
// Read the heading line // Read the heading line
String head = input.readLine(); String head = input.readLine();
String[] headingElements = head.split(fieldSeparator); String[] headingElements = head.split(escapedFieldSeparator);
for (String element : headingElements) for (String element : headingElements)
{ {
// Remove surrounding quotes if there are any // Remove surrounding quotes if there are any
@@ -224,7 +224,7 @@ public class DSpaceCSV
// Now store the escaped version // Now store the escaped version
Pattern spchars = Pattern.compile("([\\\\*+\\[\\](){}\\$.?\\^|])"); Pattern spchars = Pattern.compile("([\\\\*+\\[\\](){}\\$.?\\^|])");
Matcher match = spchars.matcher(fieldSeparator); Matcher match = spchars.matcher(fieldSeparator);
escpaedFieldSeparator = match.replaceAll("\\\\$1"); escapedFieldSeparator = match.replaceAll("\\\\$1");
} }
/** /**
@@ -295,7 +295,7 @@ public class DSpaceCSV
} }
// Split up on field separator // Split up on field separator
String[] parts = line.split(fieldSeparator); String[] parts = line.split(escapedFieldSeparator);
ArrayList<String> bits = new ArrayList<String>(); ArrayList<String> bits = new ArrayList<String>();
bits.addAll(Arrays.asList(parts)); bits.addAll(Arrays.asList(parts));
@@ -390,8 +390,6 @@ public class DSpaceCSV
if ((element != null) && (!"".equals(element))) if ((element != null) && (!"".equals(element)))
{ {
csvLine.add(headings.get(i - 1), element); csvLine.add(headings.get(i - 1), element);
System.out.println(i + ":" + headings.size() + ":" + headings.get(i - 1) + ":" + element + ":");
} }
} }
} }