CSPACE-5943: First working SQL query, now returns Nuxeo document IDs. Still is hard...

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
index 8a819685311a06251ce77ae58dbe19947d1e2d72..19f7aeccd9555cedfa9b929ec7922d36b5563fdc 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
@@ -927,9 +927,14 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
         // FIXME: Replace this placeholder query with an actual query from CSPACE-5945
         // FIXME: Consider using a prepared statement here
         String sql =
-                "SELECT id, termdisplayname FROM "
-                + termInfoGroupTableName
-                + " WHERE termdisplayname LIKE '" + partialTerm + "%'";
+                "SELECT DISTINCT hierarchy.id as id " // For debugging add: ", ltg.termdisplayname"
+                + " FROM hierarchy "
+                + " LEFT JOIN hierarchy h1 "
+               + "   ON h1.parentid = hierarchy.id "
+               + "   AND h1.name = 'locations_common:locTermGroupList' "
+                + " LEFT JOIN loctermgroup ltg "
+               + "   ON ltg.id = h1.id "
+                + " WHERE (ltg.termdisplayname ILIKE '" + partialTerm + "%')";
 
         // Make sure autocommit is off. See:
         // http://jdbc.postgresql.org/documentation/80/query.html#query-with-cursor