Bugzilla – Attachment 35304 Details for
Bug 12861
Noisy warns in C4/AuthoritiesMarc.pm
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12861 : Noisy warn in the error logs
Bug-12861--Noisy-warn-in-the-error-logs.patch (text/plain), 5.01 KB, created by
Marcel de Rooy
on 2015-01-15 13:45:45 UTC
(
hide
)
Description:
Bug 12861 : Noisy warn in the error logs
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2015-01-15 13:45:45 UTC
Size:
5.01 KB
patch
obsolete
>From d3e65727421143d3fadcf69ab91614a2e5a3f5f0 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Wed, 3 Sep 2014 09:49:41 +1200 >Subject: [PATCH] Bug 12861 : Noisy warn in the error logs >Content-Type: text/plain; charset=utf-8 > >To test >Hit a url like >cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operatorc=contains&marclistc=mainentry&and_orc=and&orderby=HeadingAsc&value=FIRECLAY > >Notice the warns in the error log >Apply patch >Reload the url >Still works but no warns > >(cherry picked from commit c98d805e490a82b2ea9f3d4e0f7278640942ba6d) >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> > >Reformatted to fix error M Tompsett spotted > >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Instead of 10 warnings, I now have only 4 warnings. >We're going in the right direction. >--- > C4/AuthoritiesMarc.pm | 70 ++++++++++++++++++++++++++---------------------- > 1 files changed, 38 insertions(+), 32 deletions(-) > >diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm >index 911532c..a779cbc 100644 >--- a/C4/AuthoritiesMarc.pm >+++ b/C4/AuthoritiesMarc.pm >@@ -140,33 +140,38 @@ sub SearchAuthorities { > my $and=" \@and " ; > my $q2; > my $attr_cnt = 0; >- for(my $i = 0 ; $i <= $#{$value} ; $i++) >- { >- if (@$value[$i]){ >- if ( @$tags[$i] eq "mainmainentry" ) { >- $attr = " \@attr 1=Heading-Main "; >- } >- elsif ( @$tags[$i] eq "mainentry" ) { >- $attr = " \@attr 1=Heading "; >- } >- elsif ( @$tags[$i] eq "match" ) { >- $attr = " \@attr 1=Match "; >- } >- elsif ( @$tags[$i] eq "match-heading" ) { >- $attr = " \@attr 1=Match-heading "; >- } >- elsif ( @$tags[$i] eq "see-from" ) { >- $attr = " \@attr 1=Match-heading-see-from "; >- } >- elsif ( @$tags[$i] eq "thesaurus" ) { >- $attr = " \@attr 1=Subject-heading-thesaurus "; >- } >- else { # Assume any if no index was specified >+ for ( my $i = 0 ; $i <= $#{$value} ; $i++ ) { >+ if ( @$value[$i] ) { >+ if ( @$tags[$i] ) { >+ if ( @$tags[$i] eq "mainmainentry" ) { >+ $attr = " \@attr 1=Heading-Main "; >+ } >+ elsif ( @$tags[$i] eq "mainentry" ) { >+ $attr = " \@attr 1=Heading "; >+ } >+ elsif ( @$tags[$i] eq "match" ) { >+ $attr = " \@attr 1=Match "; >+ } >+ elsif ( @$tags[$i] eq "match-heading" ) { >+ $attr = " \@attr 1=Match-heading "; >+ } >+ elsif ( @$tags[$i] eq "see-from" ) { >+ $attr = " \@attr 1=Match-heading-see-from "; >+ } >+ elsif ( @$tags[$i] eq "thesaurus" ) { >+ $attr = " \@attr 1=Subject-heading-thesaurus "; >+ } >+ else { # Assume any if no index was specified >+ $attr = " \@attr 1=Any "; >+ } >+ } #if @$tags[$i] >+ else { # Assume any if no index was specified > $attr = " \@attr 1=Any "; > } >+ > if ( @$operator[$i] eq 'is' ) { > $attr .= " \@attr 4=1 \@attr 5=100 " >- ; ##Phrase, No truncation,all of subfield field must match >+ ; ##Phrase, No truncation,all of subfield field must match > } > elsif ( @$operator[$i] eq "=" ) { > $attr .= " \@attr 4=107 "; #Number Exact match >@@ -177,24 +182,25 @@ sub SearchAuthorities { > } > elsif ( @$operator[$i] eq "exact" ) { > $attr .= " \@attr 4=1 \@attr 5=100 \@attr 6=3 " >- ; ##Phrase, No truncation,all of subfield field must match >+ ; ##Phrase, No truncation,all of subfield field must match > } > else { > $attr .= " \@attr 5=1 \@attr 4=6 " > ; ## Word list, right truncated, anywhere >- if ($sortby eq 'Relevance') { >- $attr .= "\@attr 2=102 "; >- } >+ if ( $sortby eq 'Relevance' ) { >+ $attr .= "\@attr 2=102 "; >+ } > } >- @$value[$i] =~ s/"/\\"/g; # Escape the double-quotes in the search value >- $attr =$attr."\"".@$value[$i]."\""; >- $q2 .=$attr; >- $dosearch=1; >+ @$value[$i] =~ >+ s/"/\\"/g; # Escape the double-quotes in the search value >+ $attr = $attr . "\"" . @$value[$i] . "\""; >+ $q2 .= $attr; >+ $dosearch = 1; > ++$attr_cnt; > if ($QParser) { > $qpquery .= " $tags->[$i]:\"$value->[$i]\""; > } >- }#if value >+ } #if value > } > ##Add how many queries generated > if (defined $query && $query=~/\S+/){ >-- >1.7.7.6
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12861
:
31324
|
32782
|
35304
|
35308
|
35360
|
35364
|
35365