--- a/src/query/docseq.h
+++ b/src/query/docseq.h
@@ -1,6 +1,6 @@
#ifndef _DOCSEQ_H_INCLUDED_
#define _DOCSEQ_H_INCLUDED_
-/* @(#$Id: docseq.h,v 1.1 2005-11-25 10:02:36 dockes Exp $ (C) 2004 J.F.Dockes */
+/* @(#$Id: docseq.h,v 1.2 2005-11-28 15:31:01 dockes Exp $ (C) 2004 J.F.Dockes */
#include "rcldb.h"
#include "history.h"
@@ -12,7 +12,8 @@
*/
class DocSequence {
public:
- virtual bool getDoc(int num, Rcl::Doc &doc, int *percent) = 0;
+ virtual bool getDoc(int num, Rcl::Doc &doc, int *percent, string *sh = 0)
+ = 0;
virtual int getResCnt() = 0;
virtual std::string title() = 0;
};
@@ -24,7 +25,7 @@
public:
DocSequenceDb(Rcl::Db *d) : db(d) {}
virtual ~DocSequenceDb() {}
- virtual bool getDoc(int num, Rcl::Doc &doc, int *percent);
+ virtual bool getDoc(int num, Rcl::Doc &doc, int *percent, string * = 0);
virtual int getResCnt();
virtual std::string title() {return string("Query results");}
private:
@@ -34,20 +35,21 @@
/** A DocSequence coming from the history file */
class DocSequenceHistory : public DocSequence {
public:
- DocSequenceHistory(Rcl::Db *d, RclQHistory *h)
- : db(d), hist(h), prevnum(-1) {}
+ DocSequenceHistory(Rcl::Db *d, RclDHistory *h)
+ : db(d), hist(h), prevnum(-1), prevtime(-1) {}
virtual ~DocSequenceHistory() {}
- virtual bool getDoc(int num, Rcl::Doc &doc, int *percent);
+ virtual bool getDoc(int num, Rcl::Doc &doc, int *percent, string *sh = 0);
virtual int getResCnt();
virtual std::string title() {return string("Document history");}
private:
Rcl::Db *db;
- RclQHistory *hist;
+ RclDHistory *hist;
int prevnum;
+ long prevtime;
- std::list< std::pair<std::string, std::string> > hlist;
- std::list< std::pair<std::string, std::string> >::const_iterator it;
+ std::list<RclDHistoryEntry> hlist;
+ std::list<RclDHistoryEntry>::const_iterator it;
};
#endif /* _DOCSEQ_H_INCLUDED_ */