Changeset 760


Ignore:
Timestamp:
1999-11-02T10:56:32+13:00 (25 years ago)
Author:
sjboddie
Message:

changes to arguments of many functions

Location:
trunk/gsdl/src/recpt
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/src/recpt/buildaction.cpp

    r723 r760  
    2929#include "fileutil.h"
    3030#include "buildaction.h"
     31#include "gsdlhome.h"
    3132
    3233///////////////
    … …  
    8687}
    8788
    88 void buildaction::get_cgihead_info (cgiargsclass &/*args*/, response_t &response,
    89                      text_t &response_data, ostream &/*logout*/) {
     89void buildaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
     90                    response_t &response,text_t &response_data,
     91                    ostream &/*logout*/) {
    9092
    9193  response = content;
    … …  
    9395}
    9496
    95 void buildaction::define_internal_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &disp,
    96                       cgiargsclass &args, recptproto * /*collectproto*/,
    97                       ostream &logout) {
    98 
    99   // make sure we know about a receptionist
    100   if (recpt == NULL) {
    101     logout << "The page action does not contain information\n"
    102        << "about any receptionists. The method set_receptionist\n"
    103        <<   "was probably not called from the module which instantiated\n"
    104        <<   "this page action.\n";
    105     return;
    106   }
    107 
    108   recptprotolistclass *rprotolist = recpt->get_recptprotolist_ptr ();
    109   if (rprotolist == NULL) return;
    110  
    111   const recptconf &rcinfo = recpt->get_configinfo ();
     97void buildaction::define_internal_macros (displayclass &disp, cgiargsclass &args,
     98                      recptprotolistclass *protos, ostream &logout) {
    11299
    113100  // build up javascript and HTML code useful in web forms
    … …  
    123110  disp.setmacro("bcargfirsttime","build","false");
    124111
    125   recptprotolistclass::iterator rprotolist_here = rprotolist->begin();
    126   recptprotolistclass::iterator rprotolist_end = rprotolist->end();
     112  recptprotolistclass::iterator rprotolist_here = protos->begin();
     113  recptprotolistclass::iterator rprotolist_end = protos->end();
    127114  while (rprotolist_here != rprotolist_end) {
    128115    if ((*rprotolist_here).p != NULL) {
    … …  
    191178        // check to see if the "collection" is writable
    192179        text_t cfg_fname
    193           = filename_cat(rcinfo.gsdlhome,"collect",*collist_here,"etc","collect.cfg");
     180          = filename_cat(GSDL_GSDLHOME,"collect",*collist_here,"etc","collect.cfg");
    194181        if (!file_writable(cfg_fname))
    195182          {
    … …  
    280267      // read in collect.cfg     
    281268      text_t cfg_fname
    282     = filename_cat(rcinfo.gsdlhome,"collect",dirname,"etc","collect.cfg");
     269    = filename_cat(GSDL_GSDLHOME,"collect",dirname,"etc","collect.cfg");
    283270      ifstream cfg_ifs (cfg_fname.getcstr(), ios::in | ios::nocreate);
    284271      if (cfg_ifs)
    … …  
    306293}
    307294
    308 void buildaction::define_external_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &/*disp*/,
    309                       cgiargsclass &/*args*/, recptproto * /*collectproto*/,
    310                       ostream &/*logout*/) {
    311 }
    312 
    313 bool buildaction::do_action (cgiargsclass &args, const ColInfoResponse_t &/*collectinfo*/,
    314                  recptproto *collectproto, displayclass &disp,
     295bool buildaction::do_action (cgiargsclass &args, recptprotolistclass * /*protos*/,
     296                 browsermapclass * /*browsers*/, displayclass &disp,
    315297                 outconvertclass &outconvert, ostream &textout,
    316298                 ostream &logout) {
    317299
    318300
    319 
    320 
    321301  if (args["bca"] == "newcol") {
    322     return do_newcol (args, collectproto, disp, outconvert, textout, logout);
     302    return do_newcol (args, disp, outconvert, textout, logout);
    323303  }
    324304  else if (args["bca"] == "editcol") {
    325     return do_editcol (args, collectproto, disp, outconvert, textout, logout);
     305    return do_editcol (args, disp, outconvert, textout, logout);
    326306  }
    327307  else if (args["bca"] == "buildcol") {
    328     return do_buildcol (args, collectproto, disp, outconvert, textout, logout);
     308    return do_buildcol (args, disp, outconvert, textout, logout);
    329309  }
    330310  else if (args["bca"] == "buildstatus") {
    331     return do_buildstatus (args, collectproto, disp, outconvert, textout, logout);
     311    return do_buildstatus (args, disp, outconvert, textout, logout);
    332312  }
    333313  else if (args["bca"] == "delcol") {
    334     return do_delcol (args, collectproto, disp, outconvert, textout, logout);
     314    return do_delcol (args, disp, outconvert, textout, logout);
    335315  }
    336316  else if (args["bca"] == "mess") {
    337     return do_mess (args, collectproto, disp, outconvert, textout, logout);
     317    return do_mess (args, disp, outconvert, textout, logout);
    338318  }
    339319
    … …  
    346326
    347327
    348 bool buildaction::do_newcol  (cgiargsclass &args, recptproto */*collectproto*/,
    349                   displayclass &disp, outconvertclass &outconvert,
    350                   ostream &textout, ostream &/*logout*/) {
     328bool buildaction::do_newcol  (cgiargsclass &args, displayclass &disp,
     329                  outconvertclass &outconvert, ostream &textout,
     330                  ostream &/*logout*/) {
    351331
    352332  text_tarray wizard_split;
    … …  
    364344
    365345
    366 bool buildaction::do_editcol (cgiargsclass &/*args*/, recptproto */*collectproto*/,
    367                   displayclass &disp, outconvertclass &outconvert,
    368                   ostream &textout, ostream &/*logout*/) {
     346bool buildaction::do_editcol (cgiargsclass &/*args*/, displayclass &disp,
     347                  outconvertclass &outconvert, ostream &textout,
     348                  ostream &/*logout*/) {
    369349
    370350  textout << outconvert << disp << ("_build:header_(_build:headmesseditcol_)\n")
    … …  
    375355}
    376356
    377 bool buildaction::do_buildcol (cgiargsclass &args, recptproto */*collectproto*/,
    378                   displayclass &disp, outconvertclass &outconvert,
    379                   ostream &textout, ostream &logout) {
     357bool buildaction::do_buildcol (cgiargsclass &args, displayclass &disp,
     358                   outconvertclass &outconvert, ostream &textout,
     359                  ostream &logout) {
    380360
    381361
    … …  
    408388      textout << outconvert << disp << headmess << content << "_build:framefooter_\n";
    409389
    410       const recptconf &rcinfo = recpt->get_configinfo ();
    411       text_t cmd = filename_cat(rcinfo.gsdlhome,"cgi-bin","webpage_buildcol.pl");
     390      text_t cmd = filename_cat(GSDL_GSDLHOME,"cgi-bin","webpage_buildcol.pl");
    412391      cmd += " gsdlhome=\""+args["gsdlhome"]+"\" httpbuild=\""+args["httpbuild"]+"\"";
    413392      cmd += " bc1copydata=\""+args["bc1copydata"]+"\"";
    … …  
    422401}
    423402
    424 bool buildaction::do_buildstatus (cgiargsclass &args, recptproto */*collectproto*/,
    425                   displayclass &disp, outconvertclass &outconvert,
    426                   ostream &textout, ostream &/*logout*/) {
     403bool buildaction::do_buildstatus (cgiargsclass &args, displayclass &disp,
     404                  outconvertclass &outconvert, ostream &textout,
     405                  ostream &/*logout*/) {
    427406
    428407  disp.setmacro("contentpara","buildstatus", args["mess"]);
    … …  
    435414}
    436415
    437 bool buildaction::do_delcol  (cgiargsclass &/*args*/, recptproto */*collectproto*/,
    438                   displayclass &disp, outconvertclass &outconvert,
    439                   ostream &textout, ostream &/*logout*/) {
     416bool buildaction::do_delcol  (cgiargsclass &/*args*/, displayclass &disp,
     417                  outconvertclass &outconvert, ostream &textout,
     418                  ostream &/*logout*/) {
    440419
    441420  textout << outconvert << disp << ("_build:header_(_build:headmessdelcol_)\n")
    … …  
    447426
    448427
    449 bool buildaction::do_mess  (cgiargsclass &args, recptproto */*collectproto*/,
    450                 displayclass &disp, outconvertclass &outconvert,
    451                 ostream &textout, ostream &/*logout*/) {
     428bool buildaction::do_mess  (cgiargsclass &args, displayclass &disp,
     429                outconvertclass &outconvert, ostream &textout,
     430                ostream &/*logout*/) {
    452431
    453432  disp.setmacro("contentpara","buildmess", args["mess"]);

  • trunk/gsdl/src/recpt/buildaction.h

    r723 r760  
    4040
    4141  text_t get_action_name () {return "bc";}
    42   void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
    4342 
    4443  bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args,
    4544              ostream &logout);
    46   void get_cgihead_info (cgiargsclass &args, response_t &response,
    47              text_t &response_data, ostream &logout);
     45
     46
     47  void get_cgihead_info (cgiargsclass &args, recptprotolistclass *protos,
     48             response_t &response,text_t &response_data,
     49             ostream &logout);
    4850 
    49   void define_internal_macros (const ColInfoResponse_t &collectinfo, displayclass &disp,
    50                    cgiargsclass &args, recptproto *collectproto,
    51                    ostream &logout);
    52   void define_external_macros (const ColInfoResponse_t &collectinfo, displayclass &disp,
    53                    cgiargsclass &args, recptproto *collectproto,
    54                    ostream &logout);
     51  void define_internal_macros (displayclass &disp, cgiargsclass &args,
     52                   recptprotolistclass *protos, ostream &logout);
    5553 
    56   bool do_action (cgiargsclass &args, const ColInfoResponse_t &collectinfo,
    57           recptproto *collectproto, displayclass &disp,
     54  bool do_action (cgiargsclass &args, recptprotolistclass *protos,
     55          browsermapclass *browsers, displayclass &disp,
    5856          outconvertclass &outconvert, ostream &textout,
    5957          ostream &logout);
    6058
    6159protected:
    62   bool do_newcol (cgiargsclass &args, recptproto *collectproto,
    63           displayclass &disp, outconvertclass &outconvert,
    64           ostream &textout, ostream &logout);
    65   bool do_editcol (cgiargsclass &args, recptproto *collectproto,
    66            displayclass &disp, outconvertclass &outconvert,
    67            ostream &textout, ostream &logout);
    68   bool do_buildcol (cgiargsclass &args, recptproto *collectproto,
    69             displayclass &disp, outconvertclass &outconvert,
    70             ostream &textout, ostream &logout);
    71   bool do_buildstatus (cgiargsclass &args, recptproto *collectproto,
    72                displayclass &disp, outconvertclass &outconvert,
    73                ostream &textout, ostream &logout);
    74   bool do_delcol (cgiargsclass &args, recptproto *collectproto,
    75           displayclass &disp, outconvertclass &outconvert,
    76           ostream &textout, ostream &logout);
    77   bool do_mess (cgiargsclass &args, recptproto *collectproto,
    78         displayclass &disp, outconvertclass &outconvert,
    79         ostream &textout, ostream &logout);
     60  bool do_newcol (cgiargsclass &args, displayclass &disp,
     61          outconvertclass &outconvert, ostream &textout,
     62          ostream &logout);
     63
     64  bool do_editcol (cgiargsclass &args, displayclass &disp,
     65           outconvertclass &outconvert, ostream &textout,
     66           ostream &logout);
     67
     68  bool do_buildcol (cgiargsclass &args, displayclass &disp,
     69            outconvertclass &outconvert, ostream &textout,
     70            ostream &logout);
     71
     72  bool do_buildstatus (cgiargsclass &args, displayclass &disp,
     73               outconvertclass &outconvert, ostream &textout,
     74               ostream &logout);
     75
     76  bool do_delcol (cgiargsclass &args, displayclass &disp,
     77          outconvertclass &outconvert, ostream &textout,
     78          ostream &logout);
     79
     80  bool do_mess (cgiargsclass &args, displayclass &disp,
     81        outconvertclass &outconvert, ostream &textout,
     82        ostream &logout);
    8083
    8184};

  • trunk/gsdl/src/recpt/pingaction.cpp

    r533 r760  
    2828/*
    2929   $Log$
     30   Revision 1.5  1999/11/01 21:56:32  sjboddie
     31   changes to arguments of many functions
     32
    3033   Revision 1.4  1999/09/07 04:56:57  sjboddie
    3134   added GPL notice
    … …  
    6164}
    6265
    63 void pingaction::get_cgihead_info (cgiargsclass &/*args*/, response_t &response,
    64                    text_t &response_data, ostream &/*logout*/) {
     66void pingaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
     67                   response_t &response, text_t &response_data,
     68                   ostream &/*logout*/) {
    6569  response = content;
    6670  response_data = "text/html";
    … …  
    6872
    6973
    70 bool pingaction::do_action (cgiargsclass &args, const ColInfoResponse_t &/*collectinfo*/,
    71                 recptproto *collectproto, displayclass &/*disp*/,
     74bool pingaction::do_action (cgiargsclass &args, recptprotolistclass *protos,
     75                browsermapclass * /*browsers*/, displayclass &/*disp*/,
    7276                outconvertclass &outconvert, ostream &textout,
    7377                ostream &logout) {
    … …  
    7579  comerror_t err;
    7680 
     81  recptproto *collectproto = protos->getrecptproto (args["c"], logout);
    7782  if (!args["c"].empty() && (collectproto != NULL)) {
    7883    collectproto->ping (args["c"], wassuccess, err, logout);

  • trunk/gsdl/src/recpt/pingaction.h

    r533 r760  
    4040
    4141  text_t get_action_name () {return "ping";}
    42   void get_cgihead_info (cgiargsclass &args, response_t &response,
    43              text_t &response_data, ostream &logout);
    44   bool do_action (cgiargsclass &args, const ColInfoResponse_t &collectinfo,
    45           recptproto *collectproto, displayclass &disp,
     42
     43  void get_cgihead_info (cgiargsclass &args, recptprotolistclass *protos,
     44             response_t &response, text_t &response_data,
     45             ostream &logout);
     46
     47  bool do_action (cgiargsclass &args, recptprotolistclass *protos,
     48          browsermapclass *browsers, displayclass &disp,
    4649          outconvertclass &outconvert, ostream &textout,
    4750          ostream &logout);

  • trunk/gsdl/src/recpt/receptionist.cpp

    r731 r760  
    2828/*
    2929   $Log$
     30   Revision 1.38  1999/11/01 21:49:34  sjboddie
     31   changes to arguments of many functions
     32
    3033   Revision 1.37  1999/10/20 03:55:03  sjboddie
    3134   yet another problem with calling browserclass
    … …  
    807810  action *a = actions.getaction (args["a"]);
    808811  if (a != NULL) {
    809     a->get_cgihead_info (args, response, response_data, logout);
     812    a->get_cgihead_info (args, &protocols, response, response_data, logout);
    810813
    811814  } else {
    … …  
    845848  outconverter->reset();
    846849
    847   text_t &collection = args["c"];
    848   recptproto *collectproto = NULL;
    849   if (!collection.empty()) {
    850     // decide on the protocol used for communicating with
    851     // the collection server
    852     collectproto = protocols.getrecptproto (collection, logout);
    853 
    854     // get collection information
    855     collectinfo.clear();
    856     if (!collection.empty()) {
    857       comerror_t err;
    858       collectproto->get_collectinfo (collection, collectinfo, err, logout);
    859       if (err != noError) collectinfo.clear();
    860     }
    861 
     850  recptproto *collectproto = protocols.getrecptproto (args["c"], logout);
     851  if (collectproto != NULL) {
    862852    // get browsers to process OID
    863853    text_t OID = args["d"];
    … …  
    882872      }
    883873    }
    884 
     874 
    885875    // translate "d" and "cl" arguments if required
    886876    translate_OIDs (args, collectproto, logout);
    887877  }
    888 
     878 
    889879  // produce the page using the desired action
    890880  action *a = actions.getaction (args["a"]);
    891881  if (a != NULL) {
    892     if (a->uses_display(args)) prepare_page (a, args, collectproto, (*outconverter), logout);
    893     if (!a->do_action (args, collectinfo, collectproto, disp,
    894                (*outconverter), contentout, logout))
     882    if (a->uses_display(args)) prepare_page (a, args, (*outconverter), logout);
     883    if (!a->do_action (args, &protocols, &browsers, disp, (*outconverter), contentout, logout))
    895884      return false;
    896885
    … …  
    10661055// prepare_page sets up page parameters, sets display macros
    10671056// and opens the page ready for output
    1068 void receptionist::prepare_page (action *a, cgiargsclass &args, recptproto *collectproto,
    1069                  outconvertclass &outconvert, ostream &logout) {
     1057void receptionist::prepare_page (action *a, cgiargsclass &args,
     1058                 outconvertclass &outconvert,
     1059                 ostream &logout) {
    10701060  // set up page parameters
    10711061  text_t pageparams;
    … …  
    10981088    assert ((*actionhere).second.a != NULL);
    10991089    if ((*actionhere).second.a != NULL)
    1100       (*actionhere).second.a->define_external_macros (collectinfo, disp, args, collectproto, logout);
     1090      (*actionhere).second.a->define_external_macros (disp, args, &protocols, logout);
    11011091    actionhere++;
    11021092  }
    11031093
    11041094  // define internal macros for the current action
    1105   a->define_internal_macros (collectinfo, disp, args, collectproto, logout);
     1095  a->define_internal_macros (disp, args, &protocols, logout);
    11061096 
    11071097  // define general macros. the defining of general macros is done here so that
    11081098  // the last possible version of the cgi arguments are used
    1109   define_general_macros (args, collectproto, outconvert, logout);
    1110 }
    1111 
    1112 void receptionist::define_general_macros (cgiargsclass &args, recptproto *collectproto,
    1113                       outconvertclass &/*outconvert*/, ostream &logout) {
     1099  define_general_macros (args, outconvert, logout);
     1100}
     1101
     1102void receptionist::define_general_macros (cgiargsclass &args, outconvertclass &/*outconvert*/,
     1103                      ostream &logout) {
    11141104
    11151105  text_t &collection = args["c"];
    … …  
    11421132
    11431133  // set collection specific macros
    1144   if ((!collection.empty()) && (collectproto != NULL)) {
    1145     FilterResponse_t response;
    1146     text_tset metadata;
    1147     get_info ("collection", collection, metadata, false,
    1148           collectproto, response, logout);
    1149 
    1150     if (!response.docInfo[0].metadata.empty()) {
    1151       MetadataInfo_tmap::const_iterator here = response.docInfo[0].metadata.begin();
    1152       MetadataInfo_tmap::const_iterator end = response.docInfo[0].metadata.end();
    1153       while (here != end) {
    1154     if (((*here).first != "haschildren") && ((*here).first != "hasnext") &&
    1155         ((*here).first != "hasprevious")) {
    1156       disp.setmacro ((*here).first, "Global", (*here).second.values[0]);
     1134  if (!collection.empty()) {
     1135    recptproto *collectproto = protocols.getrecptproto (collection, logout);
     1136    if (collectproto != NULL) {
     1137      FilterResponse_t response;
     1138      text_tset metadata;
     1139      get_info ("collection", collection, metadata, false,
     1140        collectproto, response, logout);
     1141     
     1142      if (!response.docInfo[0].metadata.empty()) {
     1143    MetadataInfo_tmap::const_iterator here = response.docInfo[0].metadata.begin();
     1144    MetadataInfo_tmap::const_iterator end = response.docInfo[0].metadata.end();
     1145    while (here != end) {
     1146      if (((*here).first != "haschildren") && ((*here).first != "hasnext") &&
     1147          ((*here).first != "hasprevious")) {
     1148        disp.setmacro ((*here).first, "Global", (*here).second.values[0]);
     1149      }
     1150      here ++;
    11571151    }
    1158     here ++;
    11591152      }
    11601153    }

  • trunk/gsdl/src/recpt/receptionist.h

    r649 r760  
    8484  // prepare_page sets up page parameters, sets display macros
    8585  // and opens the page ready for output
    86   virtual void prepare_page (action *a, cgiargsclass &args, recptproto *collectproto,
    87                  outconvertclass &outconvert, ostream &logout);
     86  virtual void prepare_page (action *a, cgiargsclass &args,
     87                 outconvertclass &outconvert,
     88                 ostream &logout);
    8889 
    8990  virtual void translate_OIDs (cgiargsclass &args, recptproto *collectproto,
    … …  
    9394  bool get_cookie ();
    9495
    95   virtual void define_general_macros (cgiargsclass &args, recptproto *collectproto,
    96                       outconvertclass &outconvert, ostream &logout);
     96  virtual void define_general_macros (cgiargsclass &args, outconvertclass &outconvert,
     97                      ostream &logout);
    9798
    9899  bool append_logstr (const text_t &filename, const text_t &logstr,

  • trunk/gsdl/src/recpt/statusaction.cpp

    r722 r760  
    2828/*
    2929   $Log$
     30   Revision 1.22  1999/11/01 21:55:27  sjboddie
     31   changes to arguments of many functions
     32
    3033   Revision 1.21  1999/10/19 03:23:46  davidb
    3134   Collection building support through web pages
    … …  
    797800}
    798801
    799 void statusaction::get_cgihead_info (cgiargsclass &/*args*/, response_t &response,
    800                      text_t &response_data, ostream &/*logout*/) {
     802void statusaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
     803                     response_t &response, text_t &response_data,
     804                     ostream &/*logout*/) {
    801805  response = content;
    802806  response_data = "text/html";
    803807}
    804808
    805 bool statusaction::do_action (cgiargsclass &args, const ColInfoResponse_t &/*collectinfo*/,
    806                   recptproto * /*collectproto*/, displayclass &disp,
     809bool statusaction::do_action (cgiargsclass &args, recptprotolistclass * /*protos*/,
     810                  browsermapclass * /*browsers*/, displayclass &disp,
    807811                  outconvertclass &outconvert, ostream &textout,
    808812                  ostream &logout) {

  • trunk/gsdl/src/recpt/statusaction.h

    r722 r760  
    8282
    8383  text_t get_action_name () {return "status";}
     84
    8485  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
     86
    8587  bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args,
    8688              ostream &logout);
    87   void get_cgihead_info (cgiargsclass &args, response_t &response,
    88              text_t &response_data, ostream &logout);
    89   bool do_action (cgiargsclass &args, const ColInfoResponse_t &collectinfo,
    90           recptproto *collectproto, displayclass &disp,
     89
     90  void get_cgihead_info (cgiargsclass &args, recptprotolistclass *protos,
     91             response_t &response, text_t &response_data,
     92             ostream &logout);
     93
     94  bool do_action (cgiargsclass &args, recptprotolistclass *protos,
     95          browsermapclass *browsers, displayclass &disp,
    9196          outconvertclass &outconvert, ostream &textout,
    9297          ostream &logout);

  • trunk/gsdl/src/recpt/tipaction.cpp

    r543 r760  
    2828/*
    2929   $Log$
     30   Revision 1.6  1999/11/01 21:54:57  sjboddie
     31   changes to arguments of many functions
     32
    3033   Revision 1.5  1999/09/07 23:10:18  rjmcnab
    3134   removed some compiler warnings
    … …  
    6366}
    6467
    65 void tipaction::define_external_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &disp,
    66                     cgiargsclass &args, recptproto * /*collectproto*/,
    67                     ostream &logout) {
     68void tipaction::define_external_macros (displayclass &disp, cgiargsclass &args,
     69                    recptprotolistclass * /*protos*/, ostream &logout) {
     70
    6871  // define_external_macros sets the following macros:
    6972

  • trunk/gsdl/src/recpt/tipaction.h

    r533 r760  
    4141  text_t get_action_name () {return "tip";}
    4242 
    43   void define_external_macros (const ColInfoResponse_t &collectinfo, displayclass &disp,
    44                    cgiargsclass &args, recptproto *collectproto,
    45                    ostream &logout);
     43  void define_external_macros (displayclass &disp, cgiargsclass &args,
     44                   recptprotolistclass *protos, ostream &logout);
    4645};
    4746

  • trunk/gsdl/src/recpt/usersaction.cpp

    r551 r760  
    2828/*
    2929   $Log$
     30   Revision 1.7  1999/11/01 21:48:27  sjboddie
     31   changes to arguments of many functions
     32
    3033   Revision 1.6  1999/09/08 03:44:24  cs025
    3134   Added a cast to (char *) of (..:..?..) on output to avoid type
    … …  
    199202}
    200203
    201 void usersaction::get_cgihead_info (cgiargsclass &/*args*/, response_t &response,
    202                      text_t &response_data, ostream &/*logout*/) {
     204void usersaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
     205                    response_t &response, text_t &response_data,
     206                    ostream &/*logout*/) {
    203207  response = content;
    204208  response_data = "text/html";
    205209}
    206210
    207 void usersaction::define_internal_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &/*disp*/,
    208                       cgiargsclass &/*args*/, recptproto * /*collectproto*/,
    209                       ostream &/*logout*/) {
    210 }
    211 
    212 void usersaction::define_external_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &/*disp*/,
    213                       cgiargsclass &/*args*/, recptproto * /*collectproto*/,
    214                       ostream &/*logout*/) {
    215 }
    216 
    217 bool usersaction::do_action (cgiargsclass &args, const ColInfoResponse_t &/*collectinfo*/,
    218                  recptproto *collectproto, displayclass &disp,
     211bool usersaction::do_action (cgiargsclass &args, recptprotolistclass * /*protos*/,
     212                 browsermapclass * /*browsers*/, displayclass &disp,
    219213                 outconvertclass &outconvert, ostream &textout,
    220214                 ostream &logout) {
     215
    221216  if (args["uma"] == "adduser" || args["uma"] == "edituser") {
    222217    // adduser is handled by edituser
    223     return do_edituser (args, collectproto, disp, outconvert, textout, logout);
     218    return do_edituser (args, disp, outconvert, textout, logout);
    224219   
    225220  } else if (args["uma"] == "deleteuser") {
    226     return do_deleteuser (args, collectproto, disp, outconvert, textout, logout);
     221    return do_deleteuser (args, disp, outconvert, textout, logout);
    227222   
    228223  } else if (args["uma"] == "changepasswd") {
    229     return do_changepasswd (args, collectproto, disp, outconvert, textout, logout); 
     224    return do_changepasswd (args, disp, outconvert, textout, logout); 
    230225  }
    231226
    232227  // default
    233   return do_listusers (args, collectproto, disp, outconvert, textout, logout);
    234 }
    235 
    236 bool usersaction::do_listusers (cgiargsclass &/*args*/, recptproto * /*collectproto*/,
    237                 displayclass &disp, outconvertclass &outconvert,
    238                 ostream &textout, ostream &/*logout*/) {
     228  return do_listusers (args, disp, outconvert, textout, logout);
     229}
     230
     231bool usersaction::do_listusers (cgiargsclass &/*args*/, displayclass &disp,
     232                outconvertclass &outconvert, ostream &textout,
     233                ostream &/*logout*/) {
     234
    239235  textout << outconvert << disp
    240236      << "_userslistusers:header_\n_userslistusers:contentstart_\n";
    … …  
    297293
    298294
    299 bool usersaction::do_edituser (cgiargsclass &args, recptproto *collectproto,
    300                    displayclass &disp, outconvertclass &outconvert,
    301                    ostream &textout, ostream &logout) {
     295bool usersaction::do_edituser (cgiargsclass &args, displayclass &disp,
     296                   outconvertclass &outconvert, ostream &textout,
     297                   ostream &logout) {
    302298  userinfo_t userinfo;
    303299  text_t messagestatus;
    … …  
    364360   
    365361    // show list of users
    366     return do_listusers (args, collectproto, disp, outconvert, textout, logout);
     362    return do_listusers (args, disp, outconvert, textout, logout);
    367363  }
    368364 
    … …  
    377373}
    378374
    379 bool usersaction::do_deleteuser (cgiargsclass &args, recptproto *collectproto,
    380                  displayclass &disp, outconvertclass &outconvert,
    381                  ostream &textout, ostream &logout) {
     375bool usersaction::do_deleteuser (cgiargsclass &args, displayclass &disp,
     376                 outconvertclass &outconvert, ostream &textout,
     377                 ostream &logout) {
    382378  if (!args["cm"].empty()) {
    383379    if (args["cm"] == "yes" && !args["umun"].empty()) {
    … …  
    387383   
    388384    // redirect the user back to the listusers page
    389     return do_listusers (args, collectproto, disp, outconvert, textout, logout);
     385    return do_listusers (args, disp, outconvert, textout, logout);
    390386  }
    391387
    … …  
    397393}
    398394
    399 bool usersaction::do_changepasswd (cgiargsclass &args, recptproto * /*collectproto*/,
    400                    displayclass &disp, outconvertclass &outconvert,
    401                    ostream &textout, ostream &/*logout*/) {
     395bool usersaction::do_changepasswd (cgiargsclass &args, displayclass &disp,
     396                   outconvertclass &outconvert, ostream &textout,
     397                   ostream &/*logout*/) {
    402398  text_t messagestatus;
    403399 

  • trunk/gsdl/src/recpt/usersaction.h

    r533 r760  
    5050              ostream &logout);
    5151
    52   void get_cgihead_info (cgiargsclass &args, response_t &response,
    53              text_t &response_data, ostream &logout);
     52  void get_cgihead_info (cgiargsclass &args, recptprotolistclass *protos,
     53             response_t &response, text_t &response_data,
     54             ostream &logout);
    5455 
    55   void define_internal_macros (const ColInfoResponse_t &collectinfo, displayclass &disp,
    56                    cgiargsclass &args, recptproto *collectproto,
    57                    ostream &logout);
    58   void define_external_macros (const ColInfoResponse_t &collectinfo, displayclass &disp,
    59                    cgiargsclass &args, recptproto *collectproto,
    60                    ostream &logout);
    61  
    62   bool do_action (cgiargsclass &args, const ColInfoResponse_t &collectinfo,
    63           recptproto *collectproto, displayclass &disp,
     56  bool do_action (cgiargsclass &args, recptprotolistclass *protos,
     57          browsermapclass *browsers, displayclass &disp,
    6458          outconvertclass &outconvert, ostream &textout,
    6559          ostream &logout);
    … …  
    6862  void define_user_macros (cgiargsclass &args, displayclass &disp);
    6963 
    70   bool do_listusers (cgiargsclass &args, recptproto *collectproto,
    71              displayclass &disp, outconvertclass &outconvert,
    72              ostream &textout, ostream &logout);
    73   bool do_edituser (cgiargsclass &args, recptproto *collectproto,
    74             displayclass &disp, outconvertclass &outconvert,
    75             ostream &textout, ostream &logout);
    76   bool do_deleteuser (cgiargsclass &args, recptproto *collectproto,
    77               displayclass &disp, outconvertclass &outconvert,
    78               ostream &textout, ostream &logout);
    79   bool do_changepasswd (cgiargsclass &args, recptproto *collectproto,
    80             displayclass &disp, outconvertclass &outconvert,
    81             ostream &textout, ostream &logout);
     64  bool do_listusers (cgiargsclass &args, displayclass &disp,
     65             outconvertclass &outconvert, ostream &textout,
     66             ostream &logout);
     67
     68  bool do_edituser (cgiargsclass &args, displayclass &disp,
     69            outconvertclass &outconvert, ostream &textout,
     70            ostream &logout);
     71
     72  bool do_deleteuser (cgiargsclass &args, displayclass &disp,
     73              outconvertclass &outconvert, ostream &textout,
     74              ostream &logout);
     75
     76  bool do_changepasswd (cgiargsclass &args, displayclass &disp,
     77            outconvertclass &outconvert, ostream &textout,
     78            ostream &logout);
    8279};
    8380
Note: See TracChangeset for help on using the changeset viewer.