[Koha-cvs] CVS: koha/authorities auth_finder.pl,1.5,1.6 authorities-home.pl,1.8,1.9

[Paul POULAIN]

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

Modified Files:
	auth_finder.pl authorities-home.pl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here

Index: auth_finder.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/auth_finder.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** auth_finder.pl	18 Aug 2004 16:05:42 -0000	1.5
--- auth_finder.pl	1 Mar 2005 13:40:50 -0000	1.6
***************
*** 38,42 ****
  my $authtypecode = $query->param('authtypecode');
  my $index = $query->param('index');
! my $category = $query->param('category');
  my $resultstring = $query->param('result');
  my $dbh = C4::Context->dbh;
--- 38,42 ----
  my $authtypecode = $query->param('authtypecode');
  my $index = $query->param('index');
! # my $category = $query->param('category');
  my $resultstring = $query->param('result');
  my $dbh = C4::Context->dbh;
***************
*** 69,76 ****
  	$resultsperpage = 19 if(!defined $resultsperpage);
  
! 	# builds tag and subfield arrays
! 	my @tags;
! 
! 	my ($results,$total) = authoritysearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
  										$startfrom*$resultsperpage, $resultsperpage,$authtypecode);# $orderby);
--- 69,73 ----
  	$resultsperpage = 19 if(!defined $resultsperpage);
  
! 	my ($results,$total) = authoritysearch($dbh, \@marclist,\@and_or,
  										\@excluding, \@operator, \@value,
  										$startfrom*$resultsperpage, $resultsperpage,$authtypecode);# $orderby);
***************
*** 128,132 ****
  	}
  	$template->param(result => $results) if $results;
! 	$template->param(index => $query->param('index'));
  	$template->param(startfrom=> $startfrom,
  							displaynext=> $displaynext,
--- 125,129 ----
  	}
  	$template->param(result => $results) if $results;
! 	$template->param(index => $query->param('index')."");
  	$template->param(startfrom=> $startfrom,
  							displaynext=> $displaynext,
***************
*** 155,164 ****
  
  	$template->param(index => $index,
! 					resultstring => $resultstring
  					);
  }
  
! $template->param(authtypesloop => \@authtypesloop);
! $template->param(category => $category);
  
  # Print the page
--- 152,162 ----
  
  	$template->param(index => $index,
! 					resultstring => $resultstring,
  					);
  }
  
! $template->param(authtypesloop => \@authtypesloop,
! 				authtypecode => $authtypecode);
! warn "CAT : $authtypecode";
  
  # Print the page

Index: authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities-home.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** authorities-home.pl	13 Dec 2004 16:39:14 -0000	1.8
--- authorities-home.pl	1 Mar 2005 13:40:50 -0000	1.9
***************
*** 66,70 ****
  	$resultsperpage = 19 if(!defined $resultsperpage);
  	my @tags;
! 	my ($results,$total) = authoritysearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
  										$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
--- 66,70 ----
  	$resultsperpage = 19 if(!defined $resultsperpage);
  	my @tags;
! 	my ($results,$total) = authoritysearch($dbh, \@marclist,\@and_or,
  										\@excluding, \@operator, \@value,
  										$startfrom*$resultsperpage, $resultsperpage,$authtypecode);