if (contains(basename, to_ascii(lang))) {
ifstream ifs(it->absFileName().c_str());
if (ifs) {
- string s;
- getline(ifs,s);
- if (s.find_first_of(',') != string::npos) {
+ // check for appropriate version of index file
+ string encoding; // first line is encoding
+ int items = 0; // second line is no. of items
+ getline(ifs,encoding);
+ ifs >> items;
+ if (ifs.fail()) {
+ LYXERR(Debug::FILES, "ignore irregular thesaurus idx file: " << it->absFileName());
+ continue;
+ }
+ if (encoding.length() == 0 || encoding.find_first_of(',') != string::npos) {
LYXERR(Debug::FILES, "ignore version1 thesaurus idx file: " << it->absFileName());
continue;
}
// they are needed for the CleanUpAfterLookup routine
mentry * pm = pmean;
docstring meaning;
- docstring ret;
for (int i = 0; i < count; i++) {
+ vector<docstring> ret;
meaning = from_iconv_encoding(string(pm->defn), encoding);
// remove silly item
if (support::prefixIs(meaning, '-'))
meaning = support::ltrim(meaning, "- ");
for (int j = 0; j < pm->count; j++) {
- ret = from_iconv_encoding(string(pm->psyns[j]), encoding);
+ ret.push_back(from_iconv_encoding(string(pm->psyns[j]), encoding));
}
- meanings[meaning].push_back(ret);
- pm++;
+ meanings[meaning] = ret;
+ ++pm;
}
// now clean up all allocated memory
mythes->CleanUpAfterLookup(&pmean, count);