Skip to content
This repository was archived by the owner on Sep 25, 2022. It is now read-only.

Support per-property multi-valued separator strings #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support per-property multi-valued separator strings #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions ...main/java/org/alfresco/extension/bulkimport/source/fs/AbstractMapBasedMetadataLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand Down Expand Up @@ -57,6 +61,7 @@ abstract class AbstractMapBasedMetadataLoader
private final static String PROPERTY_NAME_NAMESPACE = "namespace";
private final static String PROPERTY_NAME_PARENT_ASSOC = "parentAssociation";
private final static String PROPERTY_NAME_SEPARATOR = "separator";
private final static Pattern PROPERTY_SEPARATOR_PATTERN = Pattern.compile("^" + PROPERTY_NAME_SEPARATOR + ":([^:]+:[^:]+)$");

private final static String DEFAULT_SEPARATOR = ",";

Expand Down Expand Up @@ -160,19 +165,37 @@ public final Metadata loadMetadata(final File metadataFile)
metadataProperties.remove(PROPERTY_NAME_PARENT_ASSOC);
}

// We need to identify which properties require special matchers, so we first
// sweep for those
Map<String, String> separators = new HashMap<String, String>();
for (Iterator<String> it = metadataProperties.keySet().iterator() ; it.hasNext() ; )
{
final String key = it.next();
Matcher m = PROPERTY_SEPARATOR_PATTERN.matcher(key);
if (!m.matches()) continue;
String sep = (String)metadataProperties.get(key);
if (sep != null && sep.length() > 0) {
// store the separator value
separators.put(m.group(1), sep);
// And remove it from the map
it.remove();
}
}

// Treat everything else as a metadata property
for (final String key : metadataProperties.keySet())
{
//####TODO: Issue #5 (https://github.com/pmonks/alfresco-bulk-import/issues/5): figure out how to handle properties of type cm:content - they need to be streamed in via a Writer
QName name = QName.createQName(key, namespaceService);
PropertyDefinition propertyDefinition = dictionaryService.getProperty(name); // TODO: measure performance impact of this API call!!

if (propertyDefinition != null)
{
if (propertyDefinition.isMultiValued())
{
String sep = separators.get(key);
if (sep == null) sep = separator;
// Multi-valued property
ArrayList<Serializable> values = new ArrayList<Serializable>(Arrays.asList(((String)metadataProperties.get(key)).split(separator)));
ArrayList<Serializable> values = new ArrayList<Serializable>(Arrays.asList(((String)metadataProperties.get(key)).split(sep)));
result.addProperty(key, mapValues(propertyDefinition.getDataType(), values));
}
else
Expand Down