Changeset 30373
- Timestamp:
- 2016-02-10T14:53:51+13:00 (8 years ago)
- Location:
- main/trunk/greenstone2/runtime-src/src/recpt
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/src/recpt/cgiutils.cpp
r28888 r30373 412 412 text_t::const_iterator here = argstr.begin(); 413 413 text_t::const_iterator end = argstr.end(); 414 // get seems to be not unicode, while post is, so don't want to just assume encoding is 1 (not unicode) 415 unsigned short args_encoding = argstr.getencoding(); 416 cerr << "args enc = "<< args_encoding<<endl; 414 417 text_t key, value; 415 418 … … 425 428 safe_cgi_arg(key, value); // mitigate obvious cross-site scripting hacks in URL cgi-params 426 429 427 value.setencoding( 1);// other encoding430 value.setencoding(args_encoding); //1 // other encoding 428 431 // store this key=value pair 429 432 if (!key.empty()) { … … 441 444 // If the arg is not multi valued, then you need to decode the commas. 442 445 if (args.getarg(key)==NULL) { 443 args.setarg (key, encode_commas(value), cgiarg_t::cgi_arg); 446 // encode_commas returns a text_t without encoding bit set 447 text_t newvalue = encode_commas(value); 448 newvalue.setencoding(args_encoding); 449 args.setarg (key, newvalue, cgiarg_t::cgi_arg); 444 450 } 445 451 else { … … 447 453 448 454 newvalue += "," + encode_commas(value); 449 newvalue.setencoding( 1); // other encoding455 newvalue.setencoding(args_encoding); // other encoding 450 456 args.setarg (key, newvalue, cgiarg_t::cgi_arg); 451 457 } … … 457 463 if (args.lookupcgiarg(key).source == cgiarg_t::cgi_arg) newvalue += ","; 458 464 newvalue += encode_commas(value); 459 newvalue.setencoding( 1); // other encoding465 newvalue.setencoding(args_encoding); // other encoding 460 466 args.setarg (key, newvalue, cgiarg_t::cgi_arg); 461 467 -
main/trunk/greenstone2/runtime-src/src/recpt/cgiwrapper.cpp
r28973 r30373 783 783 // GET form data 784 784 if (aURIStr != NULL) argstr = aURIStr; 785 //kjdon a get form is not unicode 786 argstr.setencoding(1); 785 787 } else { 786 788 // debugging from command line -
main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp
r30329 r30373 365 365 if (args_prefix == (macro_prefix+"md.")) { 366 366 text_t args_val = args[args_name]; 367 cerr << "caching md arg "<<args_val<<endl; 368 decode_cgi_arg(args_val); 367 369 text_t args_suffix = substr(args_name.begin()+prefix_len+3,args_name.end()); 368 370 … … 374 376 if (!mdvalues[i].empty()) { 375 377 376 378 //decode_cgi_arg(mdvalues[i]); 377 379 378 380 if (cached_metadata_values == "") { … … 805 807 if (args_prefix == (macro_prefix+"md.")) { 806 808 text_t args_val = args[args_name]; 807 809 cerr << "args val = "<<args_val<<endl; 810 decode_cgi_arg(args_val); 811 cerr << "decoded" << args_val<<endl; 808 812 text_t args_suffix = substr(args_name.begin()+prefix_len+3,args_name.end()); 809 813 … … 811 815 splitchar (args_val.begin(), args_val.end(), ',', mdvalues); 812 816 int numvalues = mdvalues.size(); 813 817 cerr << "numvals = "<<numvalues<<endl; 814 818 for (int i = 0; i < numvalues; ++i) { 815 819 if (!mdvalues[i].empty()) { 816 decode_cgi_arg(mdvalues[i]);820 //decode_cgi_arg(mdvalues[i]); 817 821 metadata_file += " <Metadata mode=\"accumulate\" name=\""; 818 822 metadata_file += args_suffix;
Note:
See TracChangeset
for help on using the changeset viewer.