Merge branch 'genomic-v2' into ALS-6511

hms-dbmi · Aug 13, 2024 · 9e2fd0c · 9e2fd0c
2 parents 37c739f + b2c6346
commit 9e2fd0c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/PicSureService.java b/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/PicSureService.java
@@ -146,8 +146,20 @@ public SearchResults search(@RequestBody QueryRequest searchJson) {
 		}).collect(Collectors.toMap(Entry::getKey, Entry::getValue)) : allColumns;
 
 		// Info Values
-		Map<String, Map> infoResults = new HashMap<>();
-		log.warn("Info values no longer supported for this resource");
+		Map<String, Map> infoResults = new TreeMap<String, Map>();
+		abstractProcessor.getInfoStoreMeta().stream().forEach(infoColumnMeta -> {
+			//FileBackedByteIndexedInfoStore store = abstractProcessor.getInfoStore(infoColumn);
+			String query = searchJson.getQuery().toString();
+			String lowerCase = query.toLowerCase();
+			boolean storeIsNumeric = infoColumnMeta.isContinuous();
+			if (infoColumnMeta.getDescription().toLowerCase().contains(lowerCase)
+					|| infoColumnMeta.getKey().toLowerCase().contains(lowerCase)) {
+				infoResults.put(infoColumnMeta.getKey(),
+						ImmutableMap.of("description", infoColumnMeta.getDescription(), "values",
+								storeIsNumeric ? new ArrayList<String>() : abstractProcessor.searchInfoConceptValues(infoColumnMeta.getKey(), ""), "continuous",
+								storeIsNumeric));
+			}
+		});
 
 		return new SearchResults()
 				.setResults(

diff --git a/war/src/main/webapp/WEB-INF/web.xml b/war/src/main/webapp/WEB-INF/web.xml
@@ -29,6 +29,7 @@
     <session-config>
         <cookie-config>
             <http-only>true</http-only>
+            <secure>true</secure>
         </cookie-config>
     </session-config>
 </web-app>