[Koha-cvs] CVS: koha/authorities authorities-home.pl,1.9,1.10 authorities.pl,1.11,1.12 blinddetail-biblio-search.pl,1.4,1.5 detail.pl,1.2,1.3

[Paul POULAIN]

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

Modified Files:
        authorities-home.pl authorities.pl 
        blinddetail-biblio-search.pl detail.pl 
Log Message:
synch'ing 2.2 and head

Index: authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities-home.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** authorities-home.pl 1 Mar 2005 13:40:50 -0000       1.9
--- authorities-home.pl 20 Jun 2005 13:17:56 -0000      1.10
***************
*** 88,95 ****
        my @field_data = ();
  
! 
        for(my $i = 0 ; $i <= $#marclist ; $i++)
        {
!               push @field_data, { term => "marclist", val=>$marclist[$i] };
                push @field_data, { term => "and_or", val=>$and_or[$i] };
                push @field_data, { term => "excluding", val=>$excluding[$i] };
--- 88,96 ----
        my @field_data = ();
  
!       # we must get parameters once again. Because if there is a mainentry, 
it has been replaced by something else during the search, thus the links 
next/previous would not work anymore 
!       my @marclist_ini = $query->param('marclist');
        for(my $i = 0 ; $i <= $#marclist ; $i++)
        {
!               push @field_data, { term => "marclist", val=>$marclist_ini[$i] 
};
                push @field_data, { term => "and_or", val=>$and_or[$i] };
                push @field_data, { term => "excluding", val=>$excluding[$i] };

Index: authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** authorities.pl      4 May 2005 08:51:07 -0000       1.11
--- authorities.pl      20 Jun 2005 13:17:56 -0000      1.12
***************
*** 240,243 ****
--- 240,244 ----
                                $tag_data{tag} = $tag;
                                $tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+                               $tag_data{repeatable} = 
$tagslib->{$tag}->{repeatable};
                                $tag_data{indicator} = $indicator;
                                $tag_data{subfield_loop} = address@hidden;
***************
*** 366,404 ****
        my @ind_tag = $input->param('ind_tag');
        my @indicator = $input->param('indicator');
-       splice(@tags,$addedfield,0,$tags[$addedfield]);
-       splice(@subfields,$addedfield,0,$subfields[$addedfield]);
-       splice(@values,$addedfield,0,$values[$addedfield]);
-       splice(@ind_tag,$addedfield,0,$ind_tag[$addedfield]);
        my %indicators;
        for (my $i=0;$i<=$#ind_tag;$i++) {
                $indicators{$ind_tag[$i]} = $indicator[$i];
        }
! # search the part of the array to duplicate.
!       my $start=0;
!       my $end=0;
!       my $started;
!       for (my $i=0;$i<=$#tags;$i++) {
!               $start=$i if ($start eq 0 && $tags[$i] == $addedfield);
!               $end=$i if ($start>0 && $tags[$i] eq $addedfield);
!               last if ($start>0 && $tags[$i] ne $addedfield);
!       }
! # add an empty line in all arrays. This forces a new field in MARC::Record.
!       splice(@tags,$end+1,0,'');
!       splice(@subfields,$end+1,0,'');
!       splice(@values,$end+1,0,'');
!       splice(@ind_tag,$end+1,0,'');
!       splice(@indicator,$end+1,0,'');
! # then duplicate the field.
!       splice(@tags,$end+2,0,@tags[$start..$end]);
!       splice(@subfields,$end+2,0,@subfields[$start..$end]);
!       splice(@values,$end+2,0,@values[$start..$end]);
!       splice(@ind_tag,$end+2,0,@ind_tag[$start..$end]);
!       splice(@indicator,$end+2,0,@indicator[$start..$end]);
  
-       my %indicators;
-       for (my $i=0;$i<=$#ind_tag;$i++) {
-               $indicators{$ind_tag[$i]} = $indicator[$i];
-       }
-       my $record = 
MARChtml2marc($dbh,address@hidden,address@hidden,address@hidden,%indicators);
        build_tabs ($template, $record, $dbh,$encoding);
        build_hidden_data;
--- 367,378 ----
        my @ind_tag = $input->param('ind_tag');
        my @indicator = $input->param('indicator');
        my %indicators;
        for (my $i=0;$i<=$#ind_tag;$i++) {
                $indicators{$ind_tag[$i]} = $indicator[$i];
        }
!       my $record = 
AUTHhtml2marc($dbh,address@hidden,address@hidden,address@hidden,%indicators);
!       my $field = MARC::Field->new("$addedfield",'','','a'=> "");
!       $record->append_fields($field);
  
        build_tabs ($template, $record, $dbh,$encoding);
        build_hidden_data;
***************
*** 418,422 ****
  }
  
! if ($authid) {
        build_tabs ($template, $record, $dbh,$encoding);
        build_hidden_data;
--- 392,397 ----
  }
  
! unless ($op) {
! #     warn "BUILDING";
        build_tabs ($template, $record, $dbh,$encoding);
        build_hidden_data;
***************
*** 432,436 ****
        );
  
!       my $authtypes = getauthtypes;
  my @authtypesloop;
  foreach my $thisauthtype (keys %$authtypes) {
--- 407,411 ----
        );
  
! my $authtypes = getauthtypes;
  my @authtypesloop;
  foreach my $thisauthtype (keys %$authtypes) {
***************
*** 443,446 ****
  }
  
! $template->param(authtypesloop => address@hidden);
  output_html_with_http_headers $input, $cookie, $template->output;
--- 418,423 ----
  }
  
! $template->param(authtypesloop => address@hidden,
!                               authtypetext => 
$authtypes->{$authtypecode}{'authtypetext'},
!                               );
  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.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** blinddetail-biblio-search.pl        16 Sep 2004 09:45:44 -0000      1.4
--- blinddetail-biblio-search.pl        20 Jun 2005 13:17:56 -0000      1.5
***************
*** 80,84 ****
  my @loop_data =();
  if ($authid) {
- warn "report $authtypecode => 
".$auth_type->{auth_tag_to_report}.$record->as_formatted;
        foreach my $field ($record->field($auth_type->{auth_tag_to_report})) {
                        my @subfields_data;
--- 80,83 ----

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/detail.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.pl   8 Nov 2004 19:46:11 -0000       1.2
--- detail.pl   20 Jun 2005 13:17:56 -0000      1.3
***************
*** 144,147 ****
--- 144,148 ----
                                count => $count,
                                biblio_fields => $biblio_fields,
+                               authtypetext => 
$authtypes->{$authtypecode}{'authtypetext'},
                                authtypesloop => address@hidden);
  output_html_with_http_headers $query, $cookie, $template->output;