[Koha-cvs] CVS: koha/search.marc search.pl,1.26,1.27

[Paul POULAIN]

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11296/search.marc

Modified Files:
	search.pl 
Log Message:
see mail on koha-devel : code cleaning on Search.pm + normalizing API + use of biblionumber everywhere (instead of bn, biblio, ...)

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/search.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** search.pl	12 Aug 2005 14:03:00 -0000	1.26
--- search.pl	22 Sep 2005 15:34:17 -0000	1.27
***************
*** 344,360 ****
  	my @select_branch;
  	my %select_branches;
! 	my ($count2, at branches)=branches();
! 	push @select_branch, "";
! 	$select_branches{''} = "";
! 	for (my $i=0;$i<$count2;$i++){
! 		push @select_branch, $branches[$i]->{'branchcode'};#
! 		$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
  	}
- 	my $CGIbranch=CGI::scrolling_list( -name     => 'value',
- 				-id => 'branch',
- 				-values   => \@select_branch,
- 				-labels   => \%select_branches,
- 				-size     => 1,
- 				-multiple => 0 );
  	$sth->finish;
  
--- 344,357 ----
  	my @select_branch;
  	my %select_branches;
! 	my $branches=getbranches();
! 	my @branchloop;
! 	foreach my $thisbranch (sort keys %$branches) {
! # 		my $selected = 1 if $thisbranch eq $branch;
! 		my %row =(value => $thisbranch,
! # 					selected => $selected,
! 					branchname => $branches->{$thisbranch}->{'branchname'},
! 				);
! 		push @branchloop, \%row;
  	}
  	$sth->finish;
  
***************
*** 363,367 ****
  			"nbstatements" => 3,
  			CGIitemtype => $CGIitemtype,
! 			CGIbranch => $CGIbranch,
  			);
  }
--- 360,364 ----
  			"nbstatements" => 3,
  			CGIitemtype => $CGIitemtype,
! 			branchloop => \@branchloop,
  			);
  }