[Koha-cvs] koha/opac opac-MARCdetail.pl

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         
Changes by:     Joshua Ferraro <address@hidden> 06/05/21 02:07:44

Modified files:
        opac           : opac-MARCdetail.pl 

Log message:
        merging dev-week and HEAD

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-MARCdetail.pl.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: koha/opac/opac-MARCdetail.pl
diff -u koha/opac/opac-MARCdetail.pl:1.11 koha/opac/opac-MARCdetail.pl:1.12
--- koha/opac/opac-MARCdetail.pl:1.11   Tue Feb 21 00:12:26 2006
+++ koha/opac/opac-MARCdetail.pl        Sun May 21 02:07:44 2006
@@ -94,7 +94,7 @@
        my @loop_data =();
        my @subfields_data;
        # deal with leader
-       unless ($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop  or 
$tagslib->{'000'}->{'@'}->{hidden}) {
+       unless ($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop  or 
$tagslib->{'000'}->{'@'}->{hidden}>0) {
                my %subfield_data;
                $subfield_data{marc_lib}=$tagslib->{'000'}->{'@'}->{lib};
                $subfield_data{marc_value}=$record->leader();
@@ -113,7 +113,7 @@
                # if tag <10, there's no subfield, use the "@" trick
                if ($fields[$x_i]->tag()<10) {
                        next if ($tagslib->{$fields[$x_i]->tag()}->{'@'}->{tab} 
 ne $tabloop);
-                       next if 
($tagslib->{$fields[$x_i]->tag()}->{'@'}->{hidden});
+                       next if 
($tagslib->{$fields[$x_i]->tag()}->{'@'}->{hidden}>0);
                        my %subfield_data;
                        
$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{'@'}->{lib};
                        $subfield_data{marc_value}=$fields[$x_i]->data();
@@ -126,7 +126,7 @@
                        for my $i (0..$#subf) {
                                $subf[$i][0] = "@" unless $subf[$i][0];
                                next if 
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{tab}  ne $tabloop);
-                               next if 
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{hidden});
+                               next if 
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{hidden}>0);
                                my %subfield_data;
                                
$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
                                
$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
@@ -149,11 +149,15 @@
                }
                if ($#subfields_data>=0) {
                        my %tag_data;
-       #               if ($fields[$x_i]->tag() eq $fields[$x_i-1]->tag()) {
-       #                       $tag_data{tag}="";
-       #               } else {
-                               $tag_data{tag}=$fields[$x_i]->tag().' -'. 
$tagslib->{$fields[$x_i]->tag()}->{lib};
-       #               }
+                       if (($fields[$x_i]->tag() eq $fields[$x_i-1]->tag()) && 
(C4::Context->preference('LabelMARCView') eq 'economical')) {
+                               $tag_data{tag}="";
+                       } else {
+                               if (C4::Context->preference('hide_marc')) {
+                                       
$tag_data{tag}=$tagslib->{$fields[$x_i]->tag()}->{lib};
+                               } else {
+                                       $tag_data{tag}=$fields[$x_i]->tag().' 
-'. $tagslib->{$fields[$x_i]->tag()}->{lib};
+                               }
+                       }
                        my @tmp = @subfields_data;
                        $tag_data{subfield} = address@hidden;
                        push (@loop_data, \%tag_data);
@@ -211,9 +215,9 @@
 }
 
 $template->param(item_loop => address@hidden,
-                                               item_header_loop => 
address@hidden,
-#                                              bibid => $bibid,
-                                               biblionumber => $biblionumber);
+                               item_header_loop => address@hidden,
+                               biblionumber => $biblionumber
+);
 output_html_with_http_headers $query, $cookie, $template->output;
 
 sub get_authorised_value_desc ($$$$$) {