still searched for stripped words even if

has a synset. fixed query lang
detector in SearchInput.cpp.
This commit is contained in:
mwells 2014-06-01 10:18:24 -07:00
parent d15f5d3ce7
commit 918f43f80e
2 changed files with 12 additions and 4 deletions

@ -888,14 +888,21 @@ m if (! cr->hasSearchPermission ( sock, encapIp ) ) {
}
/* --- End Virtual host language detection --- */
char *qs1 = m_defaultSortLanguage;
//char *qs1 = m_defaultSortLanguage;
// this overrides though
//long qlen2;
//char *qs2 = r->getString ("qlang",&qlen2,NULL);
//if ( qs2 ) qs1 = qs2;
m_queryLang = getLanguageFromAbbr ( qs1 );
//m_queryLang = getLanguageFromAbbr ( qs1 );
m_queryLang = detectQueryLanguage();
char *qs1 = getLangAbbr(m_queryLang);
log("query: using default lang of %s",getLangAbbr(m_queryLang));
if ( qs1 && qs1[0] && ! m_queryLang )
log("query: qlang of \"%s\" is NOT SUPPORTED",qs1);

@ -332,11 +332,12 @@ long Synonyms::getSynonyms ( Words *words ,
// add in the next syn set, deduped
if ( next ) { ss = next; goto addSynSet; }
// wrap it up
done:
//done:
// all done
return m_aidsPtr - m_aids;
//return m_aidsPtr - m_aids;
}
done:
// strip marks from THIS word, return -1 w/ g_errno set on error
if ( ! addStripped ( w , wlen,&dt ) ) return m_aidsPtr - m_aids;