Merge pull request #21 from sgirardin/correction/transfer-easyContent…

…2MetadataDocument-to-test Correction/transfer easy content2 metadata document to test
sgirardin · Oct 26, 2018 · 399ca8b · 399ca8b
2 parents 58dce76 + d9d47e1
commit 399ca8b
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 388 deletions.
diff --git a/...adata-platform-jar/src/main/java/org/alfresco/extension/ec2m/utils/DataListsResolver.java b/...adata-platform-jar/src/main/java/org/alfresco/extension/ec2m/utils/DataListsResolver.java
@@ -14,8 +14,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.alfresco.events.types.DataType.Qname;
-
 public class DataListsResolver {
 
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
@@ -24,17 +22,17 @@ public class DataListsResolver {
 	private StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
 
 	public Map<String, String> getValuesByType(NodeRef documentToExtractMetadata){
-		List<NodeRef> datalistValues = getExtractorDatalist();
+		List<NodeRef> datalistValues = getExtractorDatalistValues();
 		return getMappingsByConfigurationAndType(datalistValues, documentToExtractMetadata, ConfigurationEnum.VALUE);
 	}
 
 	public Map<String, String> getRegexByType(NodeRef documentToExtractMetadata){
-		List<NodeRef> datalistValues = getExtractorDatalist();
+		List<NodeRef> datalistValues = getExtractorDatalistValues();
 		return getMappingsByConfigurationAndType(datalistValues, documentToExtractMetadata, ConfigurationEnum.REGEX);
 	}
 
 	public Map<String, String> getCoordinatesByType(NodeRef documentToExtractMetadata){
-		List<NodeRef> datalistValues = getExtractorDatalist();
+		List<NodeRef> datalistValues = getExtractorDatalistValues();
 		return getMappingsByConfigurationAndType(datalistValues, documentToExtractMetadata,ConfigurationEnum.COORDINATES);
 	}
 
@@ -50,7 +48,7 @@ public Map<String, String> getMappingsByConfigurationAndType(List<NodeRef> datal
 	}
 
 	public boolean hasMappings(String documentModel){
-		List<NodeRef> datalistValues = getExtractorDatalist();
+		List<NodeRef> datalistValues = getExtractorDatalistValues();
 		for (NodeRef nodeRef : datalistValues) {
 			if (nodeService.getProperty(nodeRef, Constants.PROP_TYPE).equals(documentModel)) {
 				return true;
@@ -59,7 +57,7 @@ public boolean hasMappings(String documentModel){
 		return false;
 	}
 
-	private List<NodeRef> getExtractorDatalist(){
+	public List<NodeRef> getExtractorDatalistValues(){
 		String query ="TYPE:\""+ Constants.EXTRACTOR_MAPPING_TYPE_LIST +"\"";
 		ResultSet rs = searchService.query(storeRef, SearchService.LANGUAGE_LUCENE, query);
 

diff --git a/...o/module/easyContent2Metadata-platform-jar/messages/easyContent2Metadata-model.properties b/...o/module/easyContent2Metadata-platform-jar/messages/easyContent2Metadata-model.properties
@@ -1,5 +1 @@
-ec2m_easyContent2MetadataDocument.type.ec2m_document.title=Document Type
-ec2m_easyContent2MetadataDocument.property.ec2m_author.title=Document Author
-ec2m_easyContent2MetadataDocument.property.ec2m_city.title=City
-ec2m_easyContent2MetadataDocument.property.ec2m_date.title=Date
 form.datalist.active.message=Should the field be extracted?
diff --git a/...es/alfresco/module/easyContent2Metadata-platform-jar/model/easyContent2Metadata-model.xml b/...es/alfresco/module/easyContent2Metadata-platform-jar/model/easyContent2Metadata-model.xml
@@ -37,25 +37,6 @@
     </constraints>
 
     <types>
-        <type name="ec2m:easyContent2MetadataDocument">
-            <title>EasyContent2Metadata Document Type Example</title>
-            <parent>cm:content</parent>
-            <properties>
-                <property name="ec2m:author">
-                    <title>Document Author</title>
-                    <type>d:text</type>
-                </property>
-                <property name="ec2m:city">
-                    <title>City</title>
-                    <type>d:text</type>
-                </property>
-                <property name="ec2m:date">
-                    <title>Date</title>
-                    <type>d:date</type>
-                </property>
-            </properties>
-        </type>
-
         <type name="ec2m:extractorMappingDatalist">
             <title>Extractor Mapping Datalist</title>
             <parent>dl:dataListItem</parent>