add functions and interface to display the duplicates of a result document

src/rcldb/rcldb.h

@@ -353,6 +353,9 @@ class Db {
      */
     bool getDoc(const string &udi, Doc &doc);
 
+    /** Get duplicates (md5) of document */
+    bool docDups(const Doc& idoc, std::vector<Doc>& odocs);
+
     /* The following are mainly for the aspell module */
     /** Whole term list walking. */
     TermIter *termWalkOpen();

src/rcldb/rcldups.cpp

@@ -0,0 +1,117 @@
+/* Copyright (C) 2013 J.F.Dockes
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+////////////////////////////////////////////////////////////////////
+
+/** Retrieve the dups of a given document. The input has to be a query result
+  * because we use the xdocid */
+
+#include "autoconfig.h"
+
+#include <string>
+using namespace std;
+
+#include <xapian.h>
+
+#include "debuglog.h"
+#include "rcldb.h"
+#include "rcldb_p.h"
+#include "xmacros.h"
+#include "md5.h"
+#include "searchdata.h"
+#include "rclquery.h"
+
+namespace Rcl {
+
+// File name wild card expansion. This is a specialisation ot termMatch
+bool Db::docDups(const Doc& idoc, vector<Doc>& odocs)
+{
+    if (m_ndb == 0) {
+	LOGERR(("Db::docDups: no db\n"));
+	return false;
+    }
+    if (idoc.xdocid == 0) {
+	LOGERR(("Db::docDups: null xdocid in input doc\n"));
+	return false;
+    }
+    // Get the xapian doc
+    Xapian::Document xdoc;
+    XAPTRY(xdoc = m_ndb->xrdb.get_document(Xapian::docid(idoc.xdocid)), 
+	   m_ndb->xrdb, m_reason);
+    if (!m_reason.empty()) {
+	LOGERR(("Db::docDups: xapian error: %s\n", m_reason.c_str()));
+	return false;
+    }
+
+    // Get the md5
+    string digest;
+    XAPTRY(digest = xdoc.get_value(VALUE_MD5), m_ndb->xrdb, m_reason);
+    if (!m_reason.empty()) {
+	LOGERR(("Db::docDups: xapian error: %s\n", m_reason.c_str()));
+	return false;
+    }
+    if (digest.empty()) {
+	LOGDEB(("Db::docDups: doc has no md5\n"));
+	return false;
+    }
+    string md5;
+    MD5HexPrint(digest, md5);
+
+    SearchData *sdp = new SearchData();
+    RefCntr<SearchData> sd(sdp);
+    SearchDataClauseSimple *sdc = 
+	new SearchDataClauseSimple(SCLT_AND, md5, "rclmd5");
+    sdc->addModifier(SearchDataClause::SDCM_CASESENS);
+    sdc->addModifier(SearchDataClause::SDCM_DIACSENS);
+    sd->addClause(sdc);
+    Query query(this);
+    query.setCollapseDuplicates(0);
+    if (!query.setQuery(sd)) {
+	LOGERR(("Db::docDups: setQuery failed\n"));
+	return false;
+    }
+    int cnt = query.getResCnt();
+    for (int i = 0; i < cnt; i++) {
+	Doc doc;
+	if (!query.getDoc(i, doc)) {
+	    LOGERR(("Db::docDups: getDoc failed at %d (cnt %d)\n", i, cnt));
+	    return false;
+	}
+	odocs.push_back(doc);
+    }
+    return true;
+}
+
+#if 0
+    {
+	vector<Doc> dups;
+	bool ret;
+	LOGDEB(("DOCDUPS\n"));
+	ret = m_db->docDups(doc, dups);
+	if (!ret) {
+	    LOGDEB(("docDups failed\n"));
+	} else if (dups.size() == 1) {
+	    LOGDEB(("No dups\n"));
+	} else {
+	    for (unsigned int i = 0; i < dups.size(); i++) {
+		LOGDEB(("Dup: %s\n", dups[i].url.c_str()));
+	    }
+	}
+    }
+#endif
+
+}

src/rcldb/rclquery.cpp

@@ -447,15 +447,17 @@ bool Query::getDoc(int xapi, Doc &doc)
 
     doc.pc = pc;
     char buf[200];
-    if (collapsecount>0) {
-	sprintf(buf,"%3d%% (%d)", pc, collapsecount+1);
+    if (collapsecount > 0) {
+	sprintf(buf,"%3d%% (%d)", pc, collapsecount + 1);
     } else {
 	sprintf(buf,"%3d%%", pc);
     }
     doc.meta[Doc::keyrr] = buf;
 
-    sprintf(buf, "%d", collapsecount);
-    doc.meta[Rcl::Doc::keycc] = buf;
+    if (collapsecount > 0) {
+	sprintf(buf, "%d", collapsecount);
+	doc.meta[Rcl::Doc::keycc] = buf;
+    }
 
     // Parse xapian document's data and populate doc fields
     return m_db->m_ndb->dbDataToRclDoc(docid, data, doc);