use hql query for project-wide search

zanata · Nov 23, 2012 · 1a6d8aa · 1a6d8aa
1 parent 6d3d0c9
commit 1a6d8aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
@@ -94,7 +94,7 @@ public class TextFlowSearchServiceImpl implements TextFlowSearchService
    private FullTextSession session;
 
    // Disabled for now, due to the need for a left join
-   private static final boolean ENABLE_HQL_SEARCH = false;
+   private static final boolean ENABLE_HQL_SEARCH = true;
 
    @Override
    public List<HTextFlow> findTextFlows(WorkspaceId workspace, FilterConstraints constraints)
@@ -169,19 +169,13 @@ private List<HTextFlow> findTextFlowsWithDatabaseSearch(String projectSlug, Stri
       // TODO wrap in method for batching list of documents
       // assuming doclist has already been batched before this method call
 
-      // FIXME this query needs to use a left join, at least when searching
-      // source strings, because there may not be HTextFlowTarget for the
-      // HTextFlow.
-
-      // FIXME constrain to only non-obsolete documents?
-      // check that this is not already handled by id list retrieval
-
       HLocale loc = localeServiceImpl.getByLocaleId(validatedLocaleId);
       Long locId = loc.getId();
 
       ArrayList<String> projectDocStateConstraints = new ArrayList<String>();
       projectDocStateConstraints.add("tf.document.projectIteration.project.slug = :project");
       projectDocStateConstraints.add("tf.document.projectIteration.slug = :iteration");
+      projectDocStateConstraints.add("tf.document.obsolete = false");
 
       boolean hasDocumentPaths = documentPaths != null && !documentPaths.isEmpty();
       if (hasDocumentPaths)
@@ -243,7 +237,8 @@ private List<HTextFlow> findTextFlowsWithDatabaseSearch(String projectSlug, Stri
       String[] contentChecks = contentCheckList.toArray(new String[contentCheckList.size()]);
       String[] projectDocStateChecks = projectDocStateConstraints.toArray(new String[projectDocStateConstraints.size()]);
 
-      String queryStr = select("tf").from("HTextFlow tf")
+      String queryStr = select("distinct tf").from("HTextFlow tf")
+            .leftJoin("tf.targets tfts")
             .where(and(and(projectDocStateChecks), or(contentChecks)))
             .toQueryString();
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
@@ -96,7 +96,7 @@ public GetProjectTransUnitListsResult execute(GetProjectTransUnitLists action, E
          return new GetProjectTransUnitListsResult(action, docPaths, matchingTUs);
       }
 
-      FilterConstraints filterConstraints = FilterConstraints.filterBy(action.getSearchString()).excludeNew().caseSensitive(action.isCaseSensitive());
+      FilterConstraints filterConstraints = FilterConstraints.filterBy(action.getSearchString()).includeNew().caseSensitive(action.isCaseSensitive());
       if (!action.isSearchInSource())
       {
          filterConstraints.ignoreSource();