More related to #7224: It's OK for layouts not to provide a ListCommand

[lyx.git] / src / Thesaurus.cpp

diff --git a/src/Thesaurus.cpp b/src/Thesaurus.cpp
index 3c7d6fd8047c18ae2400cf6d436bb170f321fc11..bf657762c1c2d4a423d3998a7dc8245734d3e132 100644 (file)
--- a/src/Thesaurus.cpp
+++ b/src/Thesaurus.cpp
@@ -29,6 +29,7 @@
 
 #include <algorithm>
 #include <cstring>
+#include <fstream>
 
 using namespace std;
 using namespace lyx::support;
@@ -42,10 +43,6 @@ typedef std::map<docstring, MyThes *> Thesauri;
 
 } // namespace anon
 
-#ifndef THESAURUS_LOCATION
-# define THESAURUS_LOCATION "thes"
-#endif
-
 struct Thesaurus::Private
 {
        ~Private()
@@ -77,6 +74,11 @@ struct Thesaurus::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"; }
+
 };
 
 
@@ -90,10 +92,28 @@ pair<string,string> Thesaurus::Private::getThesaurus(string const & path, docstr
        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;
@@ -103,7 +123,7 @@ pair<string,string> Thesaurus::Private::getThesaurus(string const & path, docstr
                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;
@@ -125,11 +145,11 @@ pair<string,string> Thesaurus::Private::getThesaurus(docstring const & lang)
                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;
@@ -163,6 +183,8 @@ bool Thesaurus::thesaurusAvailable(docstring const & lang) const
 
 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());
 }
@@ -200,17 +222,17 @@ Thesaurus::Meanings Thesaurus::lookup(docstring const & t, docstring const & lan
        // 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);