import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
+import com.hughes.android.dictionary.engine.EntrySource;
import com.hughes.android.dictionary.engine.EntryTypeName;
import com.hughes.android.dictionary.engine.IndexBuilder;
import com.hughes.android.dictionary.engine.IndexedEntry;
public class EnWiktionaryXmlParser {
- private static final String TRANSLITERATION_FORMAT = " (tr. %s)";
-
static final Logger LOG = Logger.getLogger(EnWiktionaryXmlParser.class.getName());
// TODO: process {{ttbc}} lines
"Preposition|Proper noun|Article|Prepositional phrase|Acronym|" +
"Abbreviation|Initialism|Contraction|Prefix|Suffix|Symbol|Letter|" +
"Ligature|Idiom|Phrase|\\{\\{acronym\\}\\}|\\{\\{initialism\\}\\}|" +
+ "\\{\\{abbreviation\\}\\}|" +
// These are @deprecated:
"Noun form|Verb form|Adjective form|Nominal phrase|Noun phrase|" +
"Verb phrase|Transitive verb|Intransitive verb|Reflexive verb|" +
"Particle|Interjection|Pronominal adverb" +
"Han character|Hanzi|Hanja|Kanji|Katakana character|Syllable");
+ EntrySource entrySource;
final IndexBuilder enIndexBuilder;
final IndexBuilder foreignIndexBuilder;
final Pattern langPattern;
}
- public void parse(final File file, final int pageLimit) throws IOException {
+ public void parse(final File file, final EntrySource entrySource, final int pageLimit) throws IOException {
+ this.entrySource = entrySource;
int pageCount = 0;
final DataInputStream dis = new DataInputStream(new BufferedInputStream(new FileInputStream(file)));
+ try {
while (true) {
if (pageLimit >= 0 && pageCount >= pageLimit) {
return;
try {
title = dis.readUTF();
} catch (EOFException e) {
- LOG.warning("Error reading split!");
+ LOG.log(Level.INFO, "EOF reading split.");
dis.close();
return;
}
LOG.info("pageCount=" + pageCount);
}
}
+ } finally {
+ System.out.println("lang Counts: " + appendAndIndexWikiCallback.langCodeToTCount);
+ appendAndIndexWikiCallback.langCodeToTCount.keySet().removeAll(EnWiktionaryLangs.isoCodeToWikiName.keySet());
+ System.out.println("unused Counts: " + appendAndIndexWikiCallback.langCodeToTCount);
+ System.out.println("lang Counts: " + langNameToTCount);
+ langNameToTCount.keySet().removeAll(EnWiktionaryLangs.isoCodeToWikiName.values());
+ System.out.println("unknown counts: " + langNameToTCount);
+ }
}
private void parseSection(String heading, final String text) {
} else if (headerName.equals("Translations")) {
if (pos == null) {
- LOG.warning("Translations without POS: " + title);
+ LOG.info("Translations without POS (but using anyway): " + title);
}
doTranslations(wikiTokenizer, pos);
} else if (headerName.equals("Pronunciation")) {
}
} else if (wikiTokenizer.isFunction()) {
final String name = wikiTokenizer.functionName();
- if (name.equals("head")) {
+ if (name.equals("head") && pos == null) {
LOG.warning("{{head}} without POS: " + title);
}
}
appendAndIndexWikiCallback.functionCallbacks.putAll(FunctionCallbacksDefault.DEFAULT);
}
+ final Map<String,AtomicInteger> langNameToTCount = new LinkedHashMap<String, AtomicInteger>();
+
private void doTranslations(final WikiTokenizer wikiTokenizer, final String pos) {
if (title.equals("absolutely")) {
//System.out.println();
final String line = wikiTokenizer.listItemWikiText();
// This line could produce an output...
- if (line.contains("ich hoan dich gear")) {
- //System.out.println();
- }
+// if (line.contains("ich hoan dich gear")) {
+// //System.out.println();
+// }
// First strip the language and check whether it matches.
// And hold onto it for sub-lines.
}
final String lang = trim(WikiTokenizer.toPlainText(line.substring(0, colonIndex)));
+ if (!langNameToTCount.containsKey(lang)) {
+ langNameToTCount.put(lang, new AtomicInteger());
+ }
+ langNameToTCount.get(lang).incrementAndGet();
final boolean appendLang;
if (wikiTokenizer.listItemPrefix().length() == 1) {
topLevelLang = lang;
private void doTranslationLine(final String line, final String lang, final String pos, final String sense, final String rest) {
state = State.TRANSLATION_LINE;
// Good chance we'll actually file this one...
- final PairEntry pairEntry = new PairEntry();
+ final PairEntry pairEntry = new PairEntry(entrySource);
final IndexedEntry indexedEntry = new IndexedEntry(pairEntry);
final StringBuilder foreignText = new StringBuilder();
if (!pairsAdded.add(pair.toString())) {
LOG.warning("Duplicate pair: " + pair.toString());
}
- if (pair.toString().equals("libero {m} :: free (adjective)")) {
- System.out.println();
- }
-
}
final Collection<String> wordForms = new ArrayList<String>();
boolean titleAppended = false;
-
private void doForeignPartOfSpeech(final String lang, String posHeading, final int posDepth, WikiTokenizer wikiTokenizer) {
if (++foreignCount % 1000 == 0) {
LOG.info("***" + lang + ", " + title + ", pos=" + posHeading + ", foreignCount=" + foreignCount);
foreign = String.format("(%s) %s", lang, foreign);
}
for (final ListSection listSection : listSections) {
- doForeignListItem(foreign, title, wordForms, listSection);
+ doForeignListSection(foreign, title, wordForms, listSection);
}
}
}
"sc",
"sort",
"cat",
- "xs"));
+ "xs",
+ "nodot"));
+
+ public boolean entryIsFormOfSomething = false;
- private void doForeignListItem(final String foreignText, String title, final Collection<String> forms, final ListSection listSection) {
+ private void doForeignListSection(final String foreignText, String title, final Collection<String> forms, final ListSection listSection) {
state = State.ENGLISH_DEF_OF_FOREIGN;
final String prefix = listSection.firstPrefix;
if (prefix.length() > 1) {
return;
}
- final PairEntry pairEntry = new PairEntry();
+ final PairEntry pairEntry = new PairEntry(entrySource);
final IndexedEntry indexedEntry = new IndexedEntry(pairEntry);
-
+
+ entryIsFormOfSomething = false;
final StringBuilder englishBuilder = new StringBuilder();
final String mainLine = listSection.firstLine;
-
appendAndIndexWikiCallback.reset(englishBuilder, indexedEntry);
appendAndIndexWikiCallback.dispatch(mainLine, enIndexBuilder, EntryTypeName.WIKTIONARY_ENGLISH_DEF);
if (english.length() > 0) {
final Pair pair = new Pair(english, trim(foreignText), this.swap);
pairEntry.pairs.add(pair);
- foreignIndexBuilder.addEntryWithString(indexedEntry, title, EntryTypeName.WIKTIONARY_TITLE_MULTI);
+ foreignIndexBuilder.addEntryWithString(indexedEntry, title, entryIsFormOfSomething ? EntryTypeName.WIKTIONARY_IS_FORM_OF_SOMETHING_ELSE : EntryTypeName.WIKTIONARY_TITLE_MULTI);
for (final String form : forms) {
foreignIndexBuilder.addEntryWithString(indexedEntry, form, EntryTypeName.WIKTIONARY_INFLECTED_FORM_MULTI);
}
for (int i = 0; i < listSection.nextPrefixes.size(); ++i) {
final String nextPrefix = listSection.nextPrefixes.get(i);
final String nextLine = listSection.nextLines.get(i);
+
+ // TODO: This splitting is not sensitive to wiki code.
int dash = nextLine.indexOf("—");
int mdashLen = 7;
if (dash == -1) {
appendAndIndexWikiCallback.reset(builder, indexedEntry);
appendAndIndexWikiCallback.entryTypeName = EntryTypeName.WIKTIONARY_EXAMPLE;
appendAndIndexWikiCallback.entryTypeNameSticks = true;
- appendAndIndexWikiCallback.dispatch(example, indexBuilder, EntryTypeName.WIKTIONARY_EXAMPLE);
+ try {
+ // TODO: this is a hack needed because we don't safely split on the dash.
+ appendAndIndexWikiCallback.dispatch(example, indexBuilder, EntryTypeName.WIKTIONARY_EXAMPLE);
+ } catch (AssertionError e) {
+ return "--";
+ }
final String result = trim(builder.toString());
return result.length() > 0 ? result : "--";
}
projects / DictionaryPC.git / blobdiff