Search for kanji and reading together

Julien LepillerSat Oct 05 15:31:06+0200 2019

ad4d611

Search for kanji and reading together

app/src/main/java/eu/lepiller/nani/dictionary/JMDict.java

332332 
333333 
                logHuffman(readingHuffman, new ArrayList<Boolean>());
334334 
335+
                // Search in Japanese, by kanji and reading
335336 
                ArrayList<Integer> results = searchTrie(file, kanjiTriePos, search);
336-
                if(results == null || results.isEmpty())
337-
                    results = searchTrie(file, readingTriePos, search);
337+
                ArrayList<Integer> readingResults = searchTrie(file, readingTriePos, search);
338+
                if(results != null && readingResults != null)
339+
                    results.addAll(readingResults);
340+
                else if (results == null)
341+
                    results = readingResults;
342+
343+
                // Search in other language, by meaning
338344 
                if(results == null || results.isEmpty())
339345 
                    results = searchTrie(file, meaningTriePos, search);
340346