Changeset 12044 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

2006-07-07T00:52:39+12:00 (18 years ago)

Author:

sjboddie

Message:

Wrapped browsetools up into a class and renamed it browsetoolsclass. The
intention of this change is only to make it easier to customise, and it
shouldn't make any functional difference. One exception to this is the
removal of some old code (notably some code for RelatedDocs) which is
now obsolete (I hope).

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -27 +27 @@
 
 #include "documentaction.h"
-#include "browsetools.h"
 #include "OIDtools.h"
 #include "querytools.h"
@@ -33 +32 @@
 #include "gsdltools.h"
 #include "highlighttext.h"
+#include "browsetoolsclass.h"
 
 documentaction::documentaction () {
   recpt = NULL;
-
 
   // this action uses cgi variables "a", "d", "cl",
@@ -181 +180 @@
 }
 
-documentaction::~documentaction () {
+documentaction::~documentaction()
+{
 }
 
@@ -984 +984 @@
 
 
-bool documentaction::do_action (cgiargsclass &args, recptprotolistclass *protos, 
-                browsermapclass *browsers, displayclass &disp, 
-                outconvertclass &outconvert, ostream &textout, 
-                ostream &logout) {
- 
+bool documentaction::do_action(cgiargsclass &args, recptprotolistclass *protos, 
+                               browsermapclass *browsers, displayclass &disp, 
+                               outconvertclass &outconvert, ostream &textout, 
+                               ostream &logout)
+{
   // must have a valid collection server
   recptproto *collectproto = protos->getrecptproto (args["c"], logout);
@@ -1036 +1036 @@
       
     // output the table of contents
-    output_toc (args, browsers, formatinfo, collectproto, 
-        disp, outconvert, textout, logout);
+    browsetoolsclass b;
+    b.output_toc(args, browsers, formatinfo, collectproto, 
+                 disp, outconvert, textout, logout);
    
     if (formatinfo.DocumentArrowsTop && !args["d"].empty()) {
@@ -1091 +1092 @@
 
       if (formatinfo.AllowExtendedOptions) {
-    load_extended_options(options, args, browsers, formatinfo, 
-                  collectproto, disp, outconvert, logout);
+        browsetoolsclass b;
+    b.load_extended_options(options, args, browsers, formatinfo, 
+                                collectproto, disp, outconvert, logout);
       }