[Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.36.2.17,1.36.2.18

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
        SearchMarc.pm 
Log Message:
fixing a bug in getMARCsubject

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.36.2.17
retrieving revision 1.36.2.18
diff -C2 -r1.36.2.17 -r1.36.2.18
*** SearchMarc.pm       4 Oct 2005 09:40:26 -0000       1.36.2.17
--- SearchMarc.pm       4 Oct 2005 14:48:23 -0000       1.36.2.18
***************
*** 598,606 ****
        my @marcsubjcts;
        my $subject = "";
- #     my $subfield = "";
        my $marcsubjct;
        my $field9;
        my $activetagorder=0;
!       while (my ($subfieldvalue,$subfieldcode,$tagorder,$tag)=$sth->fetchrow) 
{
                if ($activetagorder && $tagorder != $activetagorder) {
                        $subject=~ s/ -- $//;
--- 598,608 ----
        my @marcsubjcts;
        my $subject = "";
        my $marcsubjct;
        my $field9;
        my $activetagorder=0;
!       my $lasttag;
!       my ($subfieldvalue,$subfieldcode,$tagorder,$tag);
!       while (($subfieldvalue,$subfieldcode,$tagorder,$tag)=$sth->fetchrow) {
!               $lasttag=$tag if $tag;
                if ($activetagorder && $tagorder != $activetagorder) {
                        $subject=~ s/ -- $//;
***************
*** 611,614 ****
--- 613,618 ----
                        push @marcsubjcts, $marcsubjct;
                        $subject='';
+                       $tag='';
+                       $field9='';
                }
                if ($subfieldcode eq 9) {
***************
*** 619,623 ****
                $activetagorder=$tagorder;
        }
!       $marcsubjct = {MARCSUBJCT => $subject,};
        push @marcsubjcts, $marcsubjct;
  
--- 623,630 ----
                $activetagorder=$tagorder;
        }
!       $marcsubjct = {MARCSUBJCT => $subject,
!                                       link => $lasttag."9",
!                                       linkvalue => $field9,
!                                       };
        push @marcsubjcts, $marcsubjct;