patch to sysprefs and minor fix to Search.pm that

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Search.pm b/C4/Search.pm
index 6448bb6..1f7cd98 100644 (file)
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -579,10 +579,11 @@ sub _add_truncation {
        my (@nontruncated,@righttruncated,@lefttruncated,@rightlefttruncated,@regexpr);
        # if the index contains more than one qualifier, but not phrase, add truncation qualifiers
        #if (index($index,"phr")<0 && index($index,",")>0){
-       warn "ADDING TRUNCATION QUALIFIERS";
+       # warn "ADDING TRUNCATION QUALIFIERS";
+               $operand =~ s/ //g;
                my @wordlist= split (/\s/,$operand);
                foreach my $word (@wordlist){
-                       warn "WORD: $word";
+                       #warn "WORD: $word";
                        if (index($word,"*")==0 && index($word,"*",1)==length($word)-2){
                                $word=~s/\*//;
                                push @rightlefttruncated,$word;
@@ -632,7 +633,7 @@ sub _build_stemmed_operand {
                        $stemmed_operand .= "?" unless ( $stem =~ /(and$|or$|not$)/ ) || ( length($stem) < 3 );
                        $stemmed_operand .= " ";
        }
-       warn "STEMMED OPERAND: $stemmed_operand";
+       #warn "STEMMED OPERAND: $stemmed_operand";
        return $stemmed_operand;
 }
 

diff --git a/installer/data/en/mandatory/sysprefs.sql b/installer/data/en/mandatory/sysprefs.sql
index 5616c75..8ecc227 100644 (file)
--- a/installer/data/en/mandatory/sysprefs.sql
+++ b/installer/data/en/mandatory/sysprefs.sql
@@ -46,7 +46,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('LetterLog','1','If ON, log all notices sent',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('LibraryName','','Define library name as shown on main opac page','','');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marc','1','Turn on MARC support',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','MARC21','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');
+-- INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','MARC21','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MARCOrgCode','OSt','Define MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.htm','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MaxFine','9999','Maximum fine a patron can have for a single late return','','Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding','5','maximum amount withstanding to be able make reserves','','Integer');