moving fields around toCVS: ----------------------------------------------------...

[koha_fer] / MARCdetail.pl

diff --git a/MARCdetail.pl b/MARCdetail.pl
index b82d6fa..01984bb 100755 (executable)
--- a/MARCdetail.pl
+++ b/MARCdetail.pl
@@ -26,10 +26,17 @@ MARCdetail.pl : script to show a biblio in MARC format
 
 =head1 DESCRIPTION
 
-This script needs a biblionumber in bib parameter (bibnumber from koha style DB. Automaticaly maps to marc biblionumber).
-It shows the biblio in a (nice) MARC format depending on MARC parameters tables.
-The template is in <templates_dir>/catalogue/MARCdetail.tmpl. this template must be divided in 11 "tabs".
-The 10 firsts presents the biblio, the 11th one presents the items attached to the biblio
+This script needs a biblionumber in bib parameter (bibnumber
+from koha style DB.  Automaticaly maps to marc biblionumber).
+
+It shows the biblio in a (nice) MARC format depending on MARC
+parameters tables.
+
+The template is in <templates_dir>/catalogue/MARCdetail.tmpl.
+this template must be divided into 11 "tabs".
+
+The first 10 tabs present the biblio, the 11th one presents
+the items attached to the biblio
 
 =head1 FUNCTIONS
 
@@ -40,8 +47,10 @@ The 10 firsts presents the biblio, the 11th one presents the items attached to t
 
 use strict;
 require Exporter;
+use C4::Auth;
 use C4::Context;
 use C4::Output;
+use C4::Interface::CGI::Output;
 use CGI;
 use C4::Search;
 use MARC::Record;
@@ -54,14 +63,22 @@ my $query=new CGI;
 my $dbh=C4::Context->dbh;
 
 my $biblionumber=$query->param('bib');
-my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber);
-
+my $bibid = $query->param('bibid');
+$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);
-#warn $record->as_formatted();
 # open template
-my $template = gettemplate("catalogue/MARCdetail.tmpl",0);
+my ($template, $loggedinuser, $cookie)
+               = get_template_and_user({template_name => "catalogue/MARCdetail.tmpl",
+                            query => $query,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {catalogue => 1},
+                            debug => 1,
+                            });
+
 # fill arrays
 my @loop_data =();
 my $tag;
@@ -71,18 +88,29 @@ for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
        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();
-                       next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  ne $tabloop);
+                       my @subfields_data;
+               # 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()}->{$subf[$i][0]}->{lib};
-                       $subfield_data{marc_value}=$subf[$i][1];
-                       $subfield_data{marc_tag}=$subf[$i][0];
+                       $subfield_data{marc_lib}=$tagslib->{$field->tag()}->{'@'}->{lib};
+                       $subfield_data{marc_value}=$field->data();
+                       $subfield_data{marc_subfield}='@';
+                       $subfield_data{marc_tag}=$field->tag();
                        push(@subfields_data, \%subfield_data);
+               } else {
+                       my @subf=$field->subfields;
+       # loop through each subfield
+                       for my $i (0..$#subf) {
+                               $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();
+                               push(@subfields_data, \%subfield_data);
+                       }
                }
                if ($#subfields_data>=0) {
                        my %tag_data;
@@ -102,6 +130,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
@@ -118,7 +147,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 !
@@ -129,7 +157,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);
@@ -143,6 +170,7 @@ foreach my $subfield_code (keys(%witness)) {
 $template->param(item_loop => \@item_value_loop,
                                                item_header_loop => \@header_value_loop,
                                                biblionumber => $biblionumber,
-                                               bibid => $bibid);
-print "Content-Type: text/html\n\n", $template->output;
+                                               bibid => $bibid,
+                                               biblionumber => $biblionumber);
+output_html_with_http_headers $query, $cookie, $template->output;