From 7035372dc3f08c0d11b2910072ed9b93fc01ee2e Mon Sep 17 00:00:00 2001 From: Nahuel ANGELINETTI Date: Tue, 25 Aug 2009 11:53:50 +0200 Subject: [PATCH] (bug #3550) use GetRecordValue to retrieve subtitle Content-Type: text/plain; charset="utf-8" This patch, is the first use of GetRecordValue, that use the Field mapping. It retrieve the subtitle in Intranet using it, instead of the use an old function that doesn't work anymore. This is a way to made koha more generic with each framework. --- C4/Search.pm | 15 +++++++++++++-- catalogue/detail.pl | 2 +- .../prog/en/modules/catalogue/detail.tmpl | 5 ++++- .../prog/en/modules/catalogue/results.tmpl | 19 +++++++++++++++---- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index 7444e43..be1cac4 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1246,11 +1246,22 @@ sub searchResults { $times = $hits; # FIXME: if $hits is undefined, why do we want to equal it? } + # We get the biblionumber position in MARC + my ($bibliotag,$bibliosubf)=GetMarcFromKohaField('biblio.biblionumber',''); + my $fw; + # loop through all of the records we've retrieved for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) { my $marcrecord = MARC::File::USMARC::decode( $marcresults[$i] ); - my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, '' ); - $oldbiblio->{subtitle} = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $marcrecord, ''); + + if ($bibliotag<10){ + $fw = GetFrameworkCode($marcrecord->field($bibliotag)->data); + }else{ + $fw = GetFrameworkCode($marcrecord->subfield($bibliotag,$bibliosubf)); + } + + my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, $fw ); + $oldbiblio->{subtitle} = GetRecordValue('subtitle', $marcrecord, $fw); $oldbiblio->{result_number} = $i + 1; # add imageurl to itemtype if there is one diff --git a/catalogue/detail.pl b/catalogue/detail.pl index eb40db1..ffa2b24 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -65,7 +65,7 @@ my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); my $marcseriesarray = GetMarcSeries($record,$marcflavour); my $marcurlsarray = GetMarcUrls ($record,$marcflavour); -my $subtitle = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $record, ''); +my $subtitle = GetRecordValue('subtitle', $record, $fw); # Get Branches, Itemtypes and Locations my $branches = GetBranches(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl index ccfb248..24b7765 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -56,7 +56,10 @@ function verify_images() {
-

+

+ +

+ " alt="" title="">

By ">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl index dc75841..25dbdab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl @@ -222,16 +222,27 @@ $(window).load(function() { "> No title - -, , + + + , + + , , "> No title - , , + + + , + + , , "> No title - , , + + + , + + , ,

-- 1.6.0.4