Merge branch 'release' into integration/master

zanata · Nov 14, 2012 · 03cb254 · 03cb254
2 parents e19b520 + be10565
commit 03cb254
Showing 1 changed file with 10 additions and 2 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
@@ -173,6 +173,8 @@ private List<HTextFlow> findTextFlowsWithDatabaseSearch(String projectSlug, Stri
       // source strings, because there may not be HTextFlowTarget for the
       // HTextFlow.
 
+      // FIXME constrain to only non-obsolete documents
+
       HLocale loc = localeServiceImpl.getByLocaleId(validatedLocaleId);
       Long locId = loc.getId();
 
@@ -398,7 +400,10 @@ private List<HTextFlow> findTextFlowsWithHibernateSearch(String projectSlug, Str
             // manually check for case sensitive matches
             if( !constraints.isCaseSensitive() || (constraints.isCaseSensitive() && contentIsValid(htft.getContents(), constraints)) )
             {
-               resultList.add(htft.getTextFlow());
+               if (!htft.getTextFlow().getDocument().isObsolete())
+               {
+                  resultList.add(htft.getTextFlow());
+               }
             }
          }
       }
@@ -451,7 +456,10 @@ private List<HTextFlow> findTextFlowsWithHibernateSearch(String projectSlug, Str
                // manually check for case sensitive matches
                if( !constraints.isCaseSensitive() || (constraints.isCaseSensitive() && contentIsValid(htf.getContents(), constraints)) )
                {
-                  resultList.add(htf);
+                  if (!htf.getDocument().isObsolete())
+                  {
+                     resultList.add(htf);
+                  }
                }
             }
          }