summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/mnoGoSearch-current/Makefile2
-rw-r--r--www/mnoGoSearch-current/files/patch-stopw24
-rw-r--r--www/mnoGoSearch-current/pkg-plist1
-rw-r--r--www/mnogosearch/Makefile2
-rw-r--r--www/mnogosearch/files/patch-stopw24
-rw-r--r--www/mnogosearch/pkg-plist1
-rw-r--r--www/mnogosearch31/Makefile2
-rw-r--r--www/mnogosearch31/files/patch-stopw24
-rw-r--r--www/mnogosearch31/pkg-plist1
9 files changed, 78 insertions, 3 deletions
diff --git a/www/mnoGoSearch-current/Makefile b/www/mnoGoSearch-current/Makefile
index e989b9604f40..c2e83220203a 100644
--- a/www/mnoGoSearch-current/Makefile
+++ b/www/mnoGoSearch-current/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mnogosearch
PORTVERSION= 3.1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www databases
MASTER_SITES= http://search.mnogo.ru/Download/
diff --git a/www/mnoGoSearch-current/files/patch-stopw b/www/mnoGoSearch-current/files/patch-stopw
new file mode 100644
index 000000000000..44469a7c24db
--- /dev/null
+++ b/www/mnoGoSearch-current/files/patch-stopw
@@ -0,0 +1,24 @@
+--- src/searchtool.c.orig Fri Feb 16 19:12:22 2001
++++ src/searchtool.c Thu Mar 1 16:22:54 2001
+@@ -251,11 +251,16 @@
+ continue;
+ }
+ len=strlen(rw);
+- if(UdmIsStopWord(query->Conf,rw)||(query->Conf->min_word_len>len)||(query->Conf->max_word_len<len)){
+- if(query->wordinfo[0])strcat(query->wordinfo,", ");
+- sprintf(UDM_STREND(query->wordinfo)," %s :stopword",rw);
+- lex=UdmGetLex(&w,&lasttok,query->charset);
+- continue;
++
++ if(query->word_match==UDM_MATCH_WORD){
++ /* Check stopword only when full word */
++ /* Substring searches should not exclude them */
++ if(UdmIsStopWord(query->Conf,rw)||(query->Conf->min_word_len>len)||(query->Conf->max_word_len<len)){
++ if(query->wordinfo[0])strcat(query->wordinfo,", ");
++ sprintf(UDM_STREND(query->wordinfo)," %s :stopword",rw);
++ lex=UdmGetLex(&w,&lasttok,query->charset);
++ continue;
++ }
+ }
+ if(query->words_in_query<UDM_MAXWORDPERQUERY-1){
+ query->words[query->words_in_query]=strdup(rw);
diff --git a/www/mnoGoSearch-current/pkg-plist b/www/mnoGoSearch-current/pkg-plist
index 4069af3c33f8..55b0cbbd7179 100644
--- a/www/mnoGoSearch-current/pkg-plist
+++ b/www/mnoGoSearch-current/pkg-plist
@@ -47,6 +47,7 @@ lib/libudmsearch-3.1.so
sbin/cachelogd
sbin/indexer
sbin/run-splitter
+sbin/spelld
sbin/splitter
bin/udm-config
share/doc/mnogosearch/HTDB.txt
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index e989b9604f40..c2e83220203a 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mnogosearch
PORTVERSION= 3.1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www databases
MASTER_SITES= http://search.mnogo.ru/Download/
diff --git a/www/mnogosearch/files/patch-stopw b/www/mnogosearch/files/patch-stopw
new file mode 100644
index 000000000000..44469a7c24db
--- /dev/null
+++ b/www/mnogosearch/files/patch-stopw
@@ -0,0 +1,24 @@
+--- src/searchtool.c.orig Fri Feb 16 19:12:22 2001
++++ src/searchtool.c Thu Mar 1 16:22:54 2001
+@@ -251,11 +251,16 @@
+ continue;
+ }
+ len=strlen(rw);
+- if(UdmIsStopWord(query->Conf,rw)||(query->Conf->min_word_len>len)||(query->Conf->max_word_len<len)){
+- if(query->wordinfo[0])strcat(query->wordinfo,", ");
+- sprintf(UDM_STREND(query->wordinfo)," %s :stopword",rw);
+- lex=UdmGetLex(&w,&lasttok,query->charset);
+- continue;
++
++ if(query->word_match==UDM_MATCH_WORD){
++ /* Check stopword only when full word */
++ /* Substring searches should not exclude them */
++ if(UdmIsStopWord(query->Conf,rw)||(query->Conf->min_word_len>len)||(query->Conf->max_word_len<len)){
++ if(query->wordinfo[0])strcat(query->wordinfo,", ");
++ sprintf(UDM_STREND(query->wordinfo)," %s :stopword",rw);
++ lex=UdmGetLex(&w,&lasttok,query->charset);
++ continue;
++ }
+ }
+ if(query->words_in_query<UDM_MAXWORDPERQUERY-1){
+ query->words[query->words_in_query]=strdup(rw);
diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist
index 4069af3c33f8..55b0cbbd7179 100644
--- a/www/mnogosearch/pkg-plist
+++ b/www/mnogosearch/pkg-plist
@@ -47,6 +47,7 @@ lib/libudmsearch-3.1.so
sbin/cachelogd
sbin/indexer
sbin/run-splitter
+sbin/spelld
sbin/splitter
bin/udm-config
share/doc/mnogosearch/HTDB.txt
diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile
index e989b9604f40..c2e83220203a 100644
--- a/www/mnogosearch31/Makefile
+++ b/www/mnogosearch31/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mnogosearch
PORTVERSION= 3.1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www databases
MASTER_SITES= http://search.mnogo.ru/Download/
diff --git a/www/mnogosearch31/files/patch-stopw b/www/mnogosearch31/files/patch-stopw
new file mode 100644
index 000000000000..44469a7c24db
--- /dev/null
+++ b/www/mnogosearch31/files/patch-stopw
@@ -0,0 +1,24 @@
+--- src/searchtool.c.orig Fri Feb 16 19:12:22 2001
++++ src/searchtool.c Thu Mar 1 16:22:54 2001
+@@ -251,11 +251,16 @@
+ continue;
+ }
+ len=strlen(rw);
+- if(UdmIsStopWord(query->Conf,rw)||(query->Conf->min_word_len>len)||(query->Conf->max_word_len<len)){
+- if(query->wordinfo[0])strcat(query->wordinfo,", ");
+- sprintf(UDM_STREND(query->wordinfo)," %s :stopword",rw);
+- lex=UdmGetLex(&w,&lasttok,query->charset);
+- continue;
++
++ if(query->word_match==UDM_MATCH_WORD){
++ /* Check stopword only when full word */
++ /* Substring searches should not exclude them */
++ if(UdmIsStopWord(query->Conf,rw)||(query->Conf->min_word_len>len)||(query->Conf->max_word_len<len)){
++ if(query->wordinfo[0])strcat(query->wordinfo,", ");
++ sprintf(UDM_STREND(query->wordinfo)," %s :stopword",rw);
++ lex=UdmGetLex(&w,&lasttok,query->charset);
++ continue;
++ }
+ }
+ if(query->words_in_query<UDM_MAXWORDPERQUERY-1){
+ query->words[query->words_in_query]=strdup(rw);
diff --git a/www/mnogosearch31/pkg-plist b/www/mnogosearch31/pkg-plist
index 4069af3c33f8..55b0cbbd7179 100644
--- a/www/mnogosearch31/pkg-plist
+++ b/www/mnogosearch31/pkg-plist
@@ -47,6 +47,7 @@ lib/libudmsearch-3.1.so
sbin/cachelogd
sbin/indexer
sbin/run-splitter
+sbin/spelld
sbin/splitter
bin/udm-config
share/doc/mnogosearch/HTDB.txt