Remove placeholder values for size and count #267

icatproject · Jul 3, 2023 · 8abef9a · 8abef9a
1 parent 906ba63
commit 8abef9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/main/java/org/icatproject/core/entity/Datafile.java b/src/main/java/org/icatproject/core/entity/Datafile.java
@@ -212,11 +212,7 @@ public void getDoc(JsonGenerator gen) {
 		if (doi != null) {
 			SearchApi.encodeString(gen, "doi", doi);
 		}
-		if (fileSize != null) {
-			SearchApi.encodeLong(gen, "fileSize", fileSize);
-		} else {
-			SearchApi.encodeLong(gen, "fileSize", 0L);
-		}
+		SearchApi.encodeLong(gen, "fileSize", fileSize);
 		SearchApi.encodeLong(gen, "fileCount", 1L); // Always 1, but makes sorting on fields consistent
 		if (datafileFormat != null) {
 			datafileFormat.getDoc(gen);

diff --git a/src/main/java/org/icatproject/core/entity/Dataset.java b/src/main/java/org/icatproject/core/entity/Dataset.java
@@ -253,8 +253,8 @@ public void getDoc(JsonGenerator gen) {
 		} else {
 			SearchApi.encodeLong(gen, "endDate", modTime);
 		}
-		SearchApi.encodeLong(gen, "fileSize", 0L); // This is a placeholder to allow us to dynamically build size
-		SearchApi.encodeLong(gen, "fileCount", 0L); // This is a placeholder to allow us to dynamically build count
+		SearchApi.encodeLong(gen, "fileSize", fileSize);
+		SearchApi.encodeLong(gen, "fileCount", fileCount);
 		SearchApi.encodeString(gen, "id", id);
 		if (investigation != null) {
 			SearchApi.encodeString(gen, "investigation.id", investigation.id);

diff --git a/src/main/java/org/icatproject/core/entity/Investigation.java b/src/main/java/org/icatproject/core/entity/Investigation.java
@@ -344,8 +344,8 @@ public void getDoc(JsonGenerator gen) {
 		} else {
 			SearchApi.encodeLong(gen, "endDate", modTime);
 		}
-		SearchApi.encodeLong(gen, "fileSize", 0L); // This is a placeholder to allow us to dynamically build size
-		SearchApi.encodeLong(gen, "fileCount", 0L); // This is a placeholder to allow us to dynamically build count
+		SearchApi.encodeLong(gen, "fileSize", fileSize);
+		SearchApi.encodeLong(gen, "fileCount", fileCount);
 
 		SearchApi.encodeString(gen, "id", id);
 		facility.getDoc(gen);