Merge branch 'fix/SEARCH-2143' of git.alfresco.com:search_discovery/insightengine into fix/SEARCH-2143_merge_from_master

This commit is contained in:
eliaporciani
2020-04-15 10:33:19 +02:00
2 changed files with 20 additions and 3 deletions
@@ -103,6 +103,24 @@
<facetable>true</facetable>
</index>
</property>
<property name="finance:EmpNo">
<title>EmpNo</title>
<type>d:int</type>
<mandatory>false</mandatory>
<index enabled="true">
<tokenised>TRUE</tokenised>
<facetable>true</facetable>
</index>
</property>
<property name="finance:EmpDept">
<title>EmpDept</title>
<type>d:float</type>
<mandatory>false</mandatory>
<index enabled="true">
<tokenised>TRUE</tokenised>
<facetable>true</facetable>
</index>
</property>
</properties>
<associations/>
<overrides/>
@@ -1666,7 +1666,7 @@ public class SolrInformationServer implements InformationServer
AddUpdateCommand addDocCmd = new AddUpdateCommand(request);
addDocCmd.overwrite = overwrite;
deleteErrorNode(processor, request, node);
deleteNode(processor, request, node);
// Check index control
Map<QName, PropertyValue> properties = nodeMetaData.getProperties();
@@ -2011,8 +2011,7 @@ public class SolrInformationServer implements InformationServer
}
// Make sure any unindexed or error doc is removed.
deleteErrorNode(processor, request, node);
deleteNode(processor, request, node);
addDocCmd.solrDoc =
populateWithMetadata(basicDocument(nodeMetaData, DOC_TYPE_NODE, PartialSolrInputDocument::new),
nodeMetaData);