Changeset 12410
- Timestamp:
- 2006-08-07T16:10:16+12:00 (18 years ago)
- Location:
- trunk/gsdl/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/colservr/lucenesearch.cpp
r12388 r12410 121 121 text_t cmd = "\"" + filename_cat(gsdlhome, "bin", "script", "lucene_query.pl") + "\""; 122 122 cmd += (text_t)" \""+indexname + (text_t)"\" \"" + escaped_utf8querystring + (text_t)"\""; 123 124 if (!queryparams.filterstring.empty()) { 125 cmd += " -filter \"" + queryparams.filterstring + "\""; 126 } 123 127 if (!queryparams.sortfield.empty()) { 124 128 cmd += " -sort \"" + queryparams.sortfield + "\""; -
trunk/gsdl/src/colservr/queryfilter.cpp
r12388 r12410 90 90 query.maxdocs = filterOptions["Maxdocs"].defaultValue.getint(); 91 91 query.level = filterOptions["Level"].defaultValue; 92 // Lucene specific93 query.sortfield = filterOptions["SortField"].defaultValue; 94 query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true"); 92 query.filterstring = filterOptions["FilterString"].defaultValue; // Lucene specific 93 query.sortfield = filterOptions["SortField"].defaultValue; // Lucene specific 94 query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true"); // Lucene specific 95 95 query.maxnumeric = maxnumeric; 96 96 OptionValue_tarray::const_iterator options_here = request.filterOptions.begin(); … … 119 119 query.stemming = (filterOptions["Stem"].defaultValue == "true"); 120 120 query.level = filterOptions["Level"].defaultValue; 121 // Lucene specific122 query.sortfield = filterOptions["SortField"].defaultValue; 123 query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true"); 121 query.filterstring = filterOptions["FilterString"].defaultValue; // Lucene specific 122 query.sortfield = filterOptions["SortField"].defaultValue; // Lucene specific 123 query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true"); // Lucene specific 124 124 query.maxnumeric = maxnumeric; 125 125 // "all", needed when combining queries where the document results are needed … … 154 154 } else if ((*options_here).name == "Level") { 155 155 query.level = (*options_here).value; 156 } else if ((*options_here).name == "FilterString") { 157 query.filterstring = (*options_here).value; 156 158 } else if ((*options_here).name == "SortField") { 157 159 query.sortfield = (*options_here).value; -
trunk/gsdl/src/colservr/queryinfo.cpp
r12388 r12410 47 47 maxdocs = -1; // all 48 48 maxnumeric = 4; // must default to the same value as mg_passes 49 filterstring.clear(); 49 50 sortfield.clear(); 50 51 fuzzysearch = 0; // 0 = not fuzzy, 1 = fuzzy … … 66 67 maxdocs = q.maxdocs; 67 68 maxnumeric = q.maxnumeric; 69 filterstring = q.filterstring; 68 70 sortfield = q.sortfield; 69 71 fuzzysearch = q.fuzzysearch; … … 86 88 (x.maxdocs == y.maxdocs) && 87 89 (x.maxnumeric == y.maxnumeric) && 90 (x.filterstring == y.filterstring) && 88 91 (x.sortfield == y.sortfield) && 89 92 (x.fuzzysearch == y.fuzzysearch)); … … 112 115 outs << " maxdocs = \"" << q.maxdocs << "\"\n"; 113 116 outs << " maxnumeric = \"" << q.maxnumeric << "\"\n"; 117 outs << " filterstring = \"" << q.filterstring << "\"\n"; 114 118 outs << " sortfield = \"" << q.sortfield << "\"\n"; 115 119 outs << " fuzzysearch = \"" << q.fuzzysearch << "\"\n"; -
trunk/gsdl/src/colservr/queryinfo.h
r12388 r12410 66 66 int maxdocs; 67 67 int maxnumeric; 68 text_t filterstring; // Filter specified (currently only used by Lucene) 68 69 text_t sortfield; // Field to use for sorting result set (currently used by lucene) 69 70 int fuzzysearch; // Should search be fuzzy (only used by Lucene) -
trunk/gsdl/src/recpt/querytools.cpp
r12388 r12410 138 138 option.name = "Level"; 139 139 option.value = args["g"]; 140 request.filterOptions.push_back (option); 141 } 142 143 if (!args["fs"].empty()) { // filter string for lucene 144 option.name = "FilterString"; 145 option.value = args["fs"]; 140 146 request.filterOptions.push_back (option); 141 147 }
Note:
See TracChangeset
for help on using the changeset viewer.