[Koha-cvs] CVS: koha MARCdetail.pl,1.16,1.17

[Paul POULAIN]

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

Modified Files:
        MARCdetail.pl 
Log Message:
hidding hidden & isurl constraints into MARC subfield structure

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** MARCdetail.pl       10 Jun 2003 15:46:34 -0000      1.16
--- MARCdetail.pl       28 May 2004 08:33:41 -0000      1.17
***************
*** 67,71 ****
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless 
$bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless 
$biblionumber;
! my $tagslib = &MARCgettagslib($dbh,1);
  
  my $record =MARCgetbiblio($dbh,$bibid);
--- 67,73 ----
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless 
$bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless 
$biblionumber;
! my $itemtype = &MARCfind_itemtype($dbh,$bibid);
! warn "IT : $itemtype";
! my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
  my $record =MARCgetbiblio($dbh,$bibid);
***************
*** 92,96 ****
                # if tag <10, there's no subfield, use the "@" trick
                if ($field->tag()<10) {
!                       next if ($tagslib->{$field->tag()}->{'@'}->{tab}  ne 
$tabloop);
                        my %subfield_data;
                        
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{'@'}->{lib};
--- 94,99 ----
                # if tag <10, there's no subfield, use the "@" trick
                if ($field->tag()<10) {
!                       next if ($tagslib->{$field->tag()}->{'@'}->{tab}  ne 
$tabloop);
!                       next if ($tagslib->{$field->tag()}->{'@'}->{hidden});
                        my %subfield_data;
                        
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{'@'}->{lib};
***************
*** 105,111 ****
                                $subf[$i][0] = "@" unless $subf[$i][0];
                                next if 
($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  ne $tabloop);
                                my %subfield_data;
                                
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
!                               $subfield_data{marc_value}=$subf[$i][1];
                                $subfield_data{marc_subfield}=$subf[$i][0];
                                $subfield_data{marc_tag}=$field->tag();
--- 108,119 ----
                                $subf[$i][0] = "@" unless $subf[$i][0];
                                next if 
($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  ne $tabloop);
+                               next if 
($tagslib->{$field->tag()}->{$subf[$i][0]}->{hidden});
                                my %subfield_data;
                                
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
!                               if 
($tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl}) {
!                                       $subfield_data{marc_value}="<a 
href=\"$subf[$i][1]\">$subf[$i][1]</a>";
!                               } else {
!                                       $subfield_data{marc_value}=$subf[$i][1];
!                               }
                                $subfield_data{marc_subfield}=$subf[$i][0];
                                $subfield_data{marc_tag}=$field->tag();