[Koha-cvs] CVS: koha/value_builder unimarc_field_210c.pl,1.3,1.4 unimarc_field_225a.pl,1.5,1.6

[Paul POULAIN]

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

Modified Files:
	unimarc_field_210c.pl unimarc_field_225a.pl 
Log Message:
synch'ing 2.0.0 branch (RC4 tag) and head

Index: unimarc_field_210c.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_210c.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_210c.pl	1 Aug 2003 14:20:51 -0000	1.3
--- unimarc_field_210c.pl	11 Feb 2004 08:44:28 -0000	1.4
***************
*** 78,82 ****
  $res .= "
  ];
! 	// search isbn subfield. it's 010a
  	var isbn_found;
  	for (i=0 ; i<document.f.field_value.length ; i++) {
--- 78,82 ----
  $res .= "
  ];
! 	// search isbn subfield. it''s 010a
  	var isbn_found;
  	for (i=0 ; i<document.f.field_value.length ; i++) {
***************
*** 115,120 ****
  my ($input) = @_;
  	my $index = $input->param("index");
! 	my $result = $input->param("result");
! 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus_popup.pl?category=EDITORS&index=$index&result=$result\"></html>";
  	exit;
  }
--- 115,122 ----
  my ($input) = @_;
  	my $index = $input->param("index");
! 	my $result =  $input->param("result");
! 	$result=~s/ /&nbsp;/g;
! 	$result=~s/"/&quot;/g;
! 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus_popup.pl?category=EDITORS&nohierarchy=1&index=$index&result=$result\"></html>";
  	exit;
  }

Index: unimarc_field_225a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_225a.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** unimarc_field_225a.pl	23 Jun 2003 11:27:49 -0000	1.5
--- unimarc_field_225a.pl	11 Feb 2004 08:44:29 -0000	1.6
***************
*** 120,124 ****
  		my @collections;
  	if ($isbn_found) {
! 		my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father=? and category='EDITORS'");
  		my @splited = split //, $isbn_found;
  		my $isbn_rebuild='';
--- 120,124 ----
  		my @collections;
  	if ($isbn_found) {
! 		my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father=? and category='EDITORS' order by stdlib");
  		my @splited = split //, $isbn_found;
  		my $isbn_rebuild='';
***************
*** 132,136 ****
  	} else {
  	# if there is no isbn, search with %
! 		my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS'");
  		$sth->execute("\%$authoritysep $editor_found $authoritysep");
  		while (my ($line)= $sth->fetchrow) {
--- 132,136 ----
  	} else {
  	# if there is no isbn, search with %
! 		my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS' order by stdlib");
  		$sth->execute("\%$authoritysep $editor_found $authoritysep");
  		while (my ($line)= $sth->fetchrow) {