--- a/src/query/docseq.cpp
+++ b/src/query/docseq.cpp
@@ -1,5 +1,5 @@
#ifndef lint
-static char rcsid[] = "@(#$Id: docseq.cpp,v 1.9 2006-09-13 14:57:56 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: docseq.cpp,v 1.10 2007-01-19 10:32:39 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -22,70 +22,17 @@
#include "docseq.h"
-bool DocSequenceDb::getDoc(int num, Rcl::Doc &doc, int *percent, string *sh)
+int DocSequence::getSeqSlice(int offs, int cnt, vector<ResListEntry>& result)
{
- if (sh) sh->erase();
- return m_db ? m_db->getDoc(num, doc, percent) : false;
+ int ret = 0;
+ for (int num = offs; num < offs + cnt; num++, ret++) {
+ result.push_back(ResListEntry());
+ if (!getDoc(num, result.back().doc, &result.back().percent,
+ &result.back().subHeader)) {
+ result.pop_back();
+ return ret;
+ }
+ }
+ return ret;
}
-int DocSequenceDb::getResCnt()
-{
- if (!m_db)
- return -1;
- if (m_rescnt < 0) {
- m_rescnt= m_db->getResCnt();
- }
- return m_rescnt;
-}
-
-void DocSequenceDb::getTerms(list<string> &terms)
-{
- if (!m_db)
- return;
- m_db->getQueryTerms(terms);
-}
-
-bool DocSequenceHistory::getDoc(int num, Rcl::Doc &doc, int *percent,
- string *sh)
-{
- // Retrieve history list
- if (!m_hist)
- return false;
- if (m_hlist.empty())
- m_hlist = m_hist->getDocHistory();
-
- if (num < 0 || num >= (int)m_hlist.size())
- return false;
- int skip;
- if (m_prevnum >= 0 && num >= m_prevnum) {
- skip = num - m_prevnum;
- } else {
- skip = num;
- m_it = m_hlist.begin();
- m_prevtime = -1;
- }
- m_prevnum = num;
- while (skip--)
- m_it++;
- if (percent)
- *percent = 100;
- if (sh) {
- if (m_prevtime < 0 || abs(m_prevtime - m_it->unixtime) > 86400) {
- m_prevtime = m_it->unixtime;
- time_t t = (time_t)(m_it->unixtime);
- *sh = string(ctime(&t));
- // Get rid of the final \n in ctime
- sh->erase(sh->length()-1);
- } else
- sh->erase();
- }
- return m_db->getDoc(m_it->fn, m_it->ipath, doc, percent);
-}
-
-int DocSequenceHistory::getResCnt()
-{
- if (m_hlist.empty())
- m_hlist = m_hist->getDocHistory();
- return m_hlist.size();
-}
-