Show all rows in foreign lists.

[DictionaryPC.git] / src / com / hughes / android / dictionary / parser / EnWiktionaryXmlParser.java

diff --git a/src/com/hughes/android/dictionary/parser/EnWiktionaryXmlParser.java b/src/com/hughes/android/dictionary/parser/EnWiktionaryXmlParser.java
index c6aee3b97d28cea455aef0d80e5483b483d308a3..0dd51d2cac2ebfed6af65ece1cf187ac637e7fb7 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/EnWiktionaryXmlParser.java
+++ b/src/com/hughes/android/dictionary/parser/EnWiktionaryXmlParser.java
@@ -768,24 +768,27 @@ public class EnWiktionaryXmlParser {
         if (lastForeign != null && pairEntry.pairs.size() > 0) {
           pairEntry.pairs.remove(pairEntry.pairs.size() - 1);
           final Pair pair = new Pair(formatAndIndexExampleString(nextLine, enIndexBuilder, indexedEntry), formatAndIndexExampleString(lastForeign, otherIndexBuilder, indexedEntry), swap);
-          if (pair.lang1 != "--" && pair.lang1 != "--") {
+          if (pair.lang1 != "--" || pair.lang2 != "--") {
             pairEntry.pairs.add(pair);
           }
           lastForeign = null;
         } else {
           LOG.warning("TODO: English example with no foreign: " + title + ", " + nextLine);
-          // TODO: add something.
+          final Pair pair = new Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap);
+          if (pair.lang1 != "--" || pair.lang2 != "--") {
+            pairEntry.pairs.add(pair);
+          }
         }
       } else if (nextPrefix.equals("#*")) {
         // Can't really index these.
         final Pair pair = new Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap);
         lastForeign = nextLine;
-        if (pair.lang1 != "--" && pair.lang1 != "--") {
+        if (pair.lang1 != "--" || pair.lang2 != "--") {
           pairEntry.pairs.add(pair);
         }
       } else if (nextPrefix.equals("#::*") || nextPrefix.equals("##") || nextPrefix.equals("#*:") || nextPrefix.equals("#:*") || true) {
         final Pair pair = new Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap);
-        if (pair.lang1 != "--" && pair.lang1 != "--") {
+        if (pair.lang1 != "--" || pair.lang2 != "--") {
           pairEntry.pairs.add(pair);
         }
 //      } else {