1 files changed, 39 insertions, 72 deletions

diff --git a/src/searchindex.h b/src/searchindex.h
index 893440e..ad79858 100644
--- a/src/searchindex.h
+++ b/src/searchindex.h
@@ -13,63 +13,80 @@
  *
  */
 
+/** @file
+ *  @brief Web server based search engine.
+ *
+ *  Comes in two flavors: internal (via generated index) or external (via doxyindexer + doxysearch)
+ */
+
 #ifndef SEARCHINDEX_H
 #define SEARCHINDEX_H
 
 #include <memory>
 #include <vector>
-#include <map>
-#include <unordered_map>
 #include <string>
 #include <array>
-#include <functional>
+#include <variant>
 
 #include "qcstring.h"
 
 class Definition;
+class SearchIndexIntf;
 
 /*! Initialize the search indexer */
 void initSearchIndexer();
 /*! Cleanup the search indexer */
 void finalizeSearchIndexer();
 
-//------- server side search index ----------------------
+// --- intermediate data collected by one thread ------
 
-struct URL
+struct SIData_CurrentDoc
 {
-  URL(QCString n,QCString u) : name(n), url(u) {}
-  QCString name;
-  QCString url;
+  SIData_CurrentDoc(const Definition *d,const QCString &a,bool b)
+    : ctx(d), anchor(a), isSourceFile(b) {}
+  const Definition *ctx = 0;
+  QCString anchor;
+  bool isSourceFile;
 };
 
-
-struct URLInfo
+struct SIData_Word
 {
-  URLInfo(int idx,int f) : urlIdx(idx), freq(f) {}
-  int urlIdx;
-  int freq;
+  SIData_Word(const QCString &w,bool b)
+    : word(w), hiPrio(b) {}
+  QCString word;
+  bool hiPrio;
 };
 
-class IndexWord
+// class to aggregate the search data collected on a worker thread
+// and later transfer it to the search index on the main thread.
+class SIDataCollection
 {
   public:
-    using URLInfoMap = std::unordered_map<int,URLInfo>;
-    IndexWord(QCString word);
-    void addUrlIndex(int,bool);
-    URLInfoMap urls() const { return m_urls; }
-    QCString word() const { return m_word; }
+    void setCurrentDoc(const Definition *ctx,const QCString &anchor,bool isSourceFile)
+    {
+      m_data.emplace_back(SIData_CurrentDoc(ctx,anchor,isSourceFile));
+    }
+    void addWord(const QCString &word,bool hiPriority)
+    {
+      m_data.emplace_back(SIData_Word(word,hiPriority));
+    }
+
+    // transfer the collected data into the given search index
+    void transfer();
 
   private:
-    QCString    m_word;
-    URLInfoMap  m_urls;
+    using SIData = std::variant<SIData_CurrentDoc,SIData_Word>;
+    std::vector<SIData> m_data;
 };
 
+//-----------------------------
+
 class SearchIndexIntf
 {
   public:
     enum Kind { Internal, External };
     SearchIndexIntf(Kind k) : m_kind(k) {}
-    virtual ~SearchIndexIntf() {}
+    virtual ~SearchIndexIntf() = default;
     virtual void setCurrentDoc(const Definition *ctx,const QCString &anchor,bool isSourceFile) = 0;
     virtual void addWord(const QCString &word,bool hiPriority) = 0;
     virtual void write(const QCString &file) = 0;
@@ -78,55 +95,5 @@ class SearchIndexIntf
     Kind m_kind;
 };
 
-class SearchIndex : public SearchIndexIntf
-{
-  public:
-    SearchIndex();
-    void setCurrentDoc(const Definition *ctx,const QCString &anchor,bool isSourceFile) override;
-    void addWord(const QCString &word,bool hiPriority) override;
-    void write(const QCString &file) override;
-  private:
-    void addWord(const QCString &word,bool hiPrio,bool recurse);
-    std::unordered_map<std::string,int> m_words;
-    std::vector< std::vector< IndexWord> > m_index;
-    std::unordered_map<std::string,int> m_url2IdMap;
-    std::map<int,URL> m_urls;
-    int m_urlIndex = -1;
-};
-
-
-class SearchIndexExternal : public SearchIndexIntf
-{
-    struct Private;
-  public:
-    SearchIndexExternal();
-    void setCurrentDoc(const Definition *ctx,const QCString &anchor,bool isSourceFile);
-    void addWord(const QCString &word,bool hiPriority);
-    void write(const QCString &file);
-  private:
-    std::unique_ptr<Private> p;
-};
-
-//------- client side search index ----------------------
-
-#define NUM_SEARCH_INDICES 21
-
-QCString searchId(const Definition *d);
-QCString searchName(const Definition *d);
-
-using SearchIndexList = std::vector<const Definition *>;
-using SearchIndexMap  = std::map<std::string,SearchIndexList>;
-
-struct SearchIndexInfo
-{
-  void add(const std::string &letter,const Definition *def);
-  QCString name;
-  std::function<QCString()> getText;
-  SearchIndexMap symbolMap;
-};
-
-void createJavaScriptSearchIndex();
-void writeJavaScriptSearchIndex();
-const std::array<SearchIndexInfo,NUM_SEARCH_INDICES> &getSearchIndices();
 
 #endif