Add collectionId and depth fields to the index

The collectionId is either the last value in ancestorIds, or the
itemId of the item itself. The idea that we can collapse results on
this value in order to get only the highest item in a hierarchy.

The depth field is the number of ancestors.

index-data-converter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>search-tools</artifactId>
         <groupId>ehri-project</groupId>
-        <version>1.1.10</version>
+        <version>1.1.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

index-data-converter/src/main/java/eu/ehri/project/indexing/converter/impl/JsonConverter.java

@@ -320,6 +320,22 @@ public static Map<String, Object> postProcess(Map<String, Object> data) {
             }
         }
 
+        // HACK: Get a collection ID, which is either the last
+        // ID in ancestorIds or the ID of the item itself
+        // (if ancestor IDs is empty)
+        if (data.containsKey("ancestorIds")) {
+            Object ancestorIds = data.get("ancestorIds");
+            if (ancestorIds instanceof List) {
+                List ancestors = (List) ancestorIds;
+                data.put("depth", ancestors.size());
+                if (!ancestors.isEmpty()) {
+                    data.put("collectionId", ancestors.get(ancestors.size() - 1));
+                } else {
+                    data.put("collectionId", Lists.newArrayList(data.get("itemId")));
+                }
+            }
+        }
+
         return data;
     }
 

index-data-converter/src/main/resources/paths.properties

@@ -5,7 +5,6 @@ itemId=id
 type=type
 name=data.name
 typeOfEntity=data.typeOfEntity
-depthOfDescription=data.depthOfDescription
 levelOfDescription=data.levelOfDescription
 scope=data.scope
 publicationStatus=data.publicationStatus

pom.xml

@@ -7,7 +7,7 @@
     <groupId>ehri-project</groupId>
     <artifactId>search-tools</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.10</version>
+    <version>1.1.11</version>
     <modules>
         <module>solr-config</module>
         <module>index-data-converter</module>

solr-config/core/conf/schema.xml

@@ -298,9 +298,10 @@
         <field name="type" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
         <field name="itemId" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
         <field name="gid" type="long" indexed="true" stored="true" multiValued="false" required="false"/>
-        <field name="childCount" type="int" indexed="true" stored="true" default="0" multiValued="true"
-               required="false"/>
+        <field name="depth" type="int" indexed="true" stored="true" default="0" required="false"/>
+        <field name="childCount" type="int" indexed="true" stored="true" default="0" required="false"/>
         <field name="parentId" type="string" indexed="true" stored="true" multiValued="true"/>
+        <field name="collectionId" type="string" indexed="true" stored="true" multiValued="false"/>
         <field name="ancestorIds" type="string" indexed="true" stored="true" multiValued="true"/>
         <field name="dateStart" type="date" indexed="true" stored="true" multiValued="false"/>
         <field name="dateEnd" type="date" indexed="true" stored="true" multiValued="false"/>
@@ -339,7 +340,6 @@
         <field name="languageCode" type="string" indexed="true" stored="true" multiValued="false"/>
         <field name="countryCode" type="string" indexed="true" stored="true" multiValued="false"/>
         <field name="countryName" type="string" indexed="true" stored="true" multiValued="false"/>
-        <field name="depthOfDescription" type="int" indexed="true" stored="true"/>
         <field name="levelOfDescription" type="string" indexed="true" stored="true" multiValued="false"/>
         <field name="languageOfMaterial" type="string" indexed="true" stored="true" multiValued="true"/>
         <field name="typeOfEntity" type="string" indexed="true" stored="true" multiValued="false"/>

solr-config/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>search-tools</artifactId>
         <groupId>ehri-project</groupId>
-        <version>1.1.10</version>
+        <version>1.1.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>