From truth_nz@users.sourceforge.net Thu May  2 19:47:37 2002
From: Gynn Lomax <truth_nz@users.sourceforge.net>
To: koha-devel@lists.koha-community.org
Subject: [Koha-devel] CVS: koha/acqui.simple addbiblioitem.pl,1.1,1.2
 additem.pl,1.1,1.2 savebiblio.pl,1.1,1.2 savebiblioitem.pl,1.1,1.2
 saveitem.pl,1.1,1.2
Date: Thu, 02 May 2002 19:48:26 +0000
Message-ID: <E173T6d-0006ay-00@usw-pr-cvs1.sourceforge.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1790909772208128640=="

--===============1790909772208128640==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv25277/acqui.simple

Modified Files:
	addbiblioitem.pl additem.pl savebiblio.pl savebiblioitem.pl=20
	saveitem.pl=20
Log Message:
Bug fixes to get the new acqui.simple system working.


Index: addbiblioitem.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblioitem.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbiblioitem.pl	29 Apr 2002 05:29:02 -0000	1.1
--- addbiblioitem.pl	3 May 2002 02:47:33 -0000	1.2
***************
*** 17,27 ****
     =20
      ($count, @results) =3D &getbiblio($biblionumber);
!     $title =3D @results[0]->{'title'};
 =20
!     print $input->header;
!     print startpage();
!     print startmenu('acquisitions');
 =20
!     print << "EOF";
  <font size=3D"6"><em>Adding New Group Information - $title</em></font>
  <table bgcolor=3D"#ffcc00" width=3D"80%" cellpadding=3D"5">
--- 17,31 ----
     =20
      ($count, @results) =3D &getbiblio($biblionumber);
!    =20
!     if (! $count) {
! 	print $input->redirect('addbooks.pl');
!     } else {
! 	$title =3D @results[0]->{'title'};
 =20
! 	print $input->header;
! 	print startpage();
! 	print startmenu('acquisitions');
 =20
! 	print << "EOF";
  <font size=3D"6"><em>Adding New Group Information - $title</em></font>
  <table bgcolor=3D"#ffcc00" width=3D"80%" cellpadding=3D"5">
***************
*** 64,75 ****
  EOF
 =20
!     ($count, @results) =3D &getitemtypes;
!     for (my $i =3D 0; $i < $count; $i++) {
! 	print << "EOF";
  <option value=3D"$results[$i]->{'itemtype'}">$results[$i]->{'itemtype'} - $=
results[$i]->{'description'}
  EOF
!     } # for
 =20
!     print << "EOF";
  </select></td>
  </tr>
--- 68,79 ----
  EOF
 =20
! 	($count, @results) =3D &getitemtypes;
! 	for (my $i =3D 0; $i < $count; $i++) {
! 	    print << "EOF";
  <option value=3D"$results[$i]->{'itemtype'}">$results[$i]->{'itemtype'} - $=
results[$i]->{'description'}
  EOF
! 	} # for
 =20
! 	print << "EOF";
  </select></td>
  </tr>
***************
*** 117,121 ****
  EOF
 =20
!     print endmenu();
!     print endpage();
  } # else
--- 121,126 ----
  EOF
 =20
! 	print endmenu();
! 	print endpage();
!     } # else
  } # else

Index: additem.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** additem.pl	29 Apr 2002 05:29:02 -0000	1.1
--- additem.pl	3 May 2002 02:47:33 -0000	1.2
***************
*** 16,20 ****
      print $input->redirect('addbooks.pl');
  } else {
!    =20
      ($count, @results) =3D &getbiblioitem($biblioitemnum);
     =20
--- 16,20 ----
      print $input->redirect('addbooks.pl');
  } else {
!=20
      ($count, @results) =3D &getbiblioitem($biblioitemnum);
     =20
***************
*** 63,67 ****
  <center>
  <h2>Section Three: Specific Item Information</h2>
! <form action=3D"saveitems" method=3D"post">
  <input type=3D"hidden" name=3D"biblioitemnum" value=3D"$biblioitemnum">
  <table>
--- 63,67 ----
  <center>
  <h2>Section Three: Specific Item Information</h2>
! <form action=3D"saveitem.pl" method=3D"post">
  <input type=3D"hidden" name=3D"biblioitemnum" value=3D"$biblioitemnum">
  <table>

Index: savebiblio.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/koha/koha/acqui.simple/savebiblio.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** savebiblio.pl	29 Apr 2002 05:29:02 -0000	1.1
--- savebiblio.pl	3 May 2002 02:47:33 -0000	1.2
***************
*** 6,16 ****
 =20
  my $input =3D new CGI;
! my $biblio->{'title'}       =3D $input->param('title');
! my $biblio->{'subtitle'}    =3D $input->param('subtitle');
! my $biblio->{'author'}      =3D $input->param('author');
! my $biblio->{'seriestitle'} =3D $input->param('seriestitle');
! my $biblio->{'copyright'}   =3D $input->param('copyrightdate');
! my $biblio->{'abstract'}    =3D $input->param('abstract');
! my $biblio->{'notes'}       =3D $input->param('notes');
  my $biblionumber;
 =20
--- 6,17 ----
 =20
  my $input =3D new CGI;
! my $biblio =3D { title       =3D> $input->param('title'),
!                subtitle    =3D> $input->param('subtitle'),
!                author      =3D> $input->param('author'),
!                seriestitle =3D> $input->param('seriestitle'),
!                copyright   =3D> $input->param('copyrightdate'),
!                abstract    =3D> $input->param('abstract'),
!                notes       =3D> $input->param('notes')
!              }; # my $biblio
  my $biblionumber;
 =20
***************
*** 20,25 ****
 =20
      $biblionumber =3D &newbiblio($biblio);
!     &newsubtitle($biblionumber, $subtitle);
 =20
!     print $input->redirect('addbiblioitem.pl?biblionumber=3D$biblionumber');
  } # else
--- 21,26 ----
 =20
      $biblionumber =3D &newbiblio($biblio);
!     &newsubtitle($biblionumber, $biblio->{'subtitle'});
 =20
!     print $input->redirect("addbiblioitem.pl?biblionumber=3D$biblionumber");
  } # else

Index: savebiblioitem.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/koha/koha/acqui.simple/savebiblioitem.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** savebiblioitem.pl	29 Apr 2002 05:29:02 -0000	1.1
--- savebiblioitem.pl	3 May 2002 02:47:33 -0000	1.2
***************
*** 37,40 ****
      $biblioitemnum =3D &newbiblioitem($biblioitem);
 =20
!     print $input->redirect('additem.pl?biblioitemnum=3D$biblioitemnum');
  } # else
--- 37,40 ----
      $biblioitemnum =3D &newbiblioitem($biblioitem);
 =20
!     print $input->redirect("additem.pl?biblioitemnum=3D$biblioitemnum");
  } # else

Index: saveitem.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/koha/koha/acqui.simple/saveitem.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** saveitem.pl	29 Apr 2002 05:29:02 -0000	1.1
--- saveitem.pl	3 May 2002 02:47:33 -0000	1.2
***************
*** 9,13 ****
  my $biblioitemnum =3D $input->param('biblioitemnum');
  my $item          =3D {
!     biblioitemnum    =3D> $biblioitemnum,
      homebranch       =3D> $input->param('homebranch'),
      replacementprice =3D> $input->param('replacementprice'),
--- 9,13 ----
  my $biblioitemnum =3D $input->param('biblioitemnum');
  my $item          =3D {
!     biblioitemnumber =3D> $biblioitemnum,
      homebranch       =3D> $input->param('homebranch'),
      replacementprice =3D> $input->param('replacementprice'),
***************
*** 31,35 ****
  	&newitems($item, ($barcode));
 =20
! 	print $input->redirect('additem.pl?biblioitemnum=3D$biblioitemnum');
      } # else
  } # else
--- 31,35 ----
  	&newitems($item, ($barcode));
 =20
! 	print $input->redirect("additem.pl?biblioitemnum=3D$biblioitemnum");
      } # else
  } # else



--===============1790909772208128640==--