Changeset 1796


Ignore:
Timestamp:
2000-12-15T13:35:08+13:00 (23 years ago)
Author:
sjboddie
Message:

Removed the "cp" and "sp" cgi arguments and used the "p" argument instead
(i.e. the "p" argument is now used in the page, status and collector
actions). I'd like to do this type of thing in lots of places where
different actions are using different cgi arguments to perform very
similar tasks. Fewer arguments are becoming more of a priority with our
ever expanding URLs, I'll leave it for a while though and make sure this
change doesn't cause any problems.

Location:
trunk/gsdl
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/macros/base.dm

    r1697 r1796  
    195195
    196196_httppagex_ {_gwcgi_?e=_compressedoptions_&a=p&p=_1_}
    197 _httppagestatus_ {_gwcgi_?e=_compressedoptions_&a=status}
    198 _httppagecollector_ {_gwcgi_?a=collector}
     197_httppagestatus_ {_gwcgi_?e=_compressedoptions_&a=status&p=frameset}
     198_httppagecollector_ {_gwcgi_?a=collector&p=intro}
    199199_httppageabout_ {_httppagex_(about)}
    200200#_httppagehome_ {_httppagex_(home)}

  • trunk/gsdl/macros/collect.dm

    r1678 r1796  
    8787# http macros
    8888
    89 _httpinfo_ {_gwcgi_?e=_compressedoptions_&cp=info}
    90 _httpsrce_ {_gwcgi_?e=_compressedoptions_&cp=srce}
    91 _httpconf_ {_gwcgi_?e=_compressedoptions_&cp=conf}
    92 _httpbild_ {_gwcgi_?e=_compressedoptions_&cp=bild}
     89_httpinfo_ {_gwcgi_?e=_compressedoptions_&p=info}
     90_httpsrce_ {_gwcgi_?e=_compressedoptions_&p=srce}
     91_httpconf_ {_gwcgi_?e=_compressedoptions_&p=conf}
     92_httpbild_ {_gwcgi_?e=_compressedoptions_&p=bild}
    9393_httpview_ {_gwcgi_?a=p&p=about&c=_cgiargbc1dirname_}
    9494_httpdel_  {javascript:do_delete();}
    95 _httpexpt_ {_gwcgi_?e=_compressedoptions_&cp=expt}
     95_httpexpt_ {_gwcgi_?e=_compressedoptions_&p=expt}
    9696
    9797_httpicongcinfoof_ {_httpimg_/gcinfoof.gif}
    … …  
    168168<p>First, you must decide whether to
    169169<ul>
    170 <input type=radio name=cp value=new checked>
     170<input type=radio name=p value=new checked>
    171171create an entirely new collection
    172172<br>
    173 <input type=radio name=cp value=existing>
     173<input type=radio name=p value=existing>
    174174work with an existing one, adding data to it or deleting it.
    175175</ul>
    … …  
    214214    form.bc1econf.value = "1";
    215215  \}
    216   form.cp.value = gotopage;
     216  form.p.value = gotopage;
    217217  form.submit();
    218218\}
    … …  
    254254<form name="collectorform" method=post action="_gwcgi_">
    255255<input type=hidden name="e" value="_decodedcompressedoptions_">
    256 <input type=hidden name="cp" value="_cgiargcp_">
     256<input type=hidden name="p" value="_cgiargp_">
    257257<input type=hidden name="bc1dodelete" value="0">
    258258<input type=hidden name="bc1esrce" value="0">
    … …  
    360360    return;
    361361  \}
    362   form.cp.value = gotopage;
     362  form.p.value = gotopage;
    363363  form.submit();
    364364\}
    … …  
    368368<form name="collectorform" method=post action="_gwcgi_">
    369369<input type=hidden name="e" value="_decodedcompressedoptions_">
    370 <input type=hidden name="cp" value="_cgiargcp_">
     370<input type=hidden name="p" value="_cgiargp_">
    371371<input type=hidden name="bc1infochanged" value="0">
    372372
    … …  
    486486  \}
    487487
    488   form.cp.value = gotopage;
     488  form.p.value = gotopage;
    489489  form.submit();
    490490\}
    … …  
    549549<form name="collectorform" method=post action="_gwcgi_">
    550550<input type=hidden name="e" value="_decodedcompressedoptions_">
    551 <input type=hidden name="cp" value="_cgiargcp_">
     551<input type=hidden name="p" value="_cgiargp_">
    552552<input type=hidden name="bc1clonechanged" value="0">
    553553<input type=hidden name="bc1aboutdesc" value="_cgiargbc1aboutdesc_">
    … …  
    629629  var form = document.collectorform;
    630630  form.bc1cfgchanged.value = changed;
    631   form.cp.value = gotopage;
     631  form.p.value = gotopage;
    632632  form.submit();
    633633\}
    … …  
    642642<form name="collectorform" method=post action="_gwcgi_">
    643643<input type=hidden name="e" value="_decodedcompressedoptions_">
    644 <input type=hidden name="cp" value="_cgiargcp_">
     644<input type=hidden name="p" value="_cgiargp_">
    645645<input type=hidden name="bc1cfgchanged" value="_cgiargbc1cfgchanged_">
    646646<input type=hidden name="bc1aboutdesc" value="_cgiargbc1aboutdesc_">
    … …  
    667667original configuration settings.
    668668
    669 <p><textarea name="bc1cfgfile" cols=72 rows=18 wrap=off onChange="changed=1;">
     669<p><textarea name="cfgfile" cols=72 rows=18 wrap=off onChange="changed=1;">
    670670_cfgfile_
    671671</textarea>
    … …  
    697697function check\_submit (gotopage) \{
    698698  var form = document.collectorform;
    699   form.cp.value = gotopage;
     699  form.p.value = gotopage;
    700700  form.submit();
    701701\}
    … …  
    704704<form name="collectorform" method=post action="_gwcgi_">
    705705<input type=hidden name="e" value="_decodedcompressedoptions_">
    706 <input type=hidden name="cp" value="_cgiargcp_">
     706<input type=hidden name="p" value="_cgiargp_">
    707707<input type=hidden name="bc1aboutdesc" value="_cgiargbc1aboutdesc_">
    708708<input type=hidden name="bc1contactemail" value="_cgiargbc1contactemail_">
    … …  
    726726  </body>
    727727  </noframes>
    728   <frame src="_gwcgi_?e=_compressedoptions_&cp=bildframe1">
    729   <frame src="_gwcgi_?e=_compressedoptions_&cp=bildstatus">
     728  <frame src="_gwcgi_?e=_compressedoptions_&p=bildframe1">
     729  <frame src="_gwcgi_?e=_compressedoptions_&p=bildstatus">
    730730</frameset>
    731731</html>
    … …  
    763763<form name="collectorform" method=post action="_gwcgi_">
    764764<input type=hidden name="e" value="_decodedcompressedoptions_">
    765 <input type=hidden name="cp" value="bildcancel">
     765<input type=hidden name="p" value="bildcancel">
    766766<input type=hidden name="bc1aboutdesc" value="_cgiargbc1aboutdesc_">
    767767<input type=hidden name="bc1contactemail" value="_cgiargbc1contactemail_">
    … …  
    805805function check\_submit (gotopage) \{
    806806  var form = document.collectorform;
    807   form.cp.value = gotopage;
     807  form.p.value = gotopage;
    808808  form.submit();
    809809\}
    … …  
    812812<form name="collectorform" method=post action="_gwcgi_">
    813813<input type=hidden name="e" value="_decodedcompressedoptions_">
    814 <input type=hidden name="cp" value="_cgiargcp_">
     814<input type=hidden name="p" value="_cgiargp_">
    815815<input type=hidden name="bc1aboutdesc" value="_cgiargbc1aboutdesc_">
    816816<input type=hidden name="bc1contactemail" value="_cgiargbc1contactemail_">
    … …  
    916916function check\_submit (gotopage) \{
    917917  var form = document.collectorform;
    918   form.cp.value = gotopage;
     918  form.p.value = gotopage;
    919919  form.submit();
    920920\}
    … …  
    923923<form name="collectorform" method=post action="_gwcgi_">
    924924<input type=hidden name="e" value="_decodedcompressedoptions_">
    925 <input type=hidden name="cp" value="_cgiargcp_">
     925<input type=hidden name="p" value="_cgiargp_">
    926926<input type=hidden name="bc1aboutdesc" value="_cgiargbc1aboutdesc_">
    927927<input type=hidden name="bc1contactemail" value="_cgiargbc1contactemail_">

  • trunk/gsdl/macros/status.dm

    r1794 r1796  
    5151  </body>
    5252  </noframes>
    53   <frame src="_gwcgi_?e=_compressedoptions_&a=status&sp=select" name=navframe>
    54   <frame src="_gwcgi_?e=_compressedoptions_&a=status&sp=welcome" name=infoframe>
     53  <frame src="_gwcgi_?e=_compressedoptions_&a=status&p=select" name=navframe>
     54  <frame src="_gwcgi_?e=_compressedoptions_&a=status&p=welcome" name=infoframe>
    5555</frameset>
    5656
    … …  
    6161<a href="_httppagehome_" target=_top border=0><img src="_httpimg_/gsdl.gif"></a>
    6262<p>
    63 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=welcome" target=infoframe>_textadminhome_</a><br>
     63<a href="_gwcgi_?e=_compressedoptions_&a=status&p=welcome" target=infoframe>_textadminhome_</a><br>
    6464<a href="_httppagehome_" target=\_top>_textreturnhome_</a>
    6565
    … …  
    7272
    7373<p><b>_textinfo_</b><br>
    74 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=generalinfo" target=infoframe>_textgeneral_</a><br>
    75 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=argumentinfo" target=infoframe>_textarguments_</a><br>
    76 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=actioninfo" target=infoframe>_textactions_</a><br>
    77 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=browserinfo" target=infoframe>_textbrowsers_</a><br>
    78 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=protocolinfo" target=infoframe>_textprotocols_</a>
     74<a href="_gwcgi_?e=_compressedoptions_&a=status&p=generalinfo" target=infoframe>_textgeneral_</a><br>
     75<a href="_gwcgi_?e=_compressedoptions_&a=status&p=argumentinfo" target=infoframe>_textarguments_</a><br>
     76<a href="_gwcgi_?e=_compressedoptions_&a=status&p=actioninfo" target=infoframe>_textactions_</a><br>
     77<a href="_gwcgi_?e=_compressedoptions_&a=status&p=browserinfo" target=infoframe>_textbrowsers_</a><br>
     78<a href="_gwcgi_?e=_compressedoptions_&a=status&p=protocolinfo" target=infoframe>_textprotocols_</a>
    7979
    8080<p><b>_textconfigfiles_</b><br>
    81 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=gsdlsite" target=infoframe>_textgsdlsite_</a><br>
    82 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=maincfg" target=infoframe>_textmaincfg_</a>
     81<a href="_gwcgi_?e=_compressedoptions_&a=status&p=gsdlsite" target=infoframe>_textgsdlsite_</a><br>
     82<a href="_gwcgi_?e=_compressedoptions_&a=status&p=maincfg" target=infoframe>_textmaincfg_</a>
    8383
    8484<p><b>_textlogs_</b><br>
    85 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=initlog" target=infoframe>_textinitlog_</a><br>
    86 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=errorlog" target=infoframe>_texterrorlog_</a>
     85<a href="_gwcgi_?e=_compressedoptions_&a=status&p=initlog" target=infoframe>_textinitlog_</a><br>
     86<a href="_gwcgi_?e=_compressedoptions_&a=status&p=errorlog" target=infoframe>_texterrorlog_</a>
    8787}
    8888
    … …  
    148148_maincfg_ {
    149149<form name="maincfgform" method=post action="_gwcgi_">
    150 <input type=hidden name="sp" value="changemaincfg">
     150<input type=hidden name="p" value="changemaincfg">
    151151<input type=hidden name="e" value="_decodedcompressedoptions_">
    152152<p>_If_(_maincfgfile_,<textarea name="cfgfile" cols=72 rows=18 wrap=off>

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

    r1505 r1796  
    273273                         + "_"));
    274274  // change style of header and footer if page is a frame
    275   if ((args["sp"].empty()) || (args["sp"] == "frameset")) {
     275  if ((args["p"].empty()) || (args["p"] == "frameset")) {
    276276    disp.setmacro ("header", "authen", "_status:infoheader_(Log in)");
    277277    disp.setmacro ("header", "authenok", "_status:infoheader_(Log in)");

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

    r1789 r1796  
    6161  argsinfo.addarginfo (NULL, arg_ainfo);
    6262
    63   arg_ainfo.shortname = "cp";
    64   arg_ainfo.longname = "collector page";
     63  arg_ainfo.shortname = "p";
     64  arg_ainfo.longname = "page";
    6565  arg_ainfo.multiplechar = true;
    6666  arg_ainfo.defaultstatus = cgiarginfo::weak;
    … …  
    185185  arg_ainfo.defaultstatus = cgiarginfo::weak;
    186186  arg_ainfo.argdefault = "0";
     187  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
     188  argsinfo.addarginfo (NULL, arg_ainfo);
     189
     190  arg_ainfo.shortname = "cfgfile";
     191  arg_ainfo.longname = "configuration file contents";
     192  arg_ainfo.multiplechar = true;
     193  arg_ainfo.defaultstatus = cgiarginfo::weak;
     194  arg_ainfo.argdefault = "";
    187195  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
    188196  argsinfo.addarginfo (NULL, arg_ainfo);
    … …  
    281289                     ostream &logout) {
    282290
    283   text_t &current_page = args["cp"];
     291  text_t &current_page = args["p"];
    284292
    285293  // note that the "bildstatus" and "bildframe1" pages don't actually do anything
    … …  
    532540}
    533541
    534 // replace configuration file on disk with that in the bc1cfgfile argument and
     542// replace configuration file on disk with that in the cfgfile argument and
    535543// catch other bc1 arguments up with those the new cfgfile contains
    536544void collectoraction::update_cfgfile_complete (cgiargsclass &args, ostream &logout) {
    … …  
    557565     
    558566      outconvertclass text_t2ascii;
    559       cfg_out << text_t2ascii << args["bc1cfgfile"];
     567      cfg_out << text_t2ascii << args["cfgfile"];
    560568      GSDL_UNLOCK_FILE (fd);
    561569      cfg_out.close();
    … …  
    652660  }
    653661
    654   text_t &current_page = args["cp"];
     662  text_t &current_page = args["p"];
    655663  text_t currentname = args["bc1dirname"];
    656664  if (current_page == "srce") currentname = args["bc1clonecol"];
    … …  
    828836  // _gsdlhome_ - the gsdlhome path (dm_safe)
    829837
    830   text_t &collector_page = args["cp"];
     838  text_t &collector_page = args["p"];
    831839  int esrce = args["bc1esrce"].getint();
    832840  int econf = args["bc1econf"].getint();
    … …  
    9961004  }
    9971005
    998   text_t &collector_page = args["cp"];
     1006  text_t &collector_page = args["p"];
    9991007  text_t &collection = args["bc1dirname"];
    10001008

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

    r1794 r1796  
    7373
    7474        textout << outconvert << disp
    75             << "<tr><td><a href=\"_gwcgi_?e=_compressedoptions_&a=status&sp=collectioninfo&pr="
     75            << "<tr><td><a href=\"_gwcgi_?e=_compressedoptions_&a=status&p=collectioninfo&pr="
    7676            << protoname
    7777            << "&c="
    … …  
    474474      } else {
    475475        textout << outconvert << disp
    476             << "\"<a href=\"_gwcgi_?e=_compressedoptions_&a=status&sp=collectioninfo&pr="
     476            << "\"<a href=\"_gwcgi_?e=_compressedoptions_&a=status&p=collectioninfo&pr="
    477477            << protoname
    478478            << "&c="
    … …  
    952952  argsinfo.addarginfo (NULL, arg_ainfo);
    953953
    954   // "sp" -- status page
    955   arg_ainfo.shortname = "sp";
    956   arg_ainfo.longname = "status page";
     954  // "p" -- status page
     955  arg_ainfo.shortname = "p";
     956  arg_ainfo.longname = "page";
    957957  arg_ainfo.multiplechar = true;
    958   arg_ainfo.defaultstatus = cgiarginfo::good;
     958  arg_ainfo.defaultstatus = cgiarginfo::weak;
    959959  arg_ainfo.argdefault = "frameset";
    960960  arg_ainfo.savedarginfo = cgiarginfo::must;
    … …  
    987987  // only users belonging to the "administrator" group may edit
    988988  // the main.cfg file
    989   if (args["sp"] == "maincfg" || args["sp"] == "changemaincfg") {
     989  if (args["p"] == "maincfg" || args["p"] == "changemaincfg") {
    990990    args["uan"] = "1";
    991991    args["ug"] = "administrator";
    … …  
    10081008  // _maincfgfile_   the contents of the main.cfg configuration file
    10091009
    1010   if (args["sp"] == "maincfg") {
     1010  if (args["p"] == "maincfg") {
    10111011
    10121012    // read in main.cfg
    … …  
    10881088
    10891089  // output the required status page
    1090   text_t &arg_sp = args["sp"];
    1091   if (arg_sp == "frameset") output_frameset (args, disp, outconvert, textout, logout);
    1092   else if (arg_sp == "select") output_select (args, disp, outconvert, textout, logout);
    1093   else if (arg_sp == "welcome") output_welcome (args, protos, disp, outconvert, textout, logout);
    1094   else if (arg_sp == "generalinfo") output_generalinfo (args, disp, outconvert, textout, logout);
    1095   else if (arg_sp == "argumentinfo") output_argumentinfo (args, disp, outconvert, textout, logout);
    1096   else if (arg_sp == "actioninfo") output_actioninfo (args, disp, outconvert, textout, logout);
    1097   else if (arg_sp == "browserinfo") output_browserinfo (args, disp, outconvert, textout, logout);
    1098   else if (arg_sp == "protocolinfo") output_protocolinfo (args, disp, outconvert, textout, logout);
    1099   else if (arg_sp == "collectioninfo") output_collectioninfo (args, disp, outconvert, textout, logout);
    1100   else if (arg_sp == "initlog") output_initlog (args, disp, outconvert, textout, logout);
    1101   else if (arg_sp == "errorlog") output_errorlog (args, disp, outconvert, textout, logout);
    1102   else if (arg_sp == "gsdlsite") output_gsdlsite (args, disp, outconvert, textout, logout);
    1103   else if (arg_sp == "maincfg") output_maincfg (args, disp, outconvert, textout, logout);
    1104   else if (arg_sp == "changemaincfg") change_maincfg (args, disp, outconvert, textout, logout);
     1090  text_t &arg_p = args["p"];
     1091  if (arg_p == "frameset") output_frameset (args, disp, outconvert, textout, logout);
     1092  else if (arg_p == "select") output_select (args, disp, outconvert, textout, logout);
     1093  else if (arg_p == "welcome") output_welcome (args, protos, disp, outconvert, textout, logout);
     1094  else if (arg_p == "generalinfo") output_generalinfo (args, disp, outconvert, textout, logout);
     1095  else if (arg_p == "argumentinfo") output_argumentinfo (args, disp, outconvert, textout, logout);
     1096  else if (arg_p == "actioninfo") output_actioninfo (args, disp, outconvert, textout, logout);
     1097  else if (arg_p == "browserinfo") output_browserinfo (args, disp, outconvert, textout, logout);
     1098  else if (arg_p == "protocolinfo") output_protocolinfo (args, disp, outconvert, textout, logout);
     1099  else if (arg_p == "collectioninfo") output_collectioninfo (args, disp, outconvert, textout, logout);
     1100  else if (arg_p == "initlog") output_initlog (args, disp, outconvert, textout, logout);
     1101  else if (arg_p == "errorlog") output_errorlog (args, disp, outconvert, textout, logout);
     1102  else if (arg_p == "gsdlsite") output_gsdlsite (args, disp, outconvert, textout, logout);
     1103  else if (arg_p == "maincfg") output_maincfg (args, disp, outconvert, textout, logout);
     1104  else if (arg_p == "changemaincfg") change_maincfg (args, disp, outconvert, textout, logout);
    11051105  else {
    11061106    output_errorpage (outconvert, textout, logout,
    1107               "Unknown page \"" + arg_sp + "\".\n");
     1107              "Unknown page \"" + arg_p + "\".\n");
    11081108  }
    11091109
Note: See TracChangeset for help on using the changeset viewer.