Ignore:
Timestamp:
2010-09-28T18:35:06+13:00 (14 years ago)
Author:
ak19
Message:
  1. Undoing commit of 22934 where decode_commas was called on stem and fold comma separated list: previously separated due to url-encoding of commas. Now that the problem has been fixed at the source, the decode_commas hack is no longer necessary. 2. Commas in stem and fold are no longer url-encoded because the multiple_value field of the continuously-reused struct arg_ainfo is always set back to the default false after ever being set to true. So it no longer subtly stays at true to affect Greenstone functioning in unforeseen ways (such as suddenly and unnecessarily URL-encoding commas where this is not wanted).
File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/recpt/collectoraction.cpp

    r22067 r22984  
    7272  arg_ainfo.longname = "action";
    7373  arg_ainfo.multiplechar = true;
     74  arg_ainfo.multiplevalue = false;
    7475  arg_ainfo.defaultstatus = cgiarginfo::weak;
    7576  arg_ainfo.argdefault = "collector";
     
    8081  arg_ainfo.longname = "page";
    8182  arg_ainfo.multiplechar = true;
     83  arg_ainfo.multiplevalue = false;
    8284  arg_ainfo.defaultstatus = cgiarginfo::weak;
    8385  arg_ainfo.argdefault = "intro";
     
    9092  arg_ainfo.longname = "collector specific";
    9193  arg_ainfo.multiplechar = true;
     94  arg_ainfo.multiplevalue = false;
    9295  arg_ainfo.defaultstatus = cgiarginfo::weak;
    9396  arg_ainfo.argdefault = g_EmptyText;
     
    98101  arg_ainfo.longname = "collector specific";
    99102  arg_ainfo.multiplechar = true;
     103  arg_ainfo.multiplevalue = false;
    100104  arg_ainfo.defaultstatus = cgiarginfo::weak;
    101105  arg_ainfo.argdefault = g_EmptyText;
     
    106110  arg_ainfo.longname = "collector specific";
    107111  arg_ainfo.multiplechar = true;
     112  arg_ainfo.multiplevalue = false;
    108113  arg_ainfo.defaultstatus = cgiarginfo::weak;
    109114  arg_ainfo.argdefault = g_EmptyText;
     
    114119  arg_ainfo.longname = "collector specific";
    115120  arg_ainfo.multiplechar = true;
     121  arg_ainfo.multiplevalue = false;
    116122  arg_ainfo.defaultstatus = cgiarginfo::weak;
    117123  arg_ainfo.argdefault = g_EmptyText;
     
    122128  arg_ainfo.longname = "collector specific";
    123129  arg_ainfo.multiplechar = true;
     130  arg_ainfo.multiplevalue = false;
    124131  arg_ainfo.defaultstatus = cgiarginfo::weak;
    125132  arg_ainfo.argdefault = g_EmptyText;
     
    130137  arg_ainfo.longname = "collector specific";
    131138  arg_ainfo.multiplechar = false;
     139  arg_ainfo.multiplevalue = false;
    132140  arg_ainfo.defaultstatus = cgiarginfo::weak;
    133141  arg_ainfo.argdefault = "0";
     
    138146  arg_ainfo.longname = "collector specific";
    139147  arg_ainfo.multiplechar = true;
     148  arg_ainfo.multiplevalue = false;
    140149  arg_ainfo.defaultstatus = cgiarginfo::weak;
    141150  arg_ainfo.argdefault = g_EmptyText;
     
    147156  arg_ainfo.longname = "collector specific";
    148157  arg_ainfo.multiplechar = false;
     158  arg_ainfo.multiplevalue = false;
    149159  arg_ainfo.defaultstatus = cgiarginfo::weak;
    150160  arg_ainfo.argdefault = "0";
     
    157167  arg_ainfo.longname = "collector specific";
    158168  arg_ainfo.multiplechar = false;
     169  arg_ainfo.multiplevalue = false;
    159170  arg_ainfo.defaultstatus = cgiarginfo::weak;
    160171  arg_ainfo.argdefault = "0";
     
    167178  arg_ainfo.longname = "collector specific";
    168179  arg_ainfo.multiplechar = false;
     180  arg_ainfo.multiplevalue = false;
    169181  arg_ainfo.defaultstatus = cgiarginfo::weak;
    170182  arg_ainfo.argdefault = "0";
     
    175187  arg_ainfo.longname = "configuration file contents";
    176188  arg_ainfo.multiplechar = true;
     189  arg_ainfo.multiplevalue = false;
    177190  arg_ainfo.defaultstatus = cgiarginfo::weak;
    178191  arg_ainfo.argdefault = g_EmptyText;
     
    183196  arg_ainfo.longname = "collector specific";
    184197  arg_ainfo.multiplechar = false;
     198  arg_ainfo.multiplevalue = false;
    185199  arg_ainfo.defaultstatus = cgiarginfo::weak;
    186200  arg_ainfo.argdefault = "0";
     
    193207  arg_ainfo.longname = "collector specific";
    194208  arg_ainfo.multiplechar = false;
     209  arg_ainfo.multiplevalue = false;
    195210  arg_ainfo.defaultstatus = cgiarginfo::weak;
    196211  arg_ainfo.argdefault = "0";
     
    203218  arg_ainfo.longname = "collector specific";
    204219  arg_ainfo.multiplechar = false;
     220  arg_ainfo.multiplevalue = false;
    205221  arg_ainfo.defaultstatus = cgiarginfo::weak;
    206222  arg_ainfo.argdefault = "0";
     
    211227  arg_ainfo.longname = "collector specific";
    212228  arg_ainfo.multiplechar = true;
     229  arg_ainfo.multiplevalue = false;
    213230  arg_ainfo.defaultstatus = cgiarginfo::weak;
    214231  arg_ainfo.argdefault = "3";
Note: See TracChangeset for help on using the changeset viewer.