[Koha-cvs] CVS: koha updatebiblio.pl,1.2,1.3

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv19328a

Modified Files:
	updatebiblio.pl 
Log Message:
merging 1.2 and main branches


Index: updatebiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatebiblio.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** updatebiblio.pl	9 May 2002 03:01:40 -0000	1.2
--- updatebiblio.pl	28 Jun 2002 12:19:50 -0000	1.3
***************
*** 48,65 ****
      print $input->header;
      print startpage();
!     print startmenu();
      print $error;
!     @subs = split('\n',$error);
      print "<p> Click submit to force the subject";
!     @names = $input->param;
!     $count = @names;
!     for (my $i = 0; $i < $count; $i++) {
  	if ($names[$i] ne 'Force') {
! 	    my $value = $input->param("$names[$i]");
! 	    $data{$names[$i]} = "hidden\t$value\t$i";
  	} # if
      } # for
!     $data{"Force"} = "hidden\t$subs[0]\t$count";
!     print mkform3('updatebiblio.pl', %data);
      print endmenu();
      print endpage();
--- 48,66 ----
      print $input->header;
      print startpage();
!     print startmenu('catalogue');
      print $error;
!     my @subs=split('\n',$error);
      print "<p> Click submit to force the subject";
!     my @names=$input->param;
!     my %data;
!     my $count=@names;
!     for (my $i=0;$i<$count;$i++) {
  	if ($names[$i] ne 'Force') {
! 	    my $value=$input->param("$names[$i]");
! 	    $data{$names[$i]}="hidden\t$value\t$i";
  	} # if
      } # for
!     $data{"Force"}="hidden\t$subs[0]\t$count";
!     print mkform3('updatebiblio.pl',%data);
      print endmenu();
      print endpage();
***************
*** 70,75 ****
  sub checkinp{
    my ($inp)=@_;
!   $inp =~ s/\'/\\\'/g;
!   $inp =~ s/\"/\\\"/g;
    return($inp);
  }
--- 71,76 ----
  sub checkinp{
    my ($inp)=@_;
!   $inp=~ s/\'/\\\'/g;
!   $inp=~ s/\"/\\\"/g;
    return($inp);
  }