X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=authorities%2Fblinddetail-biblio-search.pl;h=c6a3042836ea5468e04a1b3d24a72051cc4eb68f;hb=3c1c323de47b9265fd2ac925e68998043ce9afc2;hp=afbb16b34aaf4e8a888dca1dcb751984e3615793;hpb=c0c11a87c1bb78fd40a07ad824b3c7ccfb9cb102;p=koha_fer

diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
index afbb16b34a..c6a3042836 100755
--- a/authorities/blinddetail-biblio-search.pl
+++ b/authorities/blinddetail-biblio-search.pl
@@ -13,9 +13,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 NAME
 
@@ -23,6 +23,7 @@ blinddetail-biblio-search.pl : script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,12 +34,11 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
-require Exporter;
+use warnings;
+
 use C4::AuthoritiesMarc;
 use C4::Auth;
 use C4::Context;
@@ -54,11 +54,15 @@ my $dbh = C4::Context->dbh;
 my $authid       = $query->param('authid');
 my $index        = $query->param('index');
 my $tagid        = $query->param('tagid');
+my $relationship = $query->param('relationship');
 my $authtypecode = &GetAuthTypeCode($authid);
 my $tagslib      = &GetTagsLabels( 1, $authtypecode );
 
 my $auth_type = GetAuthType($authtypecode);
-my $record = GetAuthority($authid) if $authid;
+my $record;
+if ($authid) {
+    $record = GetAuthority($authid);
+}
 
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -67,52 +71,97 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { editcatalogue => 1 },
+        flagsrequired   => { editcatalogue => 'edit_catalogue' },
     }
 );
 
 # fill arrays
-my $tag;
-my @loop_data = ();
+my @subfield_loop;
+my ($indicator1, $indicator2);
 if ($authid) {
-    foreach my $field ( $record->field( $auth_type->{auth_tag_to_report} ) ) {
-        my @subfields_data;
-        my @subf = $field->subfields;
-
-        # loop through each subfield
-        my %result;
-        for my $i ( 0 .. $#subf ) {
-            $subf[$i][0] = "@" unless $subf[$i][0];
-            $result{ $subf[$i][0] } .= $subf[$i][1] . "|";
-        }
-        foreach ( keys %result ) {
-            my %subfield_data;
-            chop $result{$_};
-            $subfield_data{marc_value}    = $result{$_};
-            $subfield_data{marc_subfield} = $_;
-
-            # $subfield_data{marc_tag}=$field->tag();
-            push( @subfields_data, \%subfield_data );
+    my @fields = $record->field( $auth_type->{auth_tag_to_report} );
+    my $repet = ($query->param('repet') || 1) - 1;
+    my $field = $fields[$repet];
+
+    # Get all values for each distinct subfield
+    my %subfields;
+    for ( $field->subfields ) {
+        next if $_->[0] == "9"; # $9 will be set with authid value
+        my $letter = $_->[0];
+        next if defined $subfields{$letter};
+        my @values = $field->subfield($letter);
+        $subfields{$letter} = \@values;
+    }
+
+    # Add all subfields to the subfield_loop
+    for( keys %subfields ) {
+        my $letter = $_ || '@';
+        push( @subfield_loop, {marc_subfield => $letter, marc_values => $subfields{$_}} );
+    }
+
+    push( @subfield_loop, { marc_subfield => 'w', marc_values => $relationship } ) if ( $relationship );
+    if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
+        $indicator1 = $field->indicator('1');
+        $indicator2 = $field->indicator('2');
+    } elsif (C4::Context->preference('marcflavour') eq 'MARC21') {
+        my $tag_from = $auth_type->{auth_tag_to_report};
+        my $tag_to = $index;
+        $tag_to =~ s/^tag_(\d*)_.*$/$1/;
+        if ($tag_to =~ /^6/) {  # subject heading
+            my %thes_mapping = qw / a 0
+                                    b 1
+                                    c 2
+                                    d 3
+                                    k 5
+                                    n 4
+                                    r 7
+                                    s 7
+                                    v 6
+                                    z 7
+                                    | 4 /;
+            my $thes_008_11 = '';
+            $thes_008_11 = substr($record->field('008')->data(), 11, 1) if $record->field('008')->data();
+            $indicator2 = defined $thes_mapping{$thes_008_11} ? $thes_mapping{$thes_008_11} : $thes_008_11;
+            if ($indicator2 eq '7') {
+                if ($thes_008_11 eq 'r') {
+                    $subfields{'2'} = ['aat'];
+                } elsif ($thes_008_11 eq 's') {
+                    $subfields{'2'} = ['sears'];
+                }
+            }
         }
-        if ( $#subfields_data >= 0 ) {
-            my %tag_data;
-            $tag_data{tag} = $field->tag() . ' -' . $tagslib->{ $field->tag() }->{lib};
-            $tag_data{subfield} = \@subfields_data;
-            push( @loop_data, \%tag_data );
+        if ($tag_from eq '130') {  # unified title -- the special case
+            if ($tag_to eq '830' || $tag_to eq '240') {
+                $indicator2 = $field->indicator('2');
+            } else {
+                $indicator1 = $field->indicator('2');
+            }
+        } else {
+            $indicator1 = $field->indicator('1');
         }
     }
-} else {
+}
+else {
     # authid is empty => the user want to empty the entry.
     $template->param( "clear" => 1 );
-#     warn Data::Dumper::Dumper(\@loop_data);
 }
 
-$template->param( "0XX" => \@loop_data );
+# Extract the tag number from the index
+my $tag_number = $index;
+$tag_number =~ s/^tag_(\d*)_.*$/$1/;
+
+# Remove spaces in indicators
+$indicator1 =~ s/\s//g;
+$indicator2 =~ s/\s//g;
 
 $template->param(
-    authid => $authid ? $authid : "",
-    index  => $index,
-    tagid  => $tagid,
+    authid          => $authid ? $authid : "",
+    index           => $index,
+    tagid           => $tagid,
+    indicator1      => $indicator1,
+    indicator2      => $indicator2,
+    SUBFIELD_LOOP   => \@subfield_loop,
+    tag_number      => $tag_number,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;