Fixes #317 - Add spaces surrounding pipe as multi-values delimiter.

Author: lsitu

src/edu/ucsd/library/xdre/tab/RDFExcelConvertor.java

@@ -351,9 +351,13 @@ private void updateFieldCounts(Map<String, Integer> fieldCounts, Map<String, Int
 		}
 	}
 
-	private void appendValues(StringBuilder line, int fieldCount, String fieldValues, boolean mutiValuesField) {
+	private void appendValues(StringBuilder line, int fieldCount, String fieldValues, boolean multiValuesField) {
 		if (StringUtils.isNotBlank(fieldValues)) {
-			String[] values = mutiValuesField ? new String[] { fieldValues } : fieldValues.split("\\|");
+			String[] values = fieldValues.split("\\" + TabularRecord.DELIMITER);
+			if (multiValuesField) {
+				String strVal = concatValues(values, " " + TabularRecord.DELIMITER + " ");
+				values = new String[]{ strVal };
+			}
 
 			Arrays.sort(values);
 			for (String value : values) {
@@ -364,7 +368,7 @@ private void appendValues(StringBuilder line, int fieldCount, String fieldValues
 			}
 
 			// append commas for extra fields
-			if (!mutiValuesField && fieldCount > values.length) {
+			if (!multiValuesField && fieldCount > values.length) {
 				for (int i= values.length; i< fieldCount; i++) {
 					line.append(",");
 				}
@@ -375,6 +379,22 @@ private void appendValues(StringBuilder line, int fieldCount, String fieldValues
 		}
 	}
 
+	/*
+	 * Join array elements into string with delimiter.
+	 * @param values
+	 * @param delimiter
+	 * @return
+	 */
+	private static String concatValues(String[] values, String delimiter) {
+	    StringBuilder builder = new StringBuilder();
+	    for (String v : values) {
+	        if (builder.length() > 0)
+	            builder.append(delimiter);
+	        builder.append(v);
+	    }
+	    return builder.toString();
+	}
+
 	private void appendFlatColumnNames(StringBuilder line, int fieldCount, String columnName) {
 		for (int i=0; i< fieldCount; i++) {
 			if (line.length() > 1)

test/edu/ucsd/library/xdre/harvesting/CilHavestingTest.java

@@ -273,9 +273,9 @@ public void testCsvExportMultiple() throws Exception {
 
     @Test
     public void testCsvExportWithMultiValues() throws Exception {
-        String personResearsher = "\"W. Stoeckenius|Wolfgang Bettighofer|Buchanan, JoAnn|Richard Allen\"";
-        String subjectAnatomy = "artificial phospholipid membrane|membrane";
-        String subjectTopic = "free text for response to chemical stimulus|response to chemical stimulus";
+        String personResearsher = "\"W. Stoeckenius | Wolfgang Bettighofer | Buchanan, JoAnn | Richard Allen\"";
+        String subjectAnatomy = "artificial phospholipid membrane | membrane";
+        String subjectTopic = "free text for response to chemical stimulus | response to chemical stimulus";
 
         String[] files = {createJsonDataFile("test123.json").getAbsolutePath()};
         CilHarvesting cilHarvesting = new CilHarvesting(fieldMappings, constantFields, Arrays.asList(files));