allow indexing fields to be controlled separately from FlatJSONDocume…

…nt parsing
terrier-org · Dec 19, 2024 · 2284e4c · 2284e4c
1 parent 6ba3d79
commit 2284e4c
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 16 deletions.
diff --git a/modules/assemblies/pom.xml b/modules/assemblies/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/batch-indexers/pom.xml b/modules/batch-indexers/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/batch-retrieval/pom.xml b/modules/batch-retrieval/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/concurrent/pom.xml b/modules/concurrent/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/core/src/main/java/org/terrier/indexing/FlatJSONDocument.java b/modules/core/src/main/java/org/terrier/indexing/FlatJSONDocument.java
@@ -47,7 +47,10 @@ public class FlatJSONDocument implements Document {
     Map<String,Set<String>> fieldSet;
 
     // static properties
-    protected String[] fieldsToProcess = ArrayUtils.parseCommaDelimitedString(ApplicationSetup.getProperty("FieldTags.process", "text"));
+    protected String[] fieldsToProcess = ArrayUtils.parseCommaDelimitedString(
+		ApplicationSetup.getProperty("FlatJSONDocument.process", 
+			ApplicationSetup.getProperty("FieldTags.process", "text"))
+	);
 
     // state
     protected int fieldIndex = 0;

diff --git a/modules/docvectors/pom.xml b/modules/docvectors/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/index-api/pom.xml b/modules/index-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/learning/pom.xml b/modules/learning/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/logging/pom.xml b/modules/logging/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/realtime/pom.xml b/modules/realtime/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/rest-client/pom.xml b/modules/rest-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/rest-server/pom.xml b/modules/rest-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/retrieval-api/pom.xml b/modules/retrieval-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/modules/tests/pom.xml b/modules/tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>terrier-platform</artifactId>
 		<groupId>org.terrier</groupId>
-		<version>5.10</version>
+		<version>5.11-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.terrier</groupId>
 	<artifactId>terrier-platform</artifactId>
-	<version>5.10</version>
+	<version>5.11-SNAPSHOT</version>
 	<name>Terrier Information Retrieval Platform</name>
 	<description>Terrier IR platform</description>
 	<url>http://terrier.org</url>