Changeset 22047

Show
Ignore:
Timestamp:
06.05.2010 12:55:26 (9 years ago)
Author:
davidb
Message:

Changes necessary to support new sql-query action

Files:
1 modified

Legend:

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

    r21743 r22047  
    12861286    text_t formattedstring = args["q"]; 
    12871287    format_querystring (formattedstring, args.getintarg("b"), segment); 
    1288     set_queryfilter_options (request, formattedstring, args); 
     1288    set_fulltext_queryfilter_options (request, formattedstring, args); 
    12891289    args["q"] = formattedstring; // need to set this here for phrase  
    12901290                   // highlighting, where we look at the querystring 
     
    13781378    int count = 0; 
    13791379    while (sechere != secend) { 
    1380       textout << outconvert << disp << "\n<p><a name=" << (*sechere).OID << "></a>\n"; 
     1380      textout << outconvert << disp << "\n<p><a name=\"" << (*sechere).OID << "\"></a>\n"; 
    13811381 
    13821382      int shastxt = (*sechere).metadata["hastxt"].values[0].getint(); 
     1383 
    13831384 
    13841385      output_text (*sechere, formatlistptr, queryresponse.termInfo,  
    13851386               (*sechere).OID, highlight, shastxt, wanttext, collection,  
    13861387               collectproto, browsers, disp, outconvert, textout, logout, args); 
     1388 
    13871389      ++count; 
    13881390      ++sechere; 
     
    14211423            text_t formattedstring = args["q"]; 
    14221424            format_querystring (formattedstring, args.getintarg("b"), segment); 
    1423             set_queryfilter_options (request, formattedstring, args); 
     1425            set_fulltext_queryfilter_options (request, formattedstring, args); 
    14241426            args["q"] = formattedstring;    //need to set this here for phrase  
    14251427                                //highlighting, where we look at the querystring