Code review updates.

zanata · Jul 29, 2013 · 787ecff · 787ecff
1 parent 1193a6a
commit 787ecff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java b/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
@@ -38,4 +38,6 @@ public interface IndexFieldLabels
       CONTENT + 5
    };
 
+   public static final String TRANS_UNIT_VARIANT_FIELD = "tuv.";
+
 }
diff --git a/zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java b/zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
@@ -40,7 +40,7 @@ public void set(String s, Object value, Document document, LuceneOptions luceneO
       TransMemoryUnitVariant variant = (TransMemoryUnitVariant)value;
 
       String textToIndex = variant.getPlainTextSegment();
-      Field field = new Field("tuv." + variant.getLanguage(), textToIndex,
+      Field field = new Field(IndexFieldLabels.TRANS_UNIT_VARIANT_FIELD + variant.getLanguage(), textToIndex,
             luceneOptions.getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector());
       field.setBoost(luceneOptions.getBoost());
       document.add(field);

diff --git a/zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java b/zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
@@ -84,10 +84,5 @@ public void extractPlainTextContentWithNested() throws Exception
             "{\\cs16\\super \\chftn } <sub>An elephant is a very " +
             "large animal.</sub>}}</ph> are big.</seg>"),
             equalTo("Elephants are big."));
-      assertThat(OkapiUtil.removeFormattingMarkup("<seg>Elephants<ph type=\"fnote\">{\\cs16\\super \\chftn {\\footnote \\pard\\plain" +
-            "\\s15\\widctlpar \\f4\\fs20" +
-            "{\\cs16\\super \\chftn } <sub>An elephant is a very " +
-            "large animal.</sub>}}</ph> are big.</seg>"),
-            equalTo("Elephants are big."));
    }
 }
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
@@ -63,9 +63,6 @@ public class TranslationMemoryQueryServiceImpl implements TranslationMemoryQuery
    @In
    private FullTextEntityManager entityManager;
 
-   /*@In
-   private TranslationStateCache translationStateCacheImpl;*/
-
    @Override
    public List<Object[]> getSearchResult(TransMemoryQuery query, LocaleId sourceLocale,
          LocaleId targetLocale, final int maxResult) throws ParseException
@@ -219,9 +216,9 @@ private Query generateTransMemoryQuery(LocaleId sourceLocale, LocaleId targetLoc
       String analyzerDefName = TextContainerAnalyzerDiscriminator.getAnalyzerDefinitionName(sourceLocale.getId());
       Analyzer analyzer = entityManager.getSearchFactory().getAnalyzer(analyzerDefName);
 
-      QueryParser parser = new QueryParser(LUCENE_VERSION, "tuv." + sourceLocale.getId(), analyzer);
+      QueryParser parser = new QueryParser(LUCENE_VERSION, IndexFieldLabels.TRANS_UNIT_VARIANT_FIELD + sourceLocale.getId(), analyzer);
       Query sourceContentQuery = parser.parse(queryText);
-      WildcardQuery targetContentQuery = new WildcardQuery(new Term("tuv." + targetLocale.getId(), "*"));
+      WildcardQuery targetContentQuery = new WildcardQuery(new Term(IndexFieldLabels.TRANS_UNIT_VARIANT_FIELD + targetLocale.getId(), "*"));
       return join(Occur.MUST, sourceContentQuery, targetContentQuery);
    }