Store the origin dbdir inside the GUI doc history, so we can later fetch documents from external indexes

src/query/docseqhist.cpp

@@ -34,21 +34,24 @@ using std::vector;
 // The U distinguishes udi-based entries from older fn+ipath ones
 bool RclDHistoryEntry::encode(string& value)
 {
-    string budi;
+    string budi, bdir;
     base64_encode(udi, budi);
-    value = string("U ") + lltodecstr(unixtime) + " " + budi;
+    base64_encode(dbdir, bdir);
+    value = string("V ") + lltodecstr(unixtime) + " " + budi + " " + bdir;
     return true;
 }
 
 // Decode. We support historical entries which were like "time b64fn [b64ipath]"
-// Current entry format is "U time b64udi"
+// Previous entry format is "U time b64udi"
+// Current entry format "V time b64udi [b64dir]"
 bool RclDHistoryEntry::decode(const string &value)
 {
     vector<string> vall;
     stringToStrings(value, vall);
 
     vector<string>::const_iterator it = vall.begin();
-    udi.erase();
+    udi.clear();
+    dbdir.clear();
     string fn, ipath;
     switch (vall.size()) {
     case 2:
@@ -57,8 +60,8 @@ bool RclDHistoryEntry::decode(const string &value)
         base64_decode(*it++, fn);
         break;
     case 3:
-        if (!it->compare("U")) {
-            // New udi-based entry
+        if (!it->compare("U") || !it->compare("V")) {
+            // New udi-based entry, no dir
             it++;
             unixtime = atoll((*it++).c_str());
             base64_decode(*it++, udi);
@@ -69,6 +72,13 @@ bool RclDHistoryEntry::decode(const string &value)
             base64_decode(*it, ipath);
         }
         break;
+    case 4:
+        // New udi-based entry, with directory
+        it++;
+        unixtime = atoll((*it++).c_str());
+        base64_decode(*it++, udi);
+        base64_decode(*it++, dbdir);
+        break;
     default: 
         return false;
     }
@@ -77,23 +87,31 @@ bool RclDHistoryEntry::decode(const string &value)
         // Old style entry found, make an udi, using the fs udi maker
         make_udi(fn, ipath, udi);
     }
-    LOGDEB1("RclDHistoryEntry::decode: udi ["  << udi << "]\n");
+    LOGDEB1("RclDHistoryEntry::decode: udi ["  << udi << "] dbdir [" <<
+            dbdir << "]\n");
     return true;
 }
 
 bool RclDHistoryEntry::equal(const DynConfEntry& other)
 {
     const RclDHistoryEntry& e = dynamic_cast<const RclDHistoryEntry&>(other);
-    return e.udi == udi;
+    return e.udi == udi && e.dbdir == dbdir;
 }
 
-bool historyEnterDoc(RclDynConf *dncf, const string& udi)
+bool historyEnterDoc(Rcl::Db *db, RclDynConf *dncf, const Rcl::Doc& doc)
 {
-    LOGDEB1("historyEnterDoc: [" << udi << "] into " << dncf->getFilename() <<
-            "\n");
-    RclDHistoryEntry ne(time(0), udi);
-    RclDHistoryEntry scratch;
-    return dncf->insertNew(docHistSubKey, ne, scratch, 200);
+    string udi;
+    if (db && doc.getmeta(Rcl::Doc::keyudi, &udi)) {
+        std::string dbdir =  db->whatIndexForResultDoc(doc);
+        LOGDEB("historyEnterDoc: [" << udi << ", " << dbdir << "] into " <<
+               dncf->getFilename() << "\n");
+        RclDHistoryEntry ne(time(0), udi, dbdir);
+        RclDHistoryEntry scratch;
+        return dncf->insertNew(docHistSubKey, ne, scratch, 200);
+    } else {
+        LOGDEB("historyEnterDoc: doc has no udi\n");
+    }
+    return false;
 }
 
 vector<RclDHistoryEntry> getDocHistory(RclDynConf* dncf)
@@ -111,8 +129,10 @@ bool DocSequenceHistory::getDoc(int num, Rcl::Doc &doc, string *sh)
 
     if (num < 0 || num >= (int)m_history.size())
 	return false;
+
     // We get the history oldest first, but our users expect newest first
     RclDHistoryEntry& hentry = m_history[m_history.size() - 1 - num];
+
     if (sh) {
 	if (m_prevtime < 0 || 
             abs (float(m_prevtime) - float(hentry.unixtime)) > 86400) {
@@ -126,9 +146,7 @@ bool DocSequenceHistory::getDoc(int num, Rcl::Doc &doc, string *sh)
         }
     }
 
-    // For now history does not store an index id. Use empty doc as ref.
-    Rcl::Doc idxdoc;
-    bool ret = m_db->getDoc(hentry.udi, idxdoc, doc);
+    bool ret = m_db->getDoc(hentry.udi, hentry.dbdir, doc);
     if (!ret || doc.pc == -1) {
 	doc.url = "UNKNOWN";
         doc.ipath = "";

src/query/docseqhist.h

@@ -31,14 +31,15 @@ namespace Rcl {
 class RclDHistoryEntry : public DynConfEntry {
  public:
     RclDHistoryEntry() : unixtime(0) {}
-    RclDHistoryEntry(time_t t, const string& u) 
-	: unixtime(t), udi(u) {}
+    RclDHistoryEntry(time_t t, const std::string& u, const std::string& d) 
+	: unixtime(t), udi(u), dbdir(d) {}
     virtual ~RclDHistoryEntry() {}
-    virtual bool decode(const string &value);
-    virtual bool encode(string& value);
+    virtual bool decode(const std::string &value);
+    virtual bool encode(std::string& value);
     virtual bool equal(const DynConfEntry& other);
     time_t unixtime;
-    string udi;
+    std::string udi;
+    std::string dbdir;
 };
 
 /** A DocSequence coming from the history file. 
@@ -46,14 +47,14 @@ class RclDHistoryEntry : public DynConfEntry {
  *  metadata for an url key */
 class DocSequenceHistory : public DocSequence {
  public:
-    DocSequenceHistory(Rcl::Db *d, RclDynConf *h, const string &t) 
+    DocSequenceHistory(Rcl::Db *d, RclDynConf *h, const std::string &t) 
 	: DocSequence(t), m_db(d), m_hist(h) {}
     virtual ~DocSequenceHistory() {}
 
-    virtual bool getDoc(int num, Rcl::Doc &doc, string *sh = 0);
+    virtual bool getDoc(int num, Rcl::Doc &doc, std::string *sh = 0);
     virtual int getResCnt();
-    virtual string getDescription() {return m_description;}
-    void setDescription(const string& desc) {m_description = desc;}
+    virtual std::string getDescription() {return m_description;}
+    void setDescription(const std::string& desc) {m_description = desc;}
 protected:
     virtual Rcl::Db *getDb();
 private:
@@ -64,6 +65,6 @@ private:
     std::vector<RclDHistoryEntry> m_history;
 };
 
-extern bool historyEnterDoc(RclDynConf *dncf, const string& udi);
+extern bool historyEnterDoc(Rcl::Db *db, RclDynConf *dncf, const Rcl::Doc& doc);
 
 #endif /* _DOCSEQ_H_INCLUDED_ */

src/query/dynconf.cpp

@@ -98,7 +98,7 @@ bool RclDynConf::insertNew(const string &sk, DynConfEntry &n, DynConfEntry &s,
     n.encode(value);
     LOGDEB1("Encoded value [" << value << "] (" << value.size() << ")\n");
     if (!m_data.set(string(nname), value, sk)) {
-	LOGERR("RclDHistory::insertNew: set failed\n");
+	LOGERR("RclDynConf::insertNew: set failed\n");
 	return false;
     }
     return true;

src/query/dynconf.h

@@ -147,7 +147,7 @@ Container<Type, std::allocator<Type>>
 	    out.push_back(entry);
 	}
     }
-    return std::move(out);
+    return out;
 }
 
 template <template <class, class> class Container>
@@ -159,7 +159,7 @@ Container<std::string, std::allocator<std::string>>
     for (const auto& entry : el) {
 	sl.push_back(entry.value);
     }
-    return std::move(sl);
+    return sl;
 }
 
 // Defined subkeys. Values in dynconf.cpp