X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FWholeSectionToHtmlParser.java;h=0a702d0bcb30125cd9872a244118cdfb0b3f0abc;hb=db5b09de08e526988f90f02d64a0c7e9af3b477d;hp=57f4d587010c6d66d722f26acd8afb640daf293c;hpb=750d808c256f16703f8b348df2d260c5ca0bd56d;p=DictionaryPC.git diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java index 57f4d58..0a702d0 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java @@ -1,6 +1,7 @@ package com.hughes.android.dictionary.parser.wiktionary; +import com.hughes.android.dictionary.engine.EntryTypeName; import com.hughes.android.dictionary.engine.HtmlEntry; import com.hughes.android.dictionary.engine.IndexBuilder; import com.hughes.android.dictionary.engine.IndexBuilder.TokenData; @@ -9,7 +10,6 @@ import com.hughes.android.dictionary.parser.WikiTokenizer; import com.hughes.util.StringUtil; import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -70,11 +70,14 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser { this.langConfig = isoToLangConfig.get(wiktionaryIso); this.skipLangIso = skipLangIso; } + + IndexedEntry indexedEntry = null; @Override public void parseSection(String heading, String text) { - HtmlEntry htmlEntry = new HtmlEntry(entrySource, StringEscapeUtils.escapeHtml3(title)); - IndexedEntry indexedEntry = new IndexedEntry(htmlEntry); + assert entrySource != null; + final HtmlEntry htmlEntry = new HtmlEntry(entrySource, StringEscapeUtils.escapeHtml3(title)); + indexedEntry = new IndexedEntry(htmlEntry); final AppendAndIndexWikiCallback callback = new AppendCallback( this); @@ -93,12 +96,21 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser { tokenData.htmlEntries.add(htmlEntry); // titleIndexBuilder.addEntryWithString(indexedEntry, title, // EntryTypeName.WIKTIONARY_TITLE_MULTI_DETAIL); + + indexedEntry = null; } @Override void removeUselessArgs(Map namedArgs) { } + @Override + public void addLinkToCurrentEntry(String token, EntryTypeName entryTypeName) { + titleIndexBuilder.addEntryWithString(indexedEntry, token, entryTypeName); + } + + + static final Pattern ALL_ASCII = Pattern.compile("[\\p{ASCII}]*"); class AppendCallback extends AppendAndIndexWikiCallback {