Merge 408cc7a into 7551fc5

manticoresoftware · Jul 4, 2024 · 2589034 · 2589034
2 parents 7551fc5 + 408cc7a
commit 2589034
Show file tree

Hide file tree

Showing 12 changed files with 772 additions and 153 deletions.
diff --git a/src/dict/template_dict_traits.cpp b/src/dict/template_dict_traits.cpp
@@ -522,7 +522,7 @@ void TemplateDictTraits_c::LoadStopwords ( const char * sFiles, FilenameBuilder_
 
 		// tokenize stopwords line by line to prevent exceptions to fold multiple lines
 		sphSplitApply ( (const char *)dBuffer.Begin(), iLength, "\r\n", [&] ( const char * sLine, int iLineLen )
-		{ 
+		{
 			BYTE* pToken;
 			pTokenizerClone->SetBuffer ( (const BYTE *)sLine, iLineLen );
 			while ( ( pToken = pTokenizerClone->GetToken() ) != nullptr )
@@ -686,7 +686,7 @@ void TemplateDictTraits_c::AddWordform ( CSphWordforms* pContainer, char* sBuffe
 	if ( !dTokens.GetLength() )
 	{
 		if ( !bCommentedWholeLine )
-			sphWarning ( "table '%s': all source tokens are stopwords (wordform='%s', file='%s'). IGNORED.", pContainer->m_sIndexName.cstr(), sBuffer, szFile );
+			sphWarning ( "table '%s': all wordform source tokens are stopwords (wordform='%s', file='%s'). IGNORED.", pContainer->m_sIndexName.cstr(), sBuffer, szFile );
 		return;
 	}
 
@@ -915,7 +915,7 @@ CSphWordforms* TemplateDictTraits_c::LoadWordformContainer ( const CSphVector<CS
 
 	TokenizerRefPtr_c pMyTokenizer = pTokenizer->Clone ( SPH_CLONE_INDEX );
 	const CSphTokenizerSettings& tSettings = pMyTokenizer->GetSettings();
-	
+
 	CSphVector<int> dBlended;
 
 	// get a list of blend chars and set add them to the tokenizer as simple chars
@@ -1276,4 +1276,4 @@ void sphShutdownWordforms()
 void SetupLemmatizerBase()
 {
 	g_sLemmatizerBase = GET_FULL_SHARE_DIR();
-}
+}