From 91b01d3862d4345ddd6ce23e563418c0ace0a38d Mon Sep 17 00:00:00 2001 From: Paul POULAIN Date: Mon, 24 Sep 2007 16:26:26 +0200 Subject: [PATCH] BUGFIX for 1309 (displayXXX in Koha.pm) Those subs were no more useful, the template didn't use them. No hardcoding strings in .pl & .pm pls, we can't translate them. Signed-off-by: Chris Cormack --- C4/Koha.pm | 285 -------------------------------------------- catalogue/search.pl | 28 +---- opac/opac-search.pl | 17 --- 3 files changed, 3 insertions(+), 327 deletions(-) diff --git a/C4/Koha.pm b/C4/Koha.pm index d6dddbe628..830ba21b9f 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -61,10 +61,6 @@ $VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v) . "." . join( "_", map &getauthtypes &getauthtype &getallthemes &getFacets - &displaySortby - &displayIndexes - &displaySubtypesLimit - &displayLimitTypes &displayServers &getnbpages &getitemtypeimagesrcfromurl @@ -754,287 +750,6 @@ SELECT lib, return \%notforloan_label_of; } -sub displaySortby { - my ($sort_by) = @_; - $sort_by =~ s//\>/; - my $sort_by_loop = [ - { value => "1=9523 >i", label => "Popularity (Most to Least)" }, - { value => "1=9523 <i", label => "Popularity (Least to Most)" }, - { value => "1=1003 <i", label => "Author (A-Z)" }, - { value => "1=1003 >i", label => "Author (Z-A)" }, - { - value => "1=20 <i", - label => "Call Number (Non-fiction 0-9 to Fiction A-Z)" - }, - { - value => "1=20 >i", - label => "Call Number (Fiction Z-A to Non-fiction 9-0)" - }, - { value => "1=31 >i", label => "Dates" }, - { - value => "1=31 >i", - label => - "   Publication/Copyright Date: Newest to Oldest" - }, - { - value => "1=31 <i", - label => - "   Publication/Copyright Date: Oldest to Newest" - }, - { - value => "1=32 >i", - label => "   Acquisition Date: Newest to Oldest" - }, - { - value => "1=32 <i", - label => "   Acquisition Date: Oldest to Newest" - }, - { value => "1=4 <i", label => "Title (A-Z)" }, - { value => "1=4 >i", label => "Title (Z-A)" }, - ]; - for my $hash (@$sort_by_loop) { - - #warn "sort by: $sort_by ... hash:".$hash->{value}; - if ($sort_by && $hash->{value} eq $sort_by ) { - $hash->{selected} = "selected"; - } - } - return $sort_by_loop; - -} - -sub displayIndexes { - my $indexes = [ - { value => '', label => 'Keyword' }, - { value => 'au', label => 'Author' }, - { - value => 'au,phr', - label => '     Author Phrase' - }, - { value => 'cpn', label => '     Corporate Name' }, - { value => 'cfn', label => '     Conference Name' }, - { - value => 'cpn,phr', - label => '     Corporate Name Phrase' - }, - { - value => 'cfn,phr', - label => '     Conference Name Phrase' - }, - { value => 'pn', label => '     Personal Name' }, - { - value => 'pn,phr', - label => '     Personal Name Phrase' - }, - { value => 'ln', label => 'Language' }, - - # { value => 'mt', label => 'Material Type' }, - # { value => 'mt,phr', label => 'Material Type Phrase' }, - # { value => 'mc', label => 'Musical Composition' }, - # { value => 'mc,phr', label => 'Musical Composition Phrase' }, - - { value => 'nt', label => 'Notes/Comments' }, - { value => 'pb', label => 'Publisher' }, - { value => 'pl', label => 'Publisher Location' }, - { value => 'sn', label => 'Standard Number' }, - { value => 'nb', label => '     ISBN' }, - { value => 'ns', label => '     ISSN' }, - { value => 'lcn', label => '     Call Number' }, - { value => 'su', label => 'Subject' }, - { - value => 'su,phr', - label => '     Subject Phrase' - }, - -# { value => 'de', label => '     Descriptor' }, -# { value => 'ge', label => '     Genre/Form' }, -# { value => 'gc', label => '     Geographic Coverage' }, - -# { value => 'nc', label => '     Named Corporation and Conference' }, -# { value => 'na', label => '     Named Person' }, - - { value => 'ti', label => 'Title' }, - { value => 'ti,phr', label => '     Title Phrase' }, - { value => 'se', label => '     Series Title' }, - ]; - return $indexes; -} - -sub displaySubtypesLimit { - my $outer_subtype_limits_loop = [ - - { # in MARC21, aud codes are stored in 008/22 (Target audience) - name => "limit", - inner_subtype_limits_loop => [ - { - value => '', - label => 'Any Audience', - selected => "selected" - }, - { value => 'aud:a', label => 'Easy', }, - { value => 'aud:c', label => 'Juvenile', }, - { value => 'aud:d', label => 'Young Adult', }, - { value => 'aud:e', label => 'Adult', }, - - ], - }, - { # in MARC21, fic is in 008/33, bio in 008/34, mus in LDR/06 - name => "limit", - inner_subtype_limits_loop => [ - { value => '', label => 'Any Content', selected => "selected" }, - { value => 'fic:1', label => 'Fiction', }, - { value => 'fic:0', label => 'Non Fiction', }, - { value => 'bio:b', label => 'Biography', }, - { value => 'mus:j', label => 'Musical recording', }, - { value => 'mus:i', label => 'Non-musical recording', }, - - ], - }, - { # MARC21, these are codes stored in 007/00-01 - name => "limit", - inner_subtype_limits_loop => [ - { value => '', label => 'Any Format', selected => "selected" }, - { value => 'l-format:ta', label => 'Regular print', }, - { value => 'l-format:tb', label => 'Large print', }, - { value => 'l-format:fk', label => 'Braille', }, - { value => '', label => '-----------', }, - { value => 'l-format:sd', label => 'CD audio', }, - { value => 'l-format:ss', label => 'Cassette recording', }, - { - value => 'l-format:vf', - label => 'VHS tape / Videocassette', - }, - { value => 'l-format:vd', label => 'DVD video / Videodisc', }, - { value => 'l-format:co', label => 'CD Software', }, - { value => 'l-format:cr', label => 'Website', }, - - ], - }, - { # in MARC21, these are codes in 008/24-28 - name => "limit", - inner_subtype_limits_loop => [ - { value => '', label => 'Additional Content Types', }, - { value => 'ctype:a', label => 'Abstracts/summaries', }, - { value => 'ctype:b', label => 'Bibliographies', }, - { value => 'ctype:c', label => 'Catalogs', }, - { value => 'ctype:d', label => 'Dictionaries', }, - { value => 'ctype:e', label => 'Encyclopedias ', }, - { value => 'ctype:f', label => 'Handbooks', }, - { value => 'ctype:g', label => 'Legal articles', }, - { value => 'ctype:i', label => 'Indexes', }, - { value => 'ctype:j', label => 'Patent document', }, - { value => 'ctype:k', label => 'Discographies', }, - { value => 'ctype:l', label => 'Legislation', }, - { value => 'ctype:m', label => 'Theses', }, - { value => 'ctype:n', label => 'Surveys', }, - { value => 'ctype:o', label => 'Reviews', }, - { value => 'ctype:p', label => 'Programmed texts', }, - { value => 'ctype:q', label => 'Filmographies', }, - { value => 'ctype:r', label => 'Directories', }, - { value => 'ctype:s', label => 'Statistics', }, - { value => 'ctype:t', label => 'Technical reports', }, - { value => 'ctype:v', label => 'Legal cases and case notes', }, - { value => 'ctype:w', label => 'Law reports and digests', }, - { value => 'ctype:z', label => 'Treaties ', }, - ], - }, - ]; - return $outer_subtype_limits_loop; -} - -sub displayLimitTypes { - my $outer_limit_types_loop = [ - - { - inner_limit_types_loop => [ - { - label => "Books", - id => "mc-books", - name => "limit", - value => "(mc-collection:AF or mc-collection:MYS or mc-collection:SCI or mc-collection:NF or mc-collection:YA or mc-collection:BIO or mc-collection:LP or mc-collection:LPNF)", - icon => "search-books.gif", - title => -"Books, Pamphlets, Technical reports, Manuscripts, Legal papers, Theses and dissertations", - }, - - { - label => "Movies", - id => "mc-movies", - name => "limit", - value => "(mc-collection:DVD or mc-collection:AV or mc-collection:AVJ or mc-collection:AVJN or mc-collection:AVJNF or mc-collection:AVNF)", - icon => "search-movies.gif", - title => -"Motion pictures, Videorecordings, Filmstrips, Slides, Transparencies, Photos, Cards, Charts, Drawings", - }, - - { - label => "Music", - id => "mc-music", - name => "limit", - value => "(mc-collection:CDM)", - icon => "search-music.gif", - title => "Spoken, Books on CD and Cassette", - }, - ], - }, - { - inner_limit_types_loop => [ - { - label => "Audio Books", - id => "mc-audio-books", - name => "limit", - value => "(mc-collection:AB or mc-collection:AC or mc-collection:JAC or mc-collection:YAC)", - icon => "search-audio-books.gif", - title => "Spoken, Books on CD and Cassette", - }, - - { - label => "Local History Materials", - id => "mc-local-history", - name => "limit", - value => "mc-collection:LH", - icon => "Local history.gif", - title => "Local History Materials", - }, - - {label => "Large Print", - id => "mc-large-print", - name => "limit", - value => "(mc-collection:LP or mc-collection:LPNF)", - icon => "search-large-print.gif ", - title => "Large Print",}, - ], - }, -{ inner_limit_types_loop => [ - {label => "Kids", - id => "mc-kids", - name => "limit", - value => "(mc-collection:EASY or mc-collection:JNF or mc-collection:JF or mc-collection:JREF or mc-collection:JB)", - icon => "search-kids.gif", - title => "Music",}, - - {label => "Software/Internet", - id => "mc-sofware-web", - name => "limit", - value => "(mc-collection:CDR)", - icon => "search-software-web.gif", - title => "Kits",}, - - {label => "Reference", - id => "mc-reference", - name => "limit", - value => "mc-collection:REF", - icon => "search-reference.gif", - title => "Reference",}, - - ], - }, - - ]; - return $outer_limit_types_loop; -} - sub displayServers { my ( $position, $type ) = @_; my $dbh = C4::Context->dbh; diff --git a/catalogue/search.pl b/catalogue/search.pl index f6ba53072c..61efef2fa7 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -259,13 +259,6 @@ if ( $template_name eq "catalogue/advsearch.tmpl" ) { my $secondary_servers_loop;# = displaySecondaryServers(); $template->param(outer_sup_servers_loop => $secondary_servers_loop,); - # load the limit types (icon-based limits in advanced search page) - my $outer_limit_types_loop = displayLimitTypes(); - $template->param(outer_limit_types_loop => $outer_limit_types_loop,); - - # load the search indexes (what a user can choose to search by) - my $indexes = displayIndexes(); - # determine what to display next to the search boxes (ie, boolean option # shouldn't appear on the first one, scan indexes should, adding a new # box should only appear on the last, etc. @@ -274,11 +267,9 @@ if ( $template_name eq "catalogue/advsearch.tmpl" ) { my @search_boxes_array; my $search_boxes_count = 1; # should be a syspref for (my $i=0;$i<=$search_boxes_count;$i++) { - my $this_index =[@$indexes]; # clone the data, not just the reference - #@$this_index[$i]->{selected} = "selected"; if ($i==0) { push @search_boxes_array, - {indexes => $this_index, + { search_boxes_label => 1, scan_index => 1, }; @@ -286,13 +277,10 @@ if ( $template_name eq "catalogue/advsearch.tmpl" ) { } elsif ($i==$search_boxes_count) { push @search_boxes_array, - {indexes => $indexes, + { add_field => "1",}; } - else { - push @search_boxes_array, - {indexes => $indexes,}; - } + } $template->param(uc(C4::Context->preference("marcflavour")) => 1, search_boxes_loop => \@search_boxes_array); @@ -301,10 +289,6 @@ if ( $template_name eq "catalogue/advsearch.tmpl" ) { my $languages_limit_loop = getAllLanguages(); $template->param(search_languages_loop => $languages_limit_loop,); - # load the subtype limits - my $outer_subtype_limits_loop = displaySubtypesLimit(); - $template->param(outer_subtype_limits_loop => $outer_subtype_limits_loop,); - my $expanded_options; if (not defined $cgi->param('expanded_options')){ $expanded_options = C4::Context->preference("expandedSearchOption"); @@ -316,8 +300,6 @@ if ( $template_name eq "catalogue/advsearch.tmpl" ) { # load the sort_by options for the template my $sort_by = $cgi->param('sort_by'); - my $sort_by_loop = displaySortby($sort_by); - $template->param(sort_by_loop => $sort_by_loop); output_html_with_http_headers $cgi, $cookie, $template->output; exit; @@ -335,10 +317,6 @@ my $params = $cgi->Vars; # sort by is used to sort the query my @sort_by; @sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'}; -# load the sort_by options for the template -# my $sort_by = $params->{'sort_by'}; -# my $sort_by_loop = displaySortby($sort_by); -# $template->param(sort_by_loop => $sort_by_loop); # # Use the servers defined, or just search our local catalog(default) my @servers; diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 73d6a2d164..75f265c640 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -272,13 +272,6 @@ if ( $template_name eq "opac-advsearch.tmpl" ) { my $secondary_servers_loop; # = displaySecondaryServers(); $template->param( outer_sup_servers_loop => $secondary_servers_loop, ); - # load the limit types (icon-based limits in advanced search page) - my $outer_limit_types_loop = displayLimitTypes(); - $template->param( outer_limit_types_loop => $outer_limit_types_loop, ); - - # load the search indexes (what a user can choose to search by) - my $indexes = displayIndexes(); - # determine what to display next to the search boxes (ie, boolean option # shouldn't appear on the first one, scan indexes should, adding a new # box should only appear on the last, etc. @@ -287,12 +280,9 @@ if ( $template_name eq "opac-advsearch.tmpl" ) { my @search_boxes_array; my $search_boxes_count = 1; # should be a syspref for ( my $i = 0 ; $i <= $search_boxes_count ; $i++ ) { - my $this_index = [@$indexes]; # clone the data, not just the reference - #@$this_index[$i]->{selected} = "selected"; if ( $i == 0 ) { push @search_boxes_array, { - indexes => $this_index, search_boxes_label => "Search for:", scan_index => 1, }; @@ -301,7 +291,6 @@ if ( $template_name eq "opac-advsearch.tmpl" ) { elsif ( $i == $search_boxes_count ) { push @search_boxes_array, { - indexes => $indexes, left_content => " ", add_field => "1" @@ -310,7 +299,6 @@ if ( $template_name eq "opac-advsearch.tmpl" ) { else { push @search_boxes_array, { - indexes => $indexes, left_content => " ", }; @@ -325,11 +313,6 @@ if ( $template_name eq "opac-advsearch.tmpl" ) { my $languages_limit_loop = getAllLanguages(); $template->param( search_languages_loop => $languages_limit_loop, ); - # load the subtype limits - my $outer_subtype_limits_loop = displaySubtypesLimit(); - $template->param( outer_subtype_limits_loop => $outer_subtype_limits_loop, - ); - my $expanded_options; if ( C4::Context->preference("expandedSearchOption") ) { $expanded_options = C4::Context->preference("expandedSearchOption"); -- 2.39.5