Bug 8692: Authorities search form does not correspond to current search query

[koha.git] / authorities / blinddetail-biblio-search.pl

diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
index 9d57c8e..6b3d122 100755 (executable)
--- a/authorities/blinddetail-biblio-search.pl
+++ b/authorities/blinddetail-biblio-search.pl
@@ -13,16 +13,17 @@
 # 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
 
-etail.pl : script to show an authority in MARC format
+blinddetail-biblio-search.pl : script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,13 +34,11 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
-
 use strict;
-require Exporter;
+use warnings;
+
 use C4::AuthoritiesMarc;
 use C4::Auth;
 use C4::Context;
@@ -48,87 +47,75 @@ use CGI;
 use MARC::Record;
 use C4::Koha;
 
+my $query = new CGI;
 
-my $query=new CGI;
-
-my $dbh=C4::Context->dbh;
+my $dbh = C4::Context->dbh;
 
-my $authid = $query->param('authid');
-my $index = $query->param('index');
-my $tagid = $query->param('tagid');
+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 $tagslib      = &GetTagsLabels( 1, $authtypecode );
 
 my $auth_type = GetAuthType($authtypecode);
- warn "XX = ".$auth_type->{auth_tag_to_report};
+my $record;
+if ($authid) {
+    $record = GetAuthority($authid);
+}
 
-my $record =GetAuthority($authid);
-  warn "record auth :".$record->as_formatted;
 # open template
-my ($template, $loggedinuser, $cookie)
-               = get_template_and_user({template_name => "authorities/blinddetail-biblio-search.tmpl",
-                            query => $query,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {editauthorities => 1},
-                            debug => 1,
-                            });
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "authorities/blinddetail-biblio-search.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { editcatalogue => 'edit_catalogue' },
+    }
+);
 
 # fill arrays
-my @loop_data =();
-my $tag;
-my @loop_data =();
+my @subfield_loop;
 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;
     }
-    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);
+
+    # Add all subfields to the subfield_loop
+    for( keys %subfields ) {
+        my $letter = $_ || '@';
+        push( @subfield_loop, {marc_subfield => $letter, marc_values => $subfields{$_}} );
     }
-  }
-} else {
-# authid is empty => the user want to empty the entry.
-  my @subfields_data;
-  foreach my $subfield ('a'..'z') {
-    my %subfield_data;
-    $subfield_data{marc_value}='';
-    $subfield_data{marc_subfield}=$subfield;
-    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;
-  push (@loop_data, \%tag_data);
-#      }
+
+    push( @subfield_loop, { marc_subfield => 'w', marc_values => $relationship } ) if ( $relationship );
+}
+else {
+    # authid is empty => the user want to empty the entry.
+    $template->param( "clear" => 1 );
 }
 
-$template->param("0XX" =>\@loop_data);
+# Extract the tag number from the index
+my $tag_number = $index;
+$tag_number =~ s/^tag_(\d*)_.*$/$1/;
 
+$template->param(
+    authid          => $authid ? $authid : "",
+    index           => $index,
+    tagid           => $tagid,
+    SUBFIELD_LOOP   => \@subfield_loop,
+    tag_number      => $tag_number,
+);
 
-$template->param(authid => $authid?$authid:"",
-                index => $index,
-                tagid => $tagid,
-                intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-                intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-                IntranetNav => C4::Context->preference("IntranetNav"),
-                );
 output_html_with_http_headers $query, $cookie, $template->output;