Changeset 12419

Timestamp:

2006-08-09T10:46:45+12:00 (18 years ago)

Author:

mdewsnip

Message:

Removed a lot of commented out stuff that was just copied from mgppsearch.

File:

• trunk/gsdl/src/colservr/lucenesearch.cpp (modified) (2 diffs)

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -199 +199 @@
   return true;
 }
-  /*
-  // use default query info settings - change to reflect user preferences??
-  QueryInfo queryInfo;
-  
-  SetCStr (queryInfo.docLevel, (queryparams.level.getcstr())); 
-  queryInfo.maxDocs = (unsigned long)queryparams.maxdocs;
-  queryInfo.sortByRank = (queryparams.search_type == 1);
-  queryInfo.exactWeights = false;
-  queryInfo.needRankInfo = true; // used for overall term freq as well as ranking
-  queryInfo.needTermFreqs = true;
-  
-  ExtQueryResult queryResult;
-  
-  UCArray queryArray;
-  // greenstone gives us the query encoded in unicode. We want utf8.
-  char* utf8querystring=to_utf8(queryparams.querystring).getcstr();
-  SetCStr(queryArray, utf8querystring);
-  delete utf8querystring;
-
-  UCArray level;
-  UCArrayClear(level);
-  
-  //set the level for results
-  SetCStr(level, gdbm_level.getcstr());
-
-  
-  // do the query
-  // LuceneQuery(*indexData, queryInfo, queryTree, queryResult, level); // ****
-  
- 
-  // convert ExtQueryResult to queryresultclass
-  
-  queryresult.docs_matched = (int)queryResult.docs.size();
-
-  if (queryresult.docs_matched == (int)queryResult.actualNumDocs) {
-    queryresult.is_approx = Exact; 
-  }
-  else if (queryresult.docs_matched < (int)queryResult.actualNumDocs) {
-    queryresult.is_approx = MoreThan;
-  }
-  else {
-    queryresult.is_approx = Approximate;
-  }
-
-  docresultclass doc;
-  for (int i=0; i<(int)queryResult.docs.size(); ++i) {
-    doc.clear();
-    doc.docnum = (int)queryResult.levels[i];
-    doc.docweight = queryResult.ranks[i];
-    queryresult.docs.docset[doc.docnum] = doc;
-    queryresult.docs.docorder.push_back(doc.docnum);
-
-  }
-
-  // term info
-  termfreqclass term;
-  for (int k=0; k<(int)queryResult.termFreqs.size(); ++k) {
-    term.clear();
-    char* termfreq_cstr=GetCStr(queryResult.termFreqs[k].term);
-    term.termstr = to_uni(termfreq_cstr);
-    delete termfreq_cstr;
-    term.termstemstr = term.termstr;
-    // we don't set term.utf8equivterms ?? - jrm21
-    term.termfreq = queryResult.termFreqs[k].termFreq;
-    queryresult.terms.push_back(term);
-    queryresult.orgterms.push_back(term); // should this change??
-    
-    for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); ++j) {
-      char* equivterm_cstr=GetCStr(queryResult.termFreqs[k].equivTerms[j]);
-      queryresult.termvariants.insert(to_uni(equivterm_cstr));
-      delete equivterm_cstr;
-    }
-
-  }
-  // clean up
-  delete indexname;
-  return true;
-  */
 
 
@@ -284 +206 @@
 
   cerr << "**** Not sure what this function does!" << endl;
-
-  /*
-#ifdef __WIN32__
-  char basepath[]="";
-#else
-  char basepath[] = "/";
-#endif
-
-  char *indexname = (filename_cat(collectdir, getindexsuffix(queryparams))).getcstr();
- 
-  UCArray level;
-  UCArrayClear(level);
-  
-  //browse always at top level
-  SetCStr(level, "Doc"); // this name may change.
-
-  
-  BrowseQueryNode browseNode;
-  browseNode.startPosition = start;
-  browseNode.numTerms = numDocs;
-
-  BrowseQueryResult browseResult;
-  
-
-  UCArrayClear(browseNode.term);
-  // greenstone gives us the query encoded in unicode. We want utf8.
-  char* utf8querystring=to_utf8(queryparams.querystring).getcstr();
-  SetCStr(browseNode.term, utf8querystring);
-  delete utf8querystring;
-
-  // do the actual query
-  // LuceneBrowseQuery(*indexData, level, browseNode, browseResult); // ****
-
-  // load results into term info
-  termfreqclass term;
-  for (int i=0; i<(int)browseResult.termFreqs.size(); ++i) {
-    term.clear();
-    char* term_cstr = GetCStr(browseResult.termFreqs[i].term);
-    term.termstr = to_uni(term_cstr);
-    delete term_cstr;
-    term.termstemstr = term.termstr;
-    term.termfreq = browseResult.termFreqs[i].termFreq;
-    queryresult.terms.push_back(term);
-    queryresult.orgterms.push_back(term);
-
-  }
-  // clean up
-  delete indexname;
-
-  return true;
-
-  */
-
   return false;
 }