Changeset 2967

Timestamp:

2002-02-15T13:51:52+13:00 (22 years ago)

Author:

paradis

Message:

new metadata command [Summary]

Location:

trunk/gsdl/src/recpt

Files:

• formattools.cpp (modified) (5 diffs)
• formattools.h (modified) (1 diff)
• summarise.cpp (added)
• summarise.h (added)
• win32.mak (modified) (3 diffs)

trunk/gsdl/src/recpt/formattools.cpp

@@ -27 +27 @@
 #include "cgiutils.h"
 #include "OIDtools.h"
+#include "summarise.h"
 
 #include <assert.h>
@@ -39 +40 @@
 static bool parse_action (text_t::const_iterator &here, const text_t::const_iterator &end, 
               format_t *formatlistptr, text_tset &metadata, bool &getParents);
+
+text_t format_summary (const text_t& collection, recptproto* collectproto,
+              ResultDocInfo_t &docinfo, displayclass &disp, 
+              const text_t &text, bool highlight,
+               ostream& logout);
+
 
 void metadata_t::clear() {
@@ -530 +537 @@
     formatlistptr->command = comEndHighlight;
 
+  else if (meta == "Summary")
+    formatlistptr->command = comSummary;
+
   else {
     formatlistptr->command = comMeta;
@@ -959 +969 @@
   case comRel: //if [RelatedDocuments] appears in format string, collect relation data
     return get_related_docs(collection, collectproto, docinfo, logout);
+  case comSummary:
+    return format_summary(collection,collectproto,docinfo,disp,text,highlight,logout);
   case comMeta:
 
@@ -1077 +1089 @@
                   text, logout);
 }
+
+
+/* FUNCTION NAME: format_summary
+ * DESC: this is invoked when a [Summary] special metadata is processed.
+ * RETURNS: a query-biased summary for the document */
+
+text_t format_summary (const text_t& collection, recptproto* collectproto,
+              ResultDocInfo_t &docinfo, displayclass &disp, 
+              const text_t &text, bool highlight,
+              ostream& logout) {
+  text_t textToSummarise, query;
+  if(text.empty()) { // get document text
+      DocumentRequest_t docrequest;
+      DocumentResponse_t docresponse;
+      comerror_t err;
+      docrequest.OID = docinfo.OID;
+      collectproto->get_document (collection, docrequest, docresponse, err, logout);
+      textToSummarise = docresponse.doc;
+  } else // in practice, this would not happen, because text is only 
+         // loaded with the [Text] command
+      textToSummarise = text;
+  disp.expandstring("_cgiargq_",query);
+  return summarise(textToSummarise,query,80);
+}

trunk/gsdl/src/recpt/formattools.h

@@ -34 +34 @@
 
 enum command_t {comIf, comOr, comMeta, comText, comLink, comEndLink, comNum, comIcon, 
-        comDoc, comHighlight, comEndHighlight, comRel, comHref};
+        comDoc, comHighlight, comEndHighlight, comRel, comHref, comSummary};
 enum pcommand_t {pNone, pImmediate, pTop, pAll};
 enum dcommand_t {dMeta, dText};

trunk/gsdl/src/recpt/win32.mak

@@ -79 +79 @@
         datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
         htmlbrowserclass.h historydb.h phindbrowserclass.h collectoraction.h \
-        nullproto.h argdb.h browseaction.h browseactiontools.h phindaction.h
+        nullproto.h argdb.h browseaction.h browseactiontools.h phindaction.h \
+        summarise.h
 
 CGIHEADERS = cgiwrapper.h
@@ -95 +96 @@
         invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \
         historydb.cpp phindbrowserclass.cpp collectoraction.cpp nullproto.cpp \
-        argdb.cpp browseaction.cpp browseactiontools.cpp phindaction.cpp
+        argdb.cpp browseaction.cpp browseactiontools.cpp phindaction.cpp \
+        summarise.cpp
 
 CGISOURCES = librarymain.cpp cgiwrapper.cpp
@@ -111 +113 @@
         invbrowserclass.obj pagedbrowserclass.obj htmlbrowserclass.obj \
         historydb.obj phindbrowserclass.obj collectoraction.obj nullproto.obj \
-        argdb.obj browseaction.obj browseactiontools.obj phindaction.obj
+        argdb.obj browseaction.obj browseactiontools.obj phindaction.obj \
+        summarise.obj
 
 CGIOBJECTS = librarymain.obj cgiwrapper.obj