[Koha-cvs] CVS: koha/acqui newbasket2.pl,1.11,1.11.2.1

[Ambrose C. LI]

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

Modified Files:
      Tag: rel_2_0
        newbasket2.pl 
Log Message:
Make "On Loan" translatable. Old templates should still work.


Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** newbasket2.pl       13 Feb 2003 17:27:50 -0000      1.11
--- newbasket2.pl       11 Mar 2004 07:12:43 -0000      1.11.2.1
***************
*** 139,142 ****
--- 139,143 ----
                my $itemcount;
        my $location='';
+       my $location_only='';
        my $word=$result->{'author'};
        $word=~ s/([a-z]) +([a-z])/$1%20$2/ig;
***************
*** 155,179 ****
--- 156,190 ----
                }
                $location.=" ";
+               $lineres{'on-loan-p'}=1;
        }
        if ($lcount > 0){
                $location .= "Levin";
+               $location_only .= "Levin";
                if ($lcount >1 ){
                        $location .= " ($lcount)";
+                       $location_only .= " ($lcount)";
                }
                $location.=" ";
+               $location_only.=" ";
        }
        if ($fcount > 0){
                $location .= "Foxton";
+               $location_only .= "Foxton";
                if ($fcount >1 ){
                        $location .= " ($fcount)";
+                       $location_only .= " ($fcount)";
                }
                $location.=" ";
+               $location_only.=" ";
        }
        if ($scount > 0){
                $location .= "Shannon";
+               $location_only .= "Shannon";
                if ($scount >1 ){
                        $location .= " ($scount)";
+                       $location_only .= " ($scount)";
                }
                $location.=" ";
+               $location_only.=" ";
        }
        if ($lostcount > 0){
***************
*** 183,186 ****
--- 194,198 ----
                }
                $location.=" ";
+               $lineres{'lost-p'}=1;
        }
        if ($mending > 0){
***************
*** 190,193 ****
--- 202,206 ----
                }
                $location.=" ";
+               $lineres{'mending-p'}=1;
        }
        if ($transit > 0){
***************
*** 197,200 ****
--- 210,214 ----
                }
                $location.=" ";
+               $lineres{'in-transit-p'}=1;
        }
        if ($colour == 1){
***************
*** 217,220 ****
--- 231,235 ----
        $lineres{itemcount}=$count;
        $lineres{location}=$location;
+       $lineres{'location-only'}=$location_only;
        push(@loopresult,\%lineres);
        $i++;
***************
*** 239,243 ****
                                                                author => 
$author,
                                                                loopsearch 
=>address@hidden,
!                                                               loopresult 
=>address@hidden);
  
  output_html_with_http_headers $input, $cookie, $template->output;
--- 254,259 ----
                                                                author => 
$author,
                                                                loopsearch 
=>address@hidden,
!                                                               loopresult 
=>address@hidden,
!                                                               
'use-location-flags-p' => 1);
  
  output_html_with_http_headers $input, $cookie, $template->output;