Hi,
Finally, I tried to apply Accents.5 patch for 3.1.5.
(See below).
1. Download ht://Dig source code :
http://www.htdig.org/files/htdig-3.1.5.tar.gz
2. Untar with Midnight commander to /root/htdig-3.1.5
[yes, I know, it's very bad to always work as "root"...]
4. Download and apply the patch :
ftp://sol.ccsf.cc.ca.us/htdig-patches/3.1.5/accents.5
copy and paste the text in a file call "/root/htdig-3.1.5/accent5.txt"
cd /root/htdig-3.1.5/
patch -p1 <accent5.txt
[root@nepotage htdig-3.1.5]# patch -p1 <accent5.txt
patching file htcommon/defaults.cc
Hunk #1 FAILED at 27.
1 out of 1 hunk FAILED -- saving rejects to file htcommon/defaults.cc.rej
patching file htfuzzy/Accents.cc
patching file htfuzzy/Accents.h
patching file htfuzzy/Fuzzy.cc
Hunk #2 FAILED at 172.
1 out of 2 hunks FAILED -- saving rejects to file htfuzzy/Fuzzy.cc.rej
patching file htfuzzy/Makefile.in
Hunk #1 FAILED at 10.
1 out of 1 hunk FAILED -- saving rejects to file htfuzzy/Makefile.in.rej
patching file htfuzzy/htfuzzy.cc
Hunk #2 FAILED at 109.
1 out of 3 hunks FAILED -- saving rejects to file htfuzzy/htfuzzy.cc.rej
patching file htsearch/htsearch.cc
Hunk #1 FAILED at 475.
1 out of 1 hunk FAILED -- saving rejects to file htsearch/htsearch.cc.rej
I joined *.rej in file attachment.
What can I do ?
(Wait for RPM :-)
Best regards,
sorry for wasting your time,
Charles N�pote.
[root@nepotage htdig-3.1.5]# patch -p1 <accent5.txt
patching file htcommon/defaults.cc
Hunk #1 FAILED at 27.
1 out of 1 hunk FAILED -- saving rejects to file htcommon/defaults.cc.rej
patching file htfuzzy/Accents.cc
patching file htfuzzy/Accents.h
patching file htfuzzy/Fuzzy.cc
Hunk #2 FAILED at 172.
1 out of 2 hunks FAILED -- saving rejects to file htfuzzy/Fuzzy.cc.rej
patching file htfuzzy/Makefile.in
Hunk #1 FAILED at 10.
1 out of 1 hunk FAILED -- saving rejects to file htfuzzy/Makefile.in.rej
patching file htfuzzy/htfuzzy.cc
Hunk #2 FAILED at 109.
1 out of 3 hunks FAILED -- saving rejects to file htfuzzy/htfuzzy.cc.rej
patching file htsearch/htsearch.cc
Hunk #1 FAILED at 475.
1 out of 1 hunk FAILED -- saving rejects to file htsearch/htsearch.cc.rej
[root@nepotage htdig-3.1.5]# more htcommon/defaults.cc.rej
***************
*** 27,32 ****
//
// General defaults
//
{"add_anchors_to_excerpt", "true"},
{"allow_in_form", ""},
{"allow_numbers", "false"},
--- 27,33 ----
//
// General defaults
//
+ {"accents_db", "${database_base}.accents.db"},
{"add_anchors_to_excerpt", "true"},
{"allow_in_form", ""},
{"allow_numbers", "false"},
[root@nepotage htdig-3.1.5]# more htfuzzy/Fuzzy.cc.rej
***************
*** 171,176 ****
return new Soundex();
else if (mystrcasecmp(name, "metaphone") == 0)
return new Metaphone();
else if (mystrcasecmp(name, "endings") == 0)
return new Endings();
else if (mystrcasecmp(name, "synonyms") == 0)
--- 172,179 ----
return new Soundex();
else if (mystrcasecmp(name, "metaphone") == 0)
return new Metaphone();
+ else if (mystrcasecmp(name, "accents") == 0)
+ return new Accents();
else if (mystrcasecmp(name, "endings") == 0)
return new Endings();
else if (mystrcasecmp(name, "synonyms") == 0)
[root@nepotage htdig-3.1.5]# more htfuzzy/Makefile.in.rej
***************
*** 10,20 ****
OBJS= Endings.o EndingsDB.o Exact.o \
Fuzzy.o Metaphone.o Soundex.o \
SuffixEntry.o Synonym.o htfuzzy.o \
! Substring.o Prefix.o
LIBOBJS= Endings.o Exact.o Fuzzy.o Metaphone.o \
Soundex.o Synonym.o EndingsDB.o SuffixEntry.o \
! Substring.o Prefix.o
TARGET= htfuzzy
LIBTARGET= libfuzzy.a
--- 10,20 ----
OBJS= Endings.o EndingsDB.o Exact.o \
Fuzzy.o Metaphone.o Soundex.o \
SuffixEntry.o Synonym.o htfuzzy.o \
! Substring.o Prefix.o Accents.o
LIBOBJS= Endings.o Exact.o Fuzzy.o Metaphone.o \
Soundex.o Synonym.o EndingsDB.o SuffixEntry.o \
! Substring.o Prefix.o Accents.o
TARGET= htfuzzy
LIBTARGET= libfuzzy.a
[root@nepotage htdig-3.1.5]# more htfuzzy/htfuzzy.cc.rej
***************
*** 108,113 ****
{
wordAlgorithms.Add(new Metaphone);
}
else if (mystrcasecmp(av[i], "endings") == 0)
{
noWordAlgorithms.Add(new Endings);
--- 109,118 ----
{
wordAlgorithms.Add(new Metaphone);
}
+ else if (mystrcasecmp(av[i], "accents") == 0)
+ {
+ wordAlgorithms.Add(new Accents);
+ }
else if (mystrcasecmp(av[i], "endings") == 0)
{
noWordAlgorithms.Add(new Endings);
[root@nepotage htdig-3.1.5]# more htsearch/htsearch.cc.rej
***************
*** 475,481 ****
// configuration attribute.
// For algorithms other than exact, we need to also do word lookups.
//
! StringList algs(config["search_algorithm"], " \t,");
List algorithms;
String name, weight;
double fweight;
--- 475,481 ----
// configuration attribute.
// For algorithms other than exact, we need to also do word lookups.
//
! StringList algs(config["search_algorithm"], " \t");
List algorithms;
String name, weight;
double fweight;
[root@nepotage htdig-3.1.5]#
------------------------------------ To unsubscribe from the htdig mailing list, send a message to [EMAIL PROTECTED] You will receive a message to confirm this.
