Changeset 756

Timestamp:

1999-11-02T10:17:31+13:00 (25 years ago)

Author:

sjboddie

Message:

changes to arguments of many functions

Location:

trunk/gsdl/src/recpt

Files:

• extlinkaction.cpp (modified) (6 diffs)
• extlinkaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/extlinkaction.cpp

@@ -57 +57 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-
   arg_ainfo.shortname = "href";
   arg_ainfo.longname = "URL of external link";
@@ -64 +63 @@
   arg_ainfo.argdefault = "";
   arg_ainfo.savedarginfo = cgiarginfo::can;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "rl";
+  arg_ainfo.longname = "is relative link";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::none;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, arg_ainfo);
 
@@ -73 +80 @@
 
 
-void extlinkaction::get_cgihead_info (cgiargsclass &args, response_t &response,
-                     text_t &response_data, ostream &/*logout*/) 
+void extlinkaction::get_cgihead_info (cgiargsclass &args, recptprotolistclass * /*protos*/,
+                      response_t &response, text_t &response_data, 
+                      ostream &/*logout*/) 
 {
   if (args["el"] == "direct")
@@ -90 +98 @@
 
 
-void extlinkaction::define_internal_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &disp, 
-                         cgiargsclass &args, recptproto *collectproto, 
-                         ostream &/*logout*/) {
+void extlinkaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
+                        recptprotolistclass * /*protos*/, 
+                        ostream &/*logout*/) {
   
   // define_internal_macros sets the following macros:
@@ -98 +106 @@
   // _nexturl_             link to external page
   // _prevdoc_             link to previous document
-
-  // can't do anything if collectproto is null (i.e. no collection was specified)
-  if (collectproto == NULL) return;
   
   disp.setmacro("nexturl", "extlink", args["href"]);
@@ -107 +112 @@
 
 
-bool extlinkaction::do_action (cgiargsclass &args, const ColInfoResponse_t &/*collectinfo*/,
-                            recptproto * /*collectproto*/, displayclass &disp,
-                            outconvertclass &outconvert, ostream &textout,
-                            ostream &/*logout*/) {
+bool extlinkaction::do_action (cgiargsclass &args, recptprotolistclass * /*protos*/, 
+                   browsermapclass * /*browsers*/, displayclass &disp,
+                   outconvertclass &outconvert, ostream &textout,
+                   ostream &/*logout*/) {
 
   if (args["el"] != "direct")

trunk/gsdl/src/recpt/extlinkaction.h

@@ -38 +38 @@
 
   text_t get_action_name () {return "extlink";}
-  void get_cgihead_info (cgiargsclass &args, response_t &response,
-                         text_t &response_data, ostream &logout);
+  void get_cgihead_info (cgiargsclass &args, recptprotolistclass *protos,
+             response_t &response, text_t &response_data, 
+             ostream &logout);
 
-  void define_internal_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 
-                   cgiargsclass &args, recptproto *collectproto, 
+  void define_internal_macros (displayclass &disp, cgiargsclass &args, 
+                   recptprotolistclass *protos, 
                    ostream &logout);
 
-  bool do_action (cgiargsclass &args, const ColInfoResponse_t &collectinfo, 
-          recptproto *collectproto, displayclass &disp, 
-          outconvertclass &outconvert, ostream &textout, 
+  bool do_action (cgiargsclass &args, recptprotolistclass *protos, 
+          browsermapclass *browsers, displayclass &disp,
+          outconvertclass &outconvert, ostream &textout,
           ostream &logout);