Beautifying Selection

[srvgit] / MARCdetail.pl

diff --git a/MARCdetail.pl b/MARCdetail.pl
index b6f5a94..f1b1f5d 100755 (executable)
--- a/MARCdetail.pl
+++ b/MARCdetail.pl
@@ -55,7 +55,8 @@ use CGI;
 use C4::Search;
 use MARC::Record;
 use C4::Biblio;
-use C4::Catalogue;
+use C4::Acquisition;
+use C4::Bull; #uses getsubscriptionfrom biblionumber
 use HTML::Template;
 
 my $query=new CGI;
@@ -64,12 +65,14 @@ my $dbh=C4::Context->dbh;
 
 my $biblionumber=$query->param('bib');
 my $bibid = $query->param('bibid');
+my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
+
 $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
 $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
-my $tagslib = &MARCgettagslib($dbh,1);
+my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
+my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
 
 my $record =MARCgetbiblio($dbh,$bibid);
-warn $record->as_formatted();
 # open template
 my ($template, $loggedinuser, $cookie)
                = get_template_and_user({template_name => "catalogue/MARCdetail.tmpl",
@@ -88,30 +91,54 @@ for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 # loop through each tag
        my @fields = $record->fields();
        my @loop_data =();
-       foreach my $field (@fields) {
-               my @subf=$field->subfields;
-#              my $previous_tag = '';
-               my @subfields_data;
-# loop through each subfield
-               for my $i (0..$#subf) {
-#                      $previous_tag = $field->tag();
-                       $subf[$i][0] = "@" unless $subf[$i][0];
-                       next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  ne $tabloop);
+#      foreach my $field (@fields) {
+       my @subfields_data;
+       for (my $x_i=0;$x_i<=$#fields;$x_i++) {
+#              warn "$tabloop => $x_i";
+               # 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});
                        my %subfield_data;
-                       $subfield_data{marc_lib}=$tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
-                       if ($field->tag()<10) {
-                               $subfield_data{marc_value}=$field->data();
-                       } else {
-                               $subfield_data{marc_value}=$subf[$i][1];
-                       }
-                       $subfield_data{marc_tag}=$subf[$i][0];
+                       $subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{'@'}->{lib};
+                       $subfield_data{marc_value}=$fields[$x_i]->data();
+                       $subfield_data{marc_subfield}='@';
+                       $subfield_data{marc_tag}=$fields[$x_i]->tag();
                        push(@subfields_data, \%subfield_data);
+               } else {
+                       my @subf=$fields[$x_i]->subfields;
+       # loop through each subfield
+                       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});
+                               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};
+                               if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
+                                       $subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+                               } else {
+                                       if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {
+                                               $subfield_data{authority}=$fields[$x_i]->subfield(9);
+                                       }
+                                       $subfield_data{marc_value}=$subf[$i][1];
+                               }
+                               $subfield_data{marc_subfield}=$subf[$i][0];
+                               $subfield_data{marc_tag}=$fields[$x_i]->tag();
+                               push(@subfields_data, \%subfield_data);
+                       }
                }
                if ($#subfields_data>=0) {
                        my %tag_data;
-                       $tag_data{tag}=$field->tag().' -'. $tagslib->{$field->tag()}->{lib};
-                       $tag_data{subfield} = \@subfields_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};
+                       }
+                       my @tmp = @subfields_data;
+                       $tag_data{subfield} = \@tmp;
                        push (@loop_data, \%tag_data);
+                       undef @subfields_data;
                }
        }
        $template->param($tabloop."XX" =>\@loop_data);
@@ -125,6 +152,7 @@ my @fields = $record->fields();
 my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code
 my @big_array;
 foreach my $field (@fields) {
+       next if ($field->tag()<10);
        my @subf=$field->subfields;
        my %this_row;
 # loop through each subfield
@@ -141,7 +169,6 @@ foreach my $field (@fields) {
 foreach my $subfield_code  (keys(%witness)) {
        for (my $i=0;$i<=$#big_array;$i++) {
                $big_array[$i]{$subfield_code}="&nbsp;" unless ($big_array[$i]{$subfield_code});
-#              warn "filled : ".$big_array[$i]{$subfield_code};
        }
 }
 # now, construct template !
@@ -152,7 +179,6 @@ for (my $i=0;$i<=$#big_array; $i++) {
        foreach my $subfield_code (keys(%witness)) {
                $items_data .="<td>".$big_array[$i]{$subfield_code}."</td>";
        }
-#      warn $items_data;
        my %row_data;
        $row_data{item_value} = $items_data;
        push(@item_value_loop,\%row_data);
@@ -163,10 +189,14 @@ foreach my $subfield_code (keys(%witness)) {
        push(@header_value_loop, \%header_value);
 }
 
+my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
 $template->param(item_loop => \@item_value_loop,
                                                item_header_loop => \@header_value_loop,
                                                biblionumber => $biblionumber,
                                                bibid => $bibid,
-                                               biblionumber => $biblionumber);
+                                               biblionumber => $biblionumber,
+                                               subscriptionid => $subscriptionid,
+                                               popup => $popup,
+                                               );
 output_html_with_http_headers $query, $cookie, $template->output;