[Koha-cvs] CVS: koha/admin branches.pl,1.24,1.25 itemtypes.pl,1.11,1.12 koha2marclinks.pl,1.10,1.11 thesaurus.pl,1.10,1.11

[Paul POULAIN]

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

Modified Files:
	branches.pl itemtypes.pl koha2marclinks.pl thesaurus.pl 
Log Message:
synch'ing 2.0.0 branch and head

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** branches.pl	12 Jan 2004 16:55:05 -0000	1.24
--- branches.pl	11 Feb 2004 08:40:10 -0000	1.25
***************
*** 79,83 ****
  }
  $template->param(action => $script_name);
- 
  if ($op eq 'add') {
  	# If the user has pressed the "add new branch" button.
--- 79,82 ----

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** itemtypes.pl	12 Jan 2004 16:55:05 -0000	1.11
--- itemtypes.pl	11 Feb 2004 08:40:10 -0000	1.12
***************
*** 97,101 ****
  	if ($itemtype) {
  		my $dbh = C4::Context->dbh;
! 		my $sth=$dbh->prepare("select itemtype,description,loanlength,renewalsallowed,rentalcharge from itemtypes where itemtype=?");
  		$sth->execute($itemtype);
  		$data=$sth->fetchrow_hashref;
--- 97,101 ----
  	if ($itemtype) {
  		my $dbh = C4::Context->dbh;
! 		my $sth=$dbh->prepare("select itemtype,description,loanlength,renewalsallowed,rentalcharge,notforloan from itemtypes where itemtype=?");
  		$sth->execute($itemtype);
  		$data=$sth->fetchrow_hashref;
***************
*** 106,110 ****
  							loanlength => $data->{'loanlength'},
  							renewalsallowed => $data->{'renewalsallowed'},
! 							rentalcharge => $data->{'rentalcharge'});
  ;
  													# END $OP eq ADD_FORM
--- 106,112 ----
  							loanlength => $data->{'loanlength'},
  							renewalsallowed => $data->{'renewalsallowed'},
! 							rentalcharge => $data->{'rentalcharge'},
! 							notforloan => $data->{'notforloan'}
! 							);
  ;
  													# END $OP eq ADD_FORM
***************
*** 113,117 ****
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	my $query = "replace itemtypes (itemtype,description,loanlength,renewalsallowed,rentalcharge) values (";
  	$query.= $dbh->quote($input->param('itemtype')).",";
  	$query.= $dbh->quote($input->param('description')).",";
--- 115,119 ----
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	my $query = "replace itemtypes (itemtype,description,loanlength,renewalsallowed,rentalcharge,notforloan) values (";
  	$query.= $dbh->quote($input->param('itemtype')).",";
  	$query.= $dbh->quote($input->param('description')).",";
***************
*** 122,126 ****
  		$query.= "1,";
  	}
! 	$query.= $dbh->quote($input->param('rentalcharge')).")";
  	my $sth=$dbh->prepare($query);
  	$sth->execute;
--- 124,133 ----
  		$query.= "1,";
  	}
! 	$query.= $dbh->quote($input->param('rentalcharge')).",";
! 	if ($input->param('notforloan') ne 1) {
! 		$query.= "0)";
! 	} else {
! 		$query.= "1)";
! 	}
  	my $sth=$dbh->prepare($query);
  	$sth->execute;

Index: koha2marclinks.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/koha2marclinks.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** koha2marclinks.pl	12 Jan 2004 16:55:05 -0000	1.10
--- koha2marclinks.pl	11 Feb 2004 08:40:11 -0000	1.11
***************
*** 107,112 ****
  	}
  	#XXX: This might not work. Maybe should use a DBI call instead of SHOW COLUMNS
! 	my $sth2=$dbh->prepare("SHOW COLUMNS from ?");
! 	$sth2->execute($tablename);
  
  	my $toggle="white";
--- 107,112 ----
  	}
  	#XXX: This might not work. Maybe should use a DBI call instead of SHOW COLUMNS
! 	my $sth2=$dbh->prepare("SHOW COLUMNS from $tablename");
! 	$sth2->execute;
  
  	my $toggle="white";

Index: thesaurus.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/thesaurus.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** thesaurus.pl	22 Dec 2003 19:16:58 -0000	1.10
--- thesaurus.pl	11 Feb 2004 08:40:11 -0000	1.11
***************
*** 258,265 ****
  							father => $father);
  	if ($offset>0) {
! 		$template->param(previous => "<a href=$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$prevpage>&lt;&lt; Prev</a>");
  	}
  	if ($pagesize<$count) {
! 		$template->param(next => "<a href=$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$nextpage>Next &gt;&gt;</a>");
  	}
  } #---- END $OP eq DEFAULT
--- 258,265 ----
  							father => $father);
  	if ($offset>0) {
! 		$template->param(previous => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$prevpage");
  	}
  	if ($pagesize<$count) {
! 		$template->param(next => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$nextpage");
  	}
  } #---- END $OP eq DEFAULT