Removed default value of parameter useQueryStopWords in Query::set2()

Images.cpp

@@ -117,7 +117,7 @@ void Images::setCandidates ( Url *pageUrl , Words *words , Xml *xml , Sections *
 		snprintf ( buf , 1999, "gbimage:\"%s\"",iu.getUrl());
 		// TODO: make sure this is a no-split termid storage thingy
 		// in Msg14.cpp
-		if ( ! q.set2 ( buf , langUnknown , false ) ) return;
+		if ( ! q.set2 ( buf , langUnknown , false, false ) ) return;
 		// sanity test
 		if ( q.getNumTerms() != 1 ) { g_process.shutdownAbort(true); }
 		// store the termid
@@ -246,7 +246,7 @@ void Images::setCandidates ( Url *pageUrl , Words *words , Xml *xml , Sections *
 		sprintf ( buf , "gbimage:\"%s\"",u);
 		// TODO: make sure this is a no-split termid storage thingy
 		// in Msg14.cpp
-		if ( ! q.set2 ( buf , langUnknown , false ) )
+		if ( ! q.set2 ( buf , langUnknown , false, false ) )
 			// return true with g_errno set on error
 			return;
 		// store the termid
@@ -321,7 +321,7 @@ bool Images::getThumbnail ( char *pageSite ,
 	// TODO: make sure this is a no-split termid storage thingy
 	// in Msg14.cpp
 	Query q;
-	if ( ! q.set2 ( buf , langUnknown , false ) )
+	if ( ! q.set2 ( buf , langUnknown , false, false ) )
 		// return true with g_errno set on error
 		return true;
 	// store the termid

PageGet.cpp

@@ -489,7 +489,7 @@ bool processLoop ( void *state ) {
 	x += strlen(x);		
 	// set our query for highlighting
 	Query qq;
-	qq.set2 ( q, st->m_langId , true );
+	qq.set2 ( q, st->m_langId , true, true );
 
 	// print the query terms into our highlight buffer
 	Highlight hi;

PageParser.cpp

@@ -224,7 +224,7 @@ static bool sendPageParser2 ( TcpSocket   *s ,
 	// set query
 	int32_t qlen;
 	const char *qs = r->getString("q",&qlen,NULL);
-	if ( qs ) st->m_tq.set2 ( (char*)qs , langUnknown , true );
+	if ( qs ) st->m_tq.set2 ( (char*)qs , langUnknown , true, true );
 	// url will override docid if given
 	if ( ! st->m_u || ! st->m_u[0] ) 
 		st->m_docId = r->getLongLong ("docid",-1);
@@ -758,7 +758,7 @@ bool sendPageAnalyze ( TcpSocket *s , HttpRequest *r ) {
 	// set query
 	int32_t qlen;
 	const char *qs = r->getString("q",&qlen,NULL);
-	if ( qs ) st->m_tq.set2 ( (char*)qs , langUnknown , true );
+	if ( qs ) st->m_tq.set2 ( (char*)qs , langUnknown , true, true );
 	// url will override docid if given
 	st->m_docId = r->getLongLong ("d",-1);
 	st->m_docId = r->getLongLong ("docid",st->m_docId);

PageReindex.cpp

@@ -249,7 +249,7 @@ bool Msg1c::reindexQuery ( char *query ,
 	m_niceness = MAX_NICENESS;
 
 	// langunknown?
-	m_qq.set2 ( query , langId , true );
+	m_qq.set2 ( query , langId , true, true );
 
 	// sanity fix
 	if ( endNum - startNum > MAXDOCIDSTOCOMPUTE )

PageResults.cpp

@@ -1226,7 +1226,7 @@ bool printSearchResultsHeader ( State0 *st ) {
 	//   QueryTerms even if they're in quotes or in a connection (cd-rom).
 	//   we use this for highlighting purposes
 	Query qq;
-	qq.set2 ( si->m_displayQuery, langUnknown , si->m_queryExpansion );
+	qq.set2 ( si->m_displayQuery, langUnknown , si->m_queryExpansion, si->m_queryExpansion/*usestopwords*/ );
 
 	if ( g_errno ) return false;//sendReply (st,NULL);
 

Proxy.cpp

@@ -345,7 +345,7 @@ bool Proxy::handleRequest (TcpSocket *s){
 	const char *qs = hr.getString("q",NULL);
 	Query q;
 	if ( qs ) 
-		q.set2 ( qs , langUnknown , false ); // 2 = autodetect bool
+		q.set2 ( qs , langUnknown , false, false ); // 2 = autodetect bool
 	// clear g_errno in case Query::set() set it
 	g_errno = 0;
 	// save it. might be zero!

Query.h

@@ -415,7 +415,7 @@ class Query {
 	bool set2 ( const char *query    , 
 		    uint8_t  langId ,
 		    bool     queryExpansion ,
-		    bool     useQueryStopWords = true ,
+		    bool     useQueryStopWords,
 		    int32_t  maxQueryTerms = 0x7fffffff );
 
 	const char *getQuery() const { return m_orig; }

Speller.cpp

@@ -56,7 +56,7 @@ void Speller::test ( char *ff ) {
 		if ( wlen <= 0 ) continue;
 		buf[wlen-1]='\0';
 		Query q;
-		q.set2 ( buf , langUnknown , false );
+		q.set2 ( buf , langUnknown , false, false );
 	}
 	fclose(fd);
 }

XmlDoc.cpp

@@ -16928,7 +16928,7 @@ Query *XmlDoc::getQuery() {
 	int64_t start = logQueryTimingStart();
 
 	// return NULL with g_errno set on error
-	if ( !m_query.set2( m_req->ptr_qbuf, m_req->m_langId, true ) ) {
+	if ( !m_query.set2( m_req->ptr_qbuf, m_req->m_langId, true, true ) ) {
 		if(!g_errno)
 			g_errno = EBADENGINEER; //can fail due to a multitude of problems
 		return NULL;

main.cpp

@@ -4554,7 +4554,7 @@ bool parseTest ( const char *coll, int64_t docId, const char *query ) {
 
 	Matches matches;
 	Query q;
-	q.set2 ( query , langUnknown , false );
+	q.set2 ( query , langUnknown , false, false );
 	matches.setQuery ( &q );
 	words.set ( &xml , true ) ;
 	t = gettimeofdayInMilliseconds();
@@ -4584,7 +4584,7 @@ bool summaryTest1   ( char *rec, int32_t listSize, const char *coll, int64_t doc
 	int64_t t = gettimeofdayInMilliseconds();
 
 	Query q;
-	q.set2 ( query , langUnknown , false );
+	q.set2 ( query , langUnknown , false, false );
 
 	char *content ;
 	int32_t  contentLen ;