#include "support/lstrings.h"
#include "support/os.h"
+#ifdef USE_EXTERNAL_MYTHES
+#include MYTHES_H_LOCATION
+#else
#include "support/mythes/mythes.hxx"
+#endif
#include "frontends/alert.h"
#include <algorithm>
#include <cstring>
+#include <fstream>
using namespace std;
using namespace lyx::support;
} // namespace anon
-#ifndef THESAURUS_LOCATION
-# define THESAURUS_LOCATION "thes"
-#endif
-
struct Thesaurus::Private
{
~Private()
/// the thesauri
Thesauri thes_;
+
+ /// the location below system/user directory
+ /// there the data+idx files lookup will happen
+ const string dataDirectory(void) { return "thes"; }
+
};
FileNameList const data_files = base.dirList("dat");
string idx;
string data;
+ string basename;
LYXERR(Debug::FILES, "thesaurus path: " << path);
for (FileNameList::const_iterator it = idx_files.begin(); it != idx_files.end(); ++it) {
- if (contains(it->onlyFileName(), to_ascii(lang))) {
+ basename = it->onlyFileNameWithoutExt();
+ if (contains(basename, to_ascii(lang))) {
+ ifstream ifs(it->absFileName().c_str());
+ if (ifs) {
+ // 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;
+ }
+ }
idx = it->absFileName();
LYXERR(Debug::FILES, "selected thesaurus idx file: " << idx);
break;
return make_pair(string(), string());
}
for (support::FileNameList::const_iterator it = data_files.begin(); it != data_files.end(); ++it) {
- if (contains(it->onlyFileName(), to_ascii(lang))) {
+ if (contains(it->onlyFileName(), basename)) {
data = it->absFileName();
LYXERR(Debug::FILES, "selected thesaurus data file: " << data);
break;
result = getThesaurus(thes_path, lang);
}
if (result.first.empty() || result.second.empty()) {
- string const sys_path = external_path(addName(lyx::support::package().system_support().absFileName(),THESAURUS_LOCATION)) ;
+ string const sys_path = external_path(addName(lyx::support::package().system_support().absFileName(),dataDirectory())) ;
result = getThesaurus(sys_path, lang);
}
if (result.first.empty() || result.second.empty()) {
- string const user_path = external_path(addName(lyx::support::package().user_support().absFileName(),THESAURUS_LOCATION)) ;
+ string const user_path = external_path(addName(lyx::support::package().user_support().absFileName(),dataDirectory())) ;
result = getThesaurus(user_path, lang);
}
return result;
bool Thesaurus::thesaurusInstalled(docstring const & lang) const
{
+ if (thesaurusAvailable(lang))
+ return true;
pair<string, string> files = d->getThesaurus(lang);
return (!files.first.empty() && !files.second.empty());
}
// 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);