Ignore:
Timestamp:
2010-09-28T15:35:11+13:00 (14 years ago)
Author:
kjdon
Message:

when setting up a cgiarg, parameters not defined get left at their previous value. So setting cc arg multiplevalue=true ended up setting all following args to multiplevalue=true. But for fqk and fqs we don't want this, and presumably for the other args too. So I have moved cc arg to the bottom. But we should go through and explicitly set all args multiplevalue parameters to true or false so there is no confusion

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp

    r22693 r22980  
    210210  argsinfo.addarginfo (NULL, arg_ainfo);
    211211
     212  // "g" - new arg for granularity, for mgpp collections
     213  arg_ainfo.shortname = "g";
     214  arg_ainfo.longname = "granularity";
     215  arg_ainfo.multiplechar = true;
     216  arg_ainfo.defaultstatus = cgiarginfo::weak;
     217  arg_ainfo.argdefault = g_EmptyText;
     218  arg_ainfo.savedarginfo = cgiarginfo::must;
     219  argsinfo.addarginfo (NULL, arg_ainfo);
     220
     221  // "ds" - start date
     222  arg_ainfo.shortname = "ds";
     223  arg_ainfo.longname = "start date";
     224  arg_ainfo.multiplechar = true;
     225  arg_ainfo.defaultstatus = cgiarginfo::weak;
     226  arg_ainfo.argdefault = g_EmptyText;
     227  arg_ainfo.savedarginfo = cgiarginfo::must;
     228  argsinfo.addarginfo (NULL, arg_ainfo);
     229
     230  // "de" - end date
     231  arg_ainfo.shortname = "de";
     232  arg_ainfo.longname = "end date";
     233  arg_ainfo.multiplechar = true;
     234  arg_ainfo.defaultstatus = cgiarginfo::weak;
     235  arg_ainfo.argdefault = g_EmptyText;
     236  arg_ainfo.savedarginfo = cgiarginfo::must;
     237  argsinfo.addarginfo (NULL, arg_ainfo);
     238
     239  // "dsbc" - whether or not start date is prechristian
     240  arg_ainfo.shortname = "dsbc";
     241  arg_ainfo.longname = "start date bc";
     242  arg_ainfo.multiplechar = false;
     243  arg_ainfo.defaultstatus = cgiarginfo::weak;
     244  arg_ainfo.argdefault = "0";
     245  arg_ainfo.savedarginfo = cgiarginfo::must;
     246  argsinfo.addarginfo (NULL, arg_ainfo);
     247
     248  // "debc" - whether or not end date is prechristian
     249  arg_ainfo.shortname = "debc";
     250  arg_ainfo.longname = "end date bc";
     251  arg_ainfo.multiplechar = false;
     252  arg_ainfo.defaultstatus = cgiarginfo::weak;
     253  arg_ainfo.argdefault = "0";
     254  arg_ainfo.savedarginfo = cgiarginfo::must;
     255  argsinfo.addarginfo (NULL, arg_ainfo);
     256
     257  // "qt" - 0 = text, 1 = form
     258  arg_ainfo.shortname = "qt";
     259  arg_ainfo.longname = "query type";
     260  arg_ainfo.multiplechar = true; // can be empty or single char
     261  arg_ainfo.defaultstatus = cgiarginfo::weak;
     262  arg_ainfo.argdefault = g_EmptyText;
     263  arg_ainfo.savedarginfo = cgiarginfo::must;
     264  argsinfo.addarginfo (NULL, arg_ainfo);
     265
     266  // "qto" - 1 = text only, 2 = form only, 3 = text and form
     267  arg_ainfo.shortname = "qto";
     268  arg_ainfo.longname = "query type options";
     269  arg_ainfo.multiplechar = true; // can be empty or single char
     270  arg_ainfo.defaultstatus = cgiarginfo::weak;
     271  arg_ainfo.argdefault = g_EmptyText;
     272  arg_ainfo.savedarginfo = cgiarginfo::must;
     273  argsinfo.addarginfo (NULL, arg_ainfo);
     274   
     275  // "qb" - 0 = regular, 1 = large
     276  arg_ainfo.shortname = "qb";
     277  arg_ainfo.longname = "query box type";
     278  arg_ainfo.multiplechar = false;
     279  arg_ainfo.defaultstatus = cgiarginfo::weak;
     280  arg_ainfo.argdefault = "0";
     281  arg_ainfo.savedarginfo = cgiarginfo::must;
     282  argsinfo.addarginfo (NULL, arg_ainfo);
     283
     284
     285  // "fqs" - the list of stemming options in the form query
     286  // - a comma separated list
     287  arg_ainfo.shortname = "fqs";
     288  arg_ainfo.longname = "form query stems";
     289  arg_ainfo.multiplechar = true;
     290  arg_ainfo.defaultstatus = cgiarginfo::weak;
     291  arg_ainfo.argdefault = g_EmptyText;
     292  arg_ainfo.savedarginfo = cgiarginfo::must;
     293  argsinfo.addarginfo (NULL, arg_ainfo);
     294 
     295
     296  // "fqk" - the list of casefolding options in the form query
     297  // - a comma separated list
     298  arg_ainfo.shortname = "fqk";
     299  arg_ainfo.longname = "form query casefolds";
     300  arg_ainfo.multiplechar = true;
     301  arg_ainfo.defaultstatus = cgiarginfo::weak;
     302  arg_ainfo.argdefault = g_EmptyText;
     303  arg_ainfo.savedarginfo = cgiarginfo::must;
     304  argsinfo.addarginfo (NULL, arg_ainfo);
     305 
    212306  // "cc"
    213307  arg_ainfo.shortname = "cc";
    … …  
    220314  argsinfo.addarginfo (NULL, arg_ainfo);
    221315
    222 
    223   // "g" - new arg for granularity, for mgpp collections
    224   arg_ainfo.shortname = "g";
    225   arg_ainfo.longname = "granularity";
    226   arg_ainfo.multiplechar = true;
    227   arg_ainfo.defaultstatus = cgiarginfo::weak;
    228   arg_ainfo.argdefault = g_EmptyText;
    229   arg_ainfo.savedarginfo = cgiarginfo::must;
    230   argsinfo.addarginfo (NULL, arg_ainfo);
    231 
    232   // "ds" - start date
    233   arg_ainfo.shortname = "ds";
    234   arg_ainfo.longname = "start date";
    235   arg_ainfo.multiplechar = true;
    236   arg_ainfo.defaultstatus = cgiarginfo::weak;
    237   arg_ainfo.argdefault = g_EmptyText;
    238   arg_ainfo.savedarginfo = cgiarginfo::must;
    239   argsinfo.addarginfo (NULL, arg_ainfo);
    240 
    241   // "de" - end date
    242   arg_ainfo.shortname = "de";
    243   arg_ainfo.longname = "end date";
    244   arg_ainfo.multiplechar = true;
    245   arg_ainfo.defaultstatus = cgiarginfo::weak;
    246   arg_ainfo.argdefault = g_EmptyText;
    247   arg_ainfo.savedarginfo = cgiarginfo::must;
    248   argsinfo.addarginfo (NULL, arg_ainfo);
    249 
    250   // "dsbc" - whether or not start date is prechristian
    251   arg_ainfo.shortname = "dsbc";
    252   arg_ainfo.longname = "start date bc";
    253   arg_ainfo.multiplechar = false;
    254   arg_ainfo.defaultstatus = cgiarginfo::weak;
    255   arg_ainfo.argdefault = "0";
    256   arg_ainfo.savedarginfo = cgiarginfo::must;
    257   argsinfo.addarginfo (NULL, arg_ainfo);
    258 
    259   // "debc" - whether or not end date is prechristian
    260   arg_ainfo.shortname = "debc";
    261   arg_ainfo.longname = "end date bc";
    262   arg_ainfo.multiplechar = false;
    263   arg_ainfo.defaultstatus = cgiarginfo::weak;
    264   arg_ainfo.argdefault = "0";
    265   arg_ainfo.savedarginfo = cgiarginfo::must;
    266   argsinfo.addarginfo (NULL, arg_ainfo);
    267 
    268   // "qt" - 0 = text, 1 = form
    269   arg_ainfo.shortname = "qt";
    270   arg_ainfo.longname = "query type";
    271   arg_ainfo.multiplechar = true; // can be empty or single char
    272   arg_ainfo.defaultstatus = cgiarginfo::weak;
    273   arg_ainfo.argdefault = g_EmptyText;
    274   arg_ainfo.savedarginfo = cgiarginfo::must;
    275   argsinfo.addarginfo (NULL, arg_ainfo);
    276 
    277   // "qto" - 1 = text only, 2 = form only, 3 = text and form
    278   arg_ainfo.shortname = "qto";
    279   arg_ainfo.longname = "query type options";
    280   arg_ainfo.multiplechar = true; // can be empty or single char
    281   arg_ainfo.defaultstatus = cgiarginfo::weak;
    282   arg_ainfo.argdefault = g_EmptyText;
    283   arg_ainfo.savedarginfo = cgiarginfo::must;
    284   argsinfo.addarginfo (NULL, arg_ainfo);
    285    
    286   // "qb" - 0 = regular, 1 = large
    287   arg_ainfo.shortname = "qb";
    288   arg_ainfo.longname = "query box type";
    289   arg_ainfo.multiplechar = false;
    290   arg_ainfo.defaultstatus = cgiarginfo::weak;
    291   arg_ainfo.argdefault = "0";
    292   arg_ainfo.savedarginfo = cgiarginfo::must;
    293   argsinfo.addarginfo (NULL, arg_ainfo);
    294 
    295 
    296   // "fqs" - the list of stemming options in the form query
    297   // - a comma separated list
    298   arg_ainfo.shortname = "fqs";
    299   arg_ainfo.longname = "form query stems";
    300   arg_ainfo.multiplechar = true;
    301   arg_ainfo.defaultstatus = cgiarginfo::weak;
    302   arg_ainfo.argdefault = g_EmptyText;
    303   arg_ainfo.savedarginfo = cgiarginfo::must;
    304   argsinfo.addarginfo (NULL, arg_ainfo);
    305  
    306 
    307   // "fqk" - the list of casefolding options in the form query
    308   // - a comma separated list
    309   arg_ainfo.shortname = "fqk";
    310   arg_ainfo.longname = "form query casefolds";
    311   arg_ainfo.multiplechar = true;
    312   arg_ainfo.defaultstatus = cgiarginfo::weak;
    313   arg_ainfo.argdefault = g_EmptyText;
    314   arg_ainfo.savedarginfo = cgiarginfo::must;
    315   argsinfo.addarginfo (NULL, arg_ainfo);
    316  
    317316
    318317  // ****
Note: See TracChangeset for help on using the changeset viewer.