[Koha-cvs] CVS: koha/admin authorised_values.pl,1.2,1.3 marc_subfields_structure.pl,1.5,1.6 thesaurus.pl,1.3,1.4

[Paul POULAIN]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv11025/admin

Modified Files:
	authorised_values.pl marc_subfields_structure.pl thesaurus.pl 
Log Message:
many bugfixes from Dombes Abbey tests

Index: authorised_values.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** authorised_values.pl	19 Nov 2002 12:35:33 -0000	1.2
--- authorised_values.pl	10 Dec 2002 13:29:32 -0000	1.3
***************
*** 33,37 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
! 	my $query="Select id,category,authorised_value from authorised_values where (category like \"$data[0]%\") order by category,authorised_value";
  	my $sth=$dbh->prepare($query);
  	$sth->execute;
--- 33,37 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
! 	my $query="Select id,category,authorised_value,lib from authorised_values where (category like \"$data[0]%\") order by category,authorised_value";
  	my $sth=$dbh->prepare($query);
  	$sth->execute;
***************
*** 50,54 ****
  $searchfield=~ s/\,//g;
  my $id = $input->param('id');
! my $reqsel="select category,authorised_value from authorised_values where id='$id'";
  my $reqdel="delete from authorised_values where id='$id'";
  my $offset=$input->param('offset');
--- 50,54 ----
  $searchfield=~ s/\,//g;
  my $id = $input->param('id');
! my $reqsel="select category,authorised_value,lib from authorised_values where id='$id'";
  my $reqdel="delete from authorised_values where id='$id'";
  my $offset=$input->param('offset');
***************
*** 73,77 ****
  	if ($id) {
  		my $dbh = C4::Context->dbh;
! 		my $sth=$dbh->prepare("select id,category,authorised_value from authorised_values where id='$id'");
  		$sth->execute;
  		$data=$sth->fetchrow_hashref;
--- 73,77 ----
  	if ($id) {
  		my $dbh = C4::Context->dbh;
! 		my $sth=$dbh->prepare("select id,category,authorised_value,lib from authorised_values where id='$id'");
  		$sth->execute;
  		$data=$sth->fetchrow_hashref;
***************
*** 87,90 ****
--- 87,91 ----
  	$template->param(category => $data->{'category'},
  							authorised_value => $data->{'authorised_value'},
+ 							lib => $data->{'lib'},
  							id => $data->{'id'}
  							);
***************
*** 98,104 ****
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	my $sth=$dbh->prepare("replace authorised_values (id,category,authorised_value) values (?,?,?)");
! 	warn "TOTO : ".$input->param('id'), $input->param('category'), $input->param('authorised_value');
! 	$sth->execute($input->param('id'), $input->param('category'), $input->param('authorised_value'));
  	$sth->finish;
  	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."\"></html>";
--- 99,104 ----
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	my $sth=$dbh->prepare("replace authorised_values (id,category,authorised_value,lib) values (?,?,?,?)");
! 	$sth->execute($input->param('id'), $input->param('category'), $input->param('authorised_value'),$input->param('lib'));
  	$sth->finish;
  	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."\"></html>";
***************
*** 162,165 ****
--- 162,166 ----
  		$row_data{category} = $results->[$i]{'category'};
  		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
+ 		$row_data{lib} = $results->[$i]{'lib'};
  		$row_data{edit} = "$script_name?op=add_form&id=".$results->[$i]{'id'};
  		$row_data{delete} = "$script_name?op=delete_confirm&searchfield=$searchfield&id=".$results->[$i]{'id'};

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** marc_subfields_structure.pl	19 Nov 2002 12:35:34 -0000	1.5
--- marc_subfields_structure.pl	10 Dec 2002 13:29:32 -0000	1.6
***************
*** 167,171 ****
  		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
  					-values=> \@value_builder,
! 					-default=>$data->{'thesaurus_category'},
  					-size=>1,
  					-multiple=>0,
--- 167,171 ----
  		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
  					-values=> \@value_builder,
! 					-default=>$data->{'value_builder'},
  					-size=>1,
  					-multiple=>0,

Index: thesaurus.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/thesaurus.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** thesaurus.pl	2 Dec 2002 14:59:50 -0000	1.3
--- thesaurus.pl	10 Dec 2002 13:29:32 -0000	1.4
***************
*** 74,80 ****
  	}
  	if ($search_category) {
! 		$template->param(action => "Modify authorised value");
  	} else {
! 		$template->param(action => "Add authorised value");
  	}
  	$template->param(category => $data->{'category'},
--- 74,80 ----
  	}
  	if ($search_category) {
! 		$template->param(action => "Modify thesaurus");
  	} else {
! 		$template->param(action => "Add thesaurus");
  	}
  	$template->param(category => $data->{'category'},
***************
*** 98,102 ****
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	newauthority($dbh,$input->param('category'),$input->param('stdlib'), $input->param('freelib'),'',1,'');
  	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$offset\"></html>";
  	exit;
--- 98,104 ----
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	my $freelib = $input->param('freelib');
! 	$freelib = $input->param('stdlib') unless ($input->param('freelib'));
! 	newauthority($dbh,$input->param('category'),$input->param('father')." ".$input->param('stdlib'), $freelib,'',1,'');
  	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$offset\"></html>";
  	exit;
***************
*** 118,125 ****
  # called by delete_confirm, used to effectively confirm deletion of data in DB
  } elsif ($op eq 'delete_confirmed') {
- #	my $dbh = C4::Context->dbh;
- #	my $sth=$dbh->prepare($reqdel);
- #	$sth->execute;
- #	$sth->finish;
  	&delauthority($id);
  	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?search_category=$search_category&searchstring=$searchstring\"></html>";
--- 120,123 ----