Updated filtering to use new database model

src/main/java/org/genesys2/server/service/impl/GenesysFilterServiceImpl.java

@@ -115,14 +115,14 @@ public class GenesysFilterServiceImpl implements GenesysFilterService {
 		}
 
 		StringBuffer sbf = new StringBuffer();
-		createQuery(sbf, "a.Origin", jsonTree.get("origin"), params);
-		createQuery(sbf, "a.Institute", jsonTree.get("institute"), params);
-		createQuery(sbf, "a.In_Svalbard", jsonTree.get("inSvalbard"), params);
-		createQuery(sbf, "a.MLS_Status", jsonTree.get("mls"), params);
-		createQuery(sbf, "a.Availability", jsonTree.get("available"), params);
+		createQuery(sbf, "a.orgCty", jsonTree.get("origin"), params);
+		createQuery(sbf, "a.instCode", jsonTree.get("institute"), params);
+		createQuery(sbf, "a.inSGSV", jsonTree.get("inSvalbard"), params);
+		createQuery(sbf, "a.mlsStat", jsonTree.get("mls"), params);
+		createQuery(sbf, "a.available", jsonTree.get("available"), params);
 		createQuery(sbf, "org.slug", jsonTree.get("organization"), params);
-		createQuery(sbf, "t.Genus", jsonTree.get("genus"), params);
-		createQuery(sbf, "t.Taxon_Name", jsonTree.get("taxon"), params);
+		createQuery(sbf, "t.genus", jsonTree.get("genus"), params);
+		createQuery(sbf, "t.taxonName", jsonTree.get("taxon"), params);
 		createQuery(sbf, "geo.longitude", jsonTree.get("lon"), params);
 		createQuery(sbf, "geo.latitude", jsonTree.get("lat"), params);
 		createQuery(sbf, "geo.altitude", jsonTree.get("alt"), params);

src/main/java/org/genesys2/server/servlet/controller/FilterController.java

@@ -115,7 +115,7 @@ public class FilterController extends BaseController {
 			e.printStackTrace();
 		}
 
-		Page<Accession> accessions = filterService.listAccessions(jsonTree, new PageRequest(page - 1, 50, new Sort("ACC_Numb_HI")));
+		Page<Accession> accessions = filterService.listAccessions(jsonTree, new PageRequest(page - 1, 50, new Sort("acceNumb")));
 
 		_logger.info("Got: " + accessions);
 		model.addAttribute("pagedData", accessions);