[Koha-cvs] CVS: koha/authorities authorities.pl,1.12,1.13 blinddetail-biblio-search.pl,1.5,1.6

[Paul POULAIN]

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

Modified Files:
        authorities.pl blinddetail-biblio-search.pl 
Log Message:
big commit, still breaking things...

* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not 
be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued

Index: authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** authorities.pl      20 Jun 2005 13:17:56 -0000      1.12
--- authorities.pl      26 Oct 2005 09:11:50 -0000      1.13
***************
*** 140,144 ****
        $subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
        $subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
! #     $subfield_data{kohafield}=$tagslib->{$tag}->{$subfield}->{kohafield};
        if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
                $subfield_data{marc_value}= build_authorized_values_list($tag, 
$subfield, $value, $dbh,$authorised_values_sth);
--- 140,144 ----
        $subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
        $subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
!       $subfield_data{index} = $i;
        if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
                $subfield_data{marc_value}= build_authorized_values_list($tag, 
$subfield, $value, $dbh,$authorised_values_sth);
***************
*** 420,423 ****
--- 420,424 ----
  $template->param(authtypesloop => address@hidden,
                                authtypetext => 
$authtypes->{$authtypecode}{'authtypetext'},
+                               hide_marc => 
C4::Context->preference('hide_marc'),
                                );
  output_html_with_http_headers $input, $cookie, $template->output;

Index: blinddetail-biblio-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/blinddetail-biblio-search.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** blinddetail-biblio-search.pl        20 Jun 2005 13:17:56 -0000      1.5
--- blinddetail-biblio-search.pl        26 Oct 2005 09:11:50 -0000      1.6
***************
*** 81,93 ****
  if ($authid) {
        foreach my $field ($record->field($auth_type->{auth_tag_to_report})) {
!                       my @subfields_data;
!                       my @subf=$field->subfields;
                # loop through each subfield
                for my $i (0..$#subf) {
                        $subf[$i][0] = "@" unless $subf[$i][0];
                        my %subfield_data;
!                       $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);
                }
--- 81,98 ----
  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);
                }