fix queryBuildAbstract option functionality. Allow substituting %(fieldname) in reslist paragraph format

src/query/docseqdb.cpp

@@ -27,7 +27,9 @@ static char rcsid[] = "@(#$Id: docseqdb.cpp,v 1.9 2008-11-13 10:57:46 dockes Exp
 DocSequenceDb::DocSequenceDb(RefCntr<Rcl::Query> q, const string &t, 
 			     RefCntr<Rcl::SearchData> sdata) 
     : DocSequence(t), m_q(q), m_sdata(sdata), m_fsdata(sdata),
-      m_rescnt(-1), m_filt(false)
+      m_rescnt(-1), m_filt(false),
+      m_queryBuildAbstract(true),
+      m_queryReplaceAbstract(false)
 {
 }
 
@@ -66,7 +68,13 @@ string DocSequenceDb::getAbstract(Rcl::Doc &doc)
     if (!m_q->whatDb())
 	return doc.meta[Rcl::Doc::keyabs];
     string abstract;
-    m_q->whatDb()->makeDocAbstract(doc, m_q.getptr(), abstract);
+
+     if (m_queryBuildAbstract && (doc.syntabs || m_queryReplaceAbstract)) {
+        m_q->whatDb()->makeDocAbstract(doc, m_q.getptr(), abstract);
+    } else {
+        abstract = doc.meta[Rcl::Doc::keyabs];
+    }
+
     return abstract.empty() ? doc.meta[Rcl::Doc::keyabs] : abstract;
 }
 

src/query/docseqdb.h

@@ -43,12 +43,20 @@ class DocSequenceDb : public DocSequence {
     virtual bool canSort() {return false;} 
     virtual bool setSortSpec(DocSeqSortSpec &sortspec);
     virtual string title();
+    virtual void setAbstractParams(bool qba, bool qra)
+    {
+        m_queryBuildAbstract = qba;
+        m_queryReplaceAbstract = qra;
+    }
+
  private:
     RefCntr<Rcl::Query>      m_q;
     RefCntr<Rcl::SearchData> m_sdata;
     RefCntr<Rcl::SearchData> m_fsdata; // Filtered 
     int                      m_rescnt;
     bool                     m_filt;
+    bool                     m_queryBuildAbstract;
+    bool                     m_queryReplaceAbstract;
 };
 
 #endif /* _DOCSEQDB_H_INCLUDED_ */

src/query/reslistpager.cpp

@@ -201,12 +201,8 @@ void ResListPager::displayPage()
 	    sizebuf = displayableBytes(fsize);
 	}
 
-	string abstract;
-	if (m_queryBuildAbstract && (doc.syntabs || m_queryReplaceAbstract)) {
-	    abstract = m_docSource->getAbstract(doc);
-	} else {
-	    abstract = doc.meta[Rcl::Doc::keyabs];
-	}
+	string abstract = m_docSource->getAbstract(doc);
+
 	// No need to call escapeHtml(), plaintorich handles it
 	list<string> lr;
 	m_hiliter->set_inputhtml(false);
@@ -237,20 +233,23 @@ void ResListPager::displayPage()
 	    chunk += "<p>";
 
 	// Configurable stuff
-	map<char,string> subs;
-	subs['A'] = !richabst.empty() ? richabst + "<br>" : "";
-	subs['D'] = datebuf;
-	subs['I'] = iconpath;
-	subs['i'] = doc.ipath;
-	subs['K'] = !doc.meta[Rcl::Doc::keykw].empty() ? 
+	map<string,string> subs;
+	subs["A"] = !richabst.empty() ? richabst + "<br>" : "";
+	subs["D"] = datebuf;
+	subs["I"] = iconpath;
+	subs["i"] = doc.ipath;
+	subs["K"] = !doc.meta[Rcl::Doc::keykw].empty() ? 
 	    escapeHtml(doc.meta[Rcl::Doc::keykw]) + "<br>" : "";
-	subs['L'] = linksbuf;
-	subs['N'] = numbuf;
-	subs['M'] = doc.mimetype;
-	subs['R'] = perbuf;
-	subs['S'] = sizebuf;
-	subs['T'] = escapeHtml(doc.meta[Rcl::Doc::keytt]);
-	subs['U'] = url;
+	subs["L"] = linksbuf;
+	subs["N"] = numbuf;
+	subs["M"] = doc.mimetype;
+	subs["R"] = perbuf;
+	subs["S"] = sizebuf;
+	subs["T"] = escapeHtml(doc.meta[Rcl::Doc::keytt]);
+	subs["U"] = url;
+
+        // Let %(xx) access all metadata.
+        subs.insert(doc.meta.begin(), doc.meta.end());
 
 	string formatted;
 	pcSubst(parFormat(), formatted, subs);
@@ -281,10 +280,13 @@ void ResListPager::displayPage()
     append(chunk);
 }
 
+// Default implementations for things that should be implemented by 
+// specializations
 string ResListPager::nextUrl()
 {
     return "n-1";
 }
+
 string ResListPager::prevUrl()
 {
     return "p-1";
@@ -298,7 +300,6 @@ string ResListPager::iconPath(const string& mtype)
     return iconpath;
 }
 
-// Default implementations for things that should be re-implemented by our user.
 bool ResListPager::append(const string& data)
 {
     fprintf(stderr, "%s", data.c_str());

src/query/reslistpager.h

@@ -16,12 +16,6 @@ class PlainToRich;
 class ResListPager {
 public:
     ResListPager(int pagesize=10) : m_pagesize(pagesize) {initall();}
-    ResListPager(RefCntr<DocSequence> src, int pagesize)
-	: m_pagesize(pagesize)
-    {
-	initall();
-	m_docSource = src;
-    }
     virtual ~ResListPager() {}
 
     void setHighLighter(PlainToRich *ptr) {m_hiliter = ptr;}
@@ -79,8 +73,6 @@ private:
 	m_winfirst = -1;
 	m_hasNext = false;
 	m_respage.clear();
-	m_queryBuildAbstract = true;
-	m_queryReplaceAbstract = false;
 	m_hiliter = 0;
     }
 
@@ -91,8 +83,6 @@ private:
 
     bool                 m_hasNext;
     vector<ResListEntry> m_respage;
-    bool                 m_queryBuildAbstract;
-    bool                 m_queryReplaceAbstract;
     PlainToRich         *m_hiliter;
 };