don't copy if a reference is fine

[lyx.git] / src / Thesaurus.C

diff --git a/src/Thesaurus.C b/src/Thesaurus.C
index a166de5ec54fef6e14e888187aed428e936d9300..e41ecf5fb04b98733b3872c262c03b211b15dded 100644 (file)
--- a/src/Thesaurus.C
+++ b/src/Thesaurus.C
@@ -6,33 +6,19 @@
  * \author John Levon
  */
 
+#include <config.h>
+
 #include "Thesaurus.h"
 
+#include <algorithm>
+ 
 Thesaurus thesaurus; 
 
 #ifdef HAVE_LIBAIKSAURUS
  
-Thesaurus::ThesaurusEntry::ThesaurusEntry(string const & ent, char part)
-       : entry(ent), pos(Thesaurus::NONE)
-{
-       if (part & AikSaurus::Unknown)
-               pos |= OTHER;
-       if (part & AikSaurus::Other)
-               pos |= OTHER;
-       if (part & AikSaurus::Noun)
-               pos |= NOUN;
-       if (part & AikSaurus::Verb)
-               pos |= VERB;
-       if (part & AikSaurus::Adjective)
-               pos |= ADJECTIVE;
-       if (part & AikSaurus::Adverb)
-               pos |= ADVERB;
-}
-
-
 Thesaurus::Thesaurus()
 {
-       aik_ = new AikSaurus;
+       aik_ = new Aiksaurus;
 }
 
 
@@ -42,31 +28,46 @@ Thesaurus::~Thesaurus()
 }
 
 
-std::vector<Thesaurus::ThesaurusEntry> Thesaurus::lookup(string const & text)
+Thesaurus::Meanings Thesaurus::lookup(string const & text)
 {
-       std::vector<ThesaurusEntry> entries;
+       Meanings meanings;
 
        if (!aik_->find(text.c_str()))
-               return entries;
+               return meanings;
 
-       char pos;
+       // weird api, but ...
+ 
+       int prev_meaning = -1;
+       int cur_meaning;
+       string meaning;
 
-       string ret = aik_->next(pos);
+       // correct, returns "" at the end 
+       string ret = aik_->next(cur_meaning);
+ 
        while (!ret.empty()) {
-               entries.push_back(ThesaurusEntry(ret, pos));
-               ret = aik_->next(pos);
+               if (cur_meaning != prev_meaning) {
+                       meaning = ret;
+                       ret = aik_->next(cur_meaning);
+                       prev_meaning = cur_meaning;
+               } else {
+                       if (ret != text) {
+                               meanings[meaning].push_back(ret);
+                       } 
+               }
+ 
+               ret = aik_->next(cur_meaning);
        }
 
-       return entries;
+       for (Meanings::iterator it = meanings.begin();
+               it != meanings.end(); ++it) {
+                       std::sort(it->second.begin(), it->second.end());
+       }
+ 
+       return meanings;
 }
 
 #else
 
-Thesaurus::ThesaurusEntry::ThesaurusEntry(string const &, char)
-{
-}
-
- 
 Thesaurus::Thesaurus()
 {
 }
@@ -77,10 +78,9 @@ Thesaurus::~Thesaurus()
 }
 
  
-std::vector<Thesaurus::ThesaurusEntry>
-Thesaurus::lookup(string const & /*text*/)
+Thesaurus::Meanings Thesaurus::lookup(string const &)
 {
-       return std::vector<ThesaurusEntry>();
+       return Meanings();
 }
 
 #endif // HAVE_LIBAIKSAURUS