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/queryaction.cpp

    r22980 r22984  
    5050  arg_ainfo.longname = "action";
    5151  arg_ainfo.multiplechar = true;
     52  arg_ainfo.multiplevalue = false;
    5253  arg_ainfo.defaultstatus = cgiarginfo::weak;
    5354  arg_ainfo.argdefault = "q";
    … …  
    5960  arg_ainfo.longname = "collection type";
    6061  arg_ainfo.multiplechar = true; // can be empty or single char
     62  arg_ainfo.multiplevalue = false;
    6163  arg_ainfo.defaultstatus = cgiarginfo::weak;
    6264  arg_ainfo.argdefault = g_EmptyText;
    … …  
    6870  arg_ainfo.longname = "query mode";
    6971  arg_ainfo.multiplechar = false;
     72  arg_ainfo.multiplevalue = false;
    7073  arg_ainfo.defaultstatus = cgiarginfo::weak;
    7174  arg_ainfo.argdefault = "0";
    … …  
    7780  arg_ainfo.longname = "main index";
    7881  arg_ainfo.multiplechar = true;
     82  arg_ainfo.multiplevalue = false;
    7983  arg_ainfo.defaultstatus = cgiarginfo::weak;
    8084  arg_ainfo.argdefault = g_EmptyText;
    … …  
    8690  arg_ainfo.longname = "main index for second query";
    8791  arg_ainfo.multiplechar = true;
     92  arg_ainfo.multiplevalue = false;
    8893  arg_ainfo.defaultstatus = cgiarginfo::weak;
    8994  arg_ainfo.argdefault = g_EmptyText;
    … …  
    95100  arg_ainfo.longname = "sub collection index";
    96101  arg_ainfo.multiplechar = true;
     102  arg_ainfo.multiplevalue = false;
    97103  arg_ainfo.defaultstatus = cgiarginfo::weak;
    98104  arg_ainfo.argdefault = g_EmptyText;
    … …  
    104110  arg_ainfo.longname = "sub collection index for second query";
    105111  arg_ainfo.multiplechar = true;
     112  arg_ainfo.multiplevalue = false;
    106113  arg_ainfo.defaultstatus = cgiarginfo::weak;
    107114  arg_ainfo.argdefault = g_EmptyText;
    … …  
    113120  arg_ainfo.longname = "language index";
    114121  arg_ainfo.multiplechar = true;
     122  arg_ainfo.multiplevalue = false;
    115123  arg_ainfo.defaultstatus = cgiarginfo::weak;
    116124  arg_ainfo.argdefault = g_EmptyText;
    … …  
    122130  arg_ainfo.longname = "language index for second query";
    123131  arg_ainfo.multiplechar = true;
     132  arg_ainfo.multiplevalue = false;
    124133  arg_ainfo.defaultstatus = cgiarginfo::weak;
    125134  arg_ainfo.argdefault = g_EmptyText;
    … …  
    132141  arg_ainfo.longname = "search type";
    133142  arg_ainfo.multiplechar = false;
     143  arg_ainfo.multiplevalue = false;
    134144  arg_ainfo.defaultstatus = cgiarginfo::weak;
    135145  arg_ainfo.argdefault = "1";
    … …  
    141151  arg_ainfo.longname = "casefolding";
    142152  arg_ainfo.multiplechar = false;
     153  arg_ainfo.multiplevalue = false;
    143154  arg_ainfo.defaultstatus = cgiarginfo::weak;
    144155  arg_ainfo.argdefault = "1";
    … …  
    150161  arg_ainfo.longname = "casefolding support";
    151162  arg_ainfo.multiplechar = false;
     163  arg_ainfo.multiplevalue = false;
    152164  arg_ainfo.defaultstatus = cgiarginfo::weak;
    153165  arg_ainfo.argdefault = "0";
    … …  
    159171  arg_ainfo.longname = "stemming";
    160172  arg_ainfo.multiplechar = false;
     173  arg_ainfo.multiplevalue = false;
    161174  arg_ainfo.defaultstatus = cgiarginfo::weak;
    162175  arg_ainfo.argdefault = "0";
    … …  
    168181  arg_ainfo.longname = "stemming support";
    169182  arg_ainfo.multiplechar = false;
     183  arg_ainfo.multiplevalue = false;
    170184  arg_ainfo.defaultstatus = cgiarginfo::weak;
    171185  arg_ainfo.argdefault = "0";
    … …  
    177191  arg_ainfo.longname = "accentfolding";
    178192  arg_ainfo.multiplechar = false;
     193  arg_ainfo.multiplevalue = false;
    179194  arg_ainfo.defaultstatus = cgiarginfo::weak;
    180195  arg_ainfo.argdefault = "0";
    … …  
    186201  arg_ainfo.longname = "accentfolding support";
    187202  arg_ainfo.multiplechar = false;
     203  arg_ainfo.multiplevalue = false;
    188204  arg_ainfo.defaultstatus = cgiarginfo::weak;
    189205  arg_ainfo.argdefault = "0";
    … …  
    196212  arg_ainfo.longname = "cross collection searching";
    197213  arg_ainfo.multiplechar = false;
     214  arg_ainfo.multiplevalue = false;
    198215  arg_ainfo.defaultstatus = cgiarginfo::weak;
    199216  arg_ainfo.argdefault = "0";
    … …  
    205222  arg_ainfo.longname = "cross collection page";
    206223  arg_ainfo.multiplechar = false;
     224  arg_ainfo.multiplevalue = false;
    207225  arg_ainfo.defaultstatus = cgiarginfo::weak;
    208226  arg_ainfo.argdefault = "0";
    … …  
    214232  arg_ainfo.longname = "granularity";
    215233  arg_ainfo.multiplechar = true;
     234  arg_ainfo.multiplevalue = false;
    216235  arg_ainfo.defaultstatus = cgiarginfo::weak;
    217236  arg_ainfo.argdefault = g_EmptyText;
    … …  
    223242  arg_ainfo.longname = "start date";
    224243  arg_ainfo.multiplechar = true;
     244  arg_ainfo.multiplevalue = false;
    225245  arg_ainfo.defaultstatus = cgiarginfo::weak;
    226246  arg_ainfo.argdefault = g_EmptyText;
    … …  
    232252  arg_ainfo.longname = "end date";
    233253  arg_ainfo.multiplechar = true;
     254  arg_ainfo.multiplevalue = false;
    234255  arg_ainfo.defaultstatus = cgiarginfo::weak;
    235256  arg_ainfo.argdefault = g_EmptyText;
    … …  
    241262  arg_ainfo.longname = "start date bc";
    242263  arg_ainfo.multiplechar = false;
     264  arg_ainfo.multiplevalue = false;
    243265  arg_ainfo.defaultstatus = cgiarginfo::weak;
    244266  arg_ainfo.argdefault = "0";
    … …  
    250272  arg_ainfo.longname = "end date bc";
    251273  arg_ainfo.multiplechar = false;
     274  arg_ainfo.multiplevalue = false;
    252275  arg_ainfo.defaultstatus = cgiarginfo::weak;
    253276  arg_ainfo.argdefault = "0";
    … …  
    259282  arg_ainfo.longname = "query type";
    260283  arg_ainfo.multiplechar = true; // can be empty or single char
     284  arg_ainfo.multiplevalue = false;
    261285  arg_ainfo.defaultstatus = cgiarginfo::weak;
    262286  arg_ainfo.argdefault = g_EmptyText;
    … …  
    268292  arg_ainfo.longname = "query type options";
    269293  arg_ainfo.multiplechar = true; // can be empty or single char
     294  arg_ainfo.multiplevalue = false;
    270295  arg_ainfo.defaultstatus = cgiarginfo::weak;
    271296  arg_ainfo.argdefault = g_EmptyText;
    … …  
    277302  arg_ainfo.longname = "query box type";
    278303  arg_ainfo.multiplechar = false;
     304  arg_ainfo.multiplevalue = false;
    279305  arg_ainfo.defaultstatus = cgiarginfo::weak;
    280306  arg_ainfo.argdefault = "0";
    … …  
    288314  arg_ainfo.longname = "form query stems";
    289315  arg_ainfo.multiplechar = true;
     316  arg_ainfo.multiplevalue = false;
    290317  arg_ainfo.defaultstatus = cgiarginfo::weak;
    291318  arg_ainfo.argdefault = g_EmptyText;
    … …  
    299326  arg_ainfo.longname = "form query casefolds";
    300327  arg_ainfo.multiplechar = true;
     328  arg_ainfo.multiplevalue = false;
    301329  arg_ainfo.defaultstatus = cgiarginfo::weak;
    302330  arg_ainfo.argdefault = g_EmptyText;
Note: See TracChangeset for help on using the changeset viewer.