From 5507d4ca57c98ee14f1242f4151482da5160154d Mon Sep 17 00:00:00 2001
From: jendib <benjamin.gam@gmail.com>
Date: Sat, 17 Aug 2013 02:40:28 +0200
Subject: [PATCH] Support Japanese language

---
 .../com/sismics/docs/core/constant/Constants.java |   2 +-
 .../sismics/docs/core/dao/lucene/LuceneDao.java   |   6 ++++--
 docs-web/src/main/webapp/img/flag/jpn.png         | Bin 0 -> 420 bytes
 .../main/webapp/partial/docs/document.edit.html   |   1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 docs-web/src/main/webapp/img/flag/jpn.png

diff --git a/docs-core/src/main/java/com/sismics/docs/core/constant/Constants.java b/docs-core/src/main/java/com/sismics/docs/core/constant/Constants.java
index 30312918..7309c0af 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/constant/Constants.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/constant/Constants.java
@@ -48,5 +48,5 @@ public class Constants {
     /**
      * Supported document languages.
      */
-    public static final List<String> SUPPORTED_LANGUAGES = Lists.newArrayList("eng", "fra");
+    public static final List<String> SUPPORTED_LANGUAGES = Lists.newArrayList("eng", "fra", "jpn");
 }
diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/lucene/LuceneDao.java b/docs-core/src/main/java/com/sismics/docs/core/dao/lucene/LuceneDao.java
index 6b5a72a9..466728bb 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/dao/lucene/LuceneDao.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/dao/lucene/LuceneDao.java
@@ -1,7 +1,9 @@
 package com.sismics.docs.core.dao.lucene;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.StringField;
@@ -100,7 +102,7 @@ public class LuceneDao {
      * @return List of file IDs
      * @throws Exception
      */
-    public List<String> search(String userId, String searchQuery, int limit) throws Exception {
+    public Set<String> search(String userId, String searchQuery, int limit) throws Exception {
         // Escape query and add quotes so QueryParser generate a PhraseQuery
         searchQuery = "\"" + QueryParserUtil.escape(searchQuery) + "\"";
         
@@ -125,7 +127,7 @@ public class LuceneDao {
         ScoreDoc[] docs = topDocs.scoreDocs;
         
         // Extract file IDs
-        List<String> fileIdList = new ArrayList<String>();
+        Set<String> fileIdList = new HashSet<String>();
         for (int i = 0; i < docs.length; i++) {
             String id = searcher.doc(docs[i].doc).get("id");
             fileIdList.add(id);
diff --git a/docs-web/src/main/webapp/img/flag/jpn.png b/docs-web/src/main/webapp/img/flag/jpn.png
new file mode 100644
index 0000000000000000000000000000000000000000..325fbad3ffd3075a4a84d8d898ad26ef7d3e0d56
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzHc3Q5RCwBA
z{QC7P0}}Z6?;nIjX28LpfBygihy^Ih#l;0A|Ns9F(F3Oc|A$jZ;Khp<00G1TQ}iFf
z*thTh;UoWl|N3uc_TS43u9}gN5oifO0I{H}Uc2`H!iE3;{Q3Xu_y5C(|37{5KRE@W
z0pdb{0Ahl>9whYk?f=!Q|Ns8||JN@lTD;`{<HvAI{`~m^5I{^2&%xdJ|Kmrf(%)e6
z%a{KTAO43~0aOeSKrBEE<Ns$675&e|1Xc>R1ZWk|EGa3dAO8ObDh3E3Cb;oH_5X#1
z|NHy@|M?558b}5Q|Cf`4hZv9q2p|@?lb|{i68>{>{ol0<q}tBze@qPA$3Ot|13&;V
zzJ2?akB<*73S~gt$;kNsKSBnG@7}!&5I`Us-o1MVi%1Z}1t69H1Q-A&lWd>lx`{mi
O0000<MNUMnLSTa2cE7*?

literal 0
HcmV?d00001

diff --git a/docs-web/src/main/webapp/partial/docs/document.edit.html b/docs-web/src/main/webapp/partial/docs/document.edit.html
index ea83944c..2077ac42 100644
--- a/docs-web/src/main/webapp/partial/docs/document.edit.html
+++ b/docs-web/src/main/webapp/partial/docs/document.edit.html
@@ -26,6 +26,7 @@
       <select id="inputLanguage" ng-model="document.language">
         <option value="fra">French</option>
         <option value="eng">English</option>
+        <option value="jpn">Japanese</option>
       </select>
     </div>
   </div>