[Koha-cvs] CVS: koha MARCdetail.pl,1.25.2.13,1.25.2.14

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6490

Modified Files:
      Tag: rel_2_2
        MARCdetail.pl 
Log Message:
using hide_marc systempreference to hide/show tag/subfields code

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.25.2.13
retrieving revision 1.25.2.14
diff -C2 -r1.25.2.13 -r1.25.2.14
*** MARCdetail.pl       4 Oct 2005 10:13:16 -0000       1.25.2.13
--- MARCdetail.pl       25 Oct 2005 12:41:13 -0000      1.25.2.14
***************
*** 142,145 ****
--- 142,146 ----
                                
$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};
+                               $subf[$i][1] =~ s/\n/<br\/>/g;
                                if 
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
                                        $subfield_data{marc_value}="<a 
href=\"$subf[$i][1]\">$subf[$i][1]</a>";
***************
*** 167,171 ****
                                $tag_data{tag}="";
                        } else {
!                               $tag_data{tag}=$fields[$x_i]->tag().' -'. 
$tagslib->{$fields[$x_i]->tag()}->{lib};
                        }
                        my @tmp = @subfields_data;
--- 168,176 ----
                                $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;
***************
*** 235,238 ****
--- 240,244 ----
                                                subscriptionsnumber => 
$subscriptionsnumber,
                                                popup => $popup,
+                                               hide_marc => 
C4::Context->preference('hide_marc'),
                                                );
  output_html_with_http_headers $query, $cookie, $template->output;