[Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.3,1.4 marctagstructure.pl,1.6,1.7 thesaurus.pl,1.1,1.2

Paul POULAIN tipaul at users.sourceforge.net
Tue Nov 12 17:43:18 CET 2002


Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv6490/admin

Modified Files:
	marc_subfields_structure.pl marctagstructure.pl thesaurus.pl 
Log Message:


Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** marc_subfields_structure.pl	25 Oct 2002 10:55:47 -0000	1.3
--- marc_subfields_structure.pl	12 Nov 2002 16:43:16 -0000	1.4
***************
*** 32,36 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
! 	my $query="Select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab, authorised_value from marc_subfield_structure where (tagfield like \"$searchstring%\") order by tagfield";
  	my $sth=$dbh->prepare($query);
  	$sth->execute;
--- 32,36 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
! 	my $query="Select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where (tagfield like \"$searchstring%\") order by tagfield";
  	my $sth=$dbh->prepare($query);
  	$sth->execute;
***************
*** 51,55 ****
  my $tagsubfield=$input->param('tagsubfield');
  my $pkfield="tagfield";
! my $reqsel="select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value from marc_subfield_structure where tagfield='$tagfield'";
  my $reqdel="delete from marc_subfield_structure where tagfield='$tagfield' and tagsubfield='$tagsubfield'";
  my $offset=$input->param('offset');
--- 51,55 ----
  my $tagsubfield=$input->param('tagsubfield');
  my $pkfield="tagfield";
! my $reqsel="select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where tagfield='$tagfield'";
  my $reqdel="delete from marc_subfield_structure where tagfield='$tagfield' and tagsubfield='$tagsubfield'";
  my $offset=$input->param('offset');
***************
*** 76,81 ****
  	my $data;
  	my $dbh = C4::Context->dbh;
! 	my $sth=$dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value from marc_subfield_structure where tagfield='$tagfield'"); # and tagsubfield='$tagsubfield'");
! 	$sth->execute;
  	# builds kohafield tables
  	my @kohafields;
--- 76,80 ----
  	my $data;
  	my $dbh = C4::Context->dbh;
! 	my $more_subfields = $input->param("more_subfields")+1;
  	# builds kohafield tables
  	my @kohafields;
***************
*** 96,100 ****
  		push @kohafields, "items.".$field;
  	}
! 	# buiild authorised value list
  	$sth2->finish;
  	$sth2 = $dbh->prepare("select distinct category from authorised_values");
--- 95,99 ----
  		push @kohafields, "items.".$field;
  	}
! 	# build authorised value list
  	$sth2->finish;
  	$sth2 = $dbh->prepare("select distinct category from authorised_values");
***************
*** 105,111 ****
  		push @authorised_values, $category;
  	}
! 	$template->param(action => "Edit subfields",
! 							tagfield => "<input type=hidden name=tagfield value='$tagfield'>$tagfield",
! 							);
  	my @loop_data = ();
  	my $toggle="white";
--- 104,130 ----
  		push @authorised_values, $category;
  	}
! 	# build thesaurus categories list
! 	$sth2->finish;
! 	$sth2 = $dbh->prepare("select distinct category from bibliothesaurus");
! 	$sth2->execute;
! 	my @thesaurus_category;
! 	push @thesaurus_category,"";
! 	while ((my $category) = $sth2->fetchrow_array) {
! 		push @thesaurus_category, $category;
! 	}
! 	# build value_builder list
! 	my @value_builder=('');
! 	opendir(DIR, "../value_builder") || die "can't opendir ../value_builder: $!";
! 	while (my $line = readdir(DIR)) {
! 		if ($line =~ /\.pl$/) {
! 			push (@value_builder,$line);
! 		}
! 	}
! 	closedir DIR;
! 
! 	warn "$value_builder[0] § $value_builder[1]";
! 	# build values list
! 	my $sth=$dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where tagfield='$tagfield'"); # and tagsubfield='$tagsubfield'");
! 	$sth->execute;
  	my @loop_data = ();
  	my $toggle="white";
***************
*** 130,135 ****
  					);
  		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type='hidden' name='tagsubfield' value='".$data->{'tagsubfield'}."'>";
! 		$row_data{liblibrarian} = $data->{'liblibrarian'};
! 		$row_data{libopac} = $data->{'libopac'};
  		$row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield",
  					-values=> \@kohafields,
--- 149,154 ----
  					);
  		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type='hidden' name='tagsubfield' value='".$data->{'tagsubfield'}."'>";
! 		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
! 		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
  		$row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield",
  					-values=> \@kohafields,
***************
*** 144,147 ****
--- 163,178 ----
  					-multiple=>0,
  					);
+ 		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
+ 					-values=> \@value_builder,
+ 					-default=>$data->{'thesaurus_category'},
+ 					-size=>1,
+ 					-multiple=>0,
+ 					);
+ 		$row_data{thesaurus_category}  = CGI::scrolling_list(-name=>'thesaurus_category',
+ 					-values=> \@thesaurus_category,
+ 					-default=>$data->{'thesaurus_category'},
+ 					-size=>1,
+ 					-multiple=>0,
+ 					);
  #		$row_data{kohafield} = $data->{'kohafield'};
  		$row_data{repeatable} = CGI::checkbox("repeatable$i",$data->{'repeatable'}?'checked':'',1,'');
***************
*** 151,155 ****
  		$i++;
  	}
! 	# add an empty line for add if needed
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
--- 182,187 ----
  		$i++;
  	}
! 	# add more_subfields empty lines for add if needed
! 	for (my $i=1;$i<=$more_subfields;$i++) {
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
***************
*** 180,189 ****
  					-multiple=>0,
  					);
  		$row_data{bgcolor} = $toggle;
  		push(@loop_data, \%row_data);
  
! 	$template->param(loop => \@loop_data);
! 
! 													# END $OP eq ADD_FORM
  ################## ADD_VALIDATE ##################################
  # called by add_form, used to insert/modify data in DB
--- 212,230 ----
  					-multiple=>0,
  					);
+ 		$row_data{thesaurus_category}  = CGI::scrolling_list(-name=>'thesaurus_category',
+ 					-values=> \@thesaurus_category,
+ 					-size=>1,
+ 					-multiple=>0,
+ 					);
  		$row_data{bgcolor} = $toggle;
  		push(@loop_data, \%row_data);
+ 	}
+ 	$template->param(action => "Edit subfields",
+ 							tagfield => "<input type=hidden name=tagfield value='$tagfield'>$tagfield",
+ 							loop => \@loop_data,
+ 							more_subfields => $more_subfields,
+ 							more_tag => $tagfield);
  
! 												# END $OP eq ADD_FORM
  ################## ADD_VALIDATE ##################################
  # called by add_form, used to insert/modify data in DB
***************
*** 191,196 ****
  	my $dbh = C4::Context->dbh;
  	$template->param(tagfield => "$input->param('tagfield')");
! 	my $sth=$dbh->prepare("replace marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value)
! 									values (?,?,?,?,?,?,?,?,?)");
  	my @tagsubfield	= $input->param('tagsubfield');
  	my @liblibrarian	= $input->param('liblibrarian');
--- 232,237 ----
  	my $dbh = C4::Context->dbh;
  	$template->param(tagfield => "$input->param('tagfield')");
! 	my $sth=$dbh->prepare("replace marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder)
! 									values (?,?,?,?,?,?,?,?,?,?,?)");
  	my @tagsubfield	= $input->param('tagsubfield');
  	my @liblibrarian	= $input->param('liblibrarian');
***************
*** 199,202 ****
--- 240,245 ----
  	my @tab				= $input->param('tab');
  	my @authorised_values	= $input->param('authorised_value');
+ 	my @thesaurus_category	= $input->param('thesaurus_category');
+ 	my @value_builder	=$input->param('value_builder');
  	for (my $i=0; $i<= $#tagsubfield ; $i++) {
  		my $tagfield			=$input->param('tagfield');
***************
*** 209,212 ****
--- 252,257 ----
  		my $tab				=$tab[$i];
  		my $authorised_value		=$authorised_values[$i];
+ 		my $thesaurus_category		=$thesaurus_category[$i];
+ 		my $value_builder=$value_builder[$i];
  		if ($tagsubfield) {
  			$sth->execute ($tagfield,
***************
*** 218,222 ****
  								$kohafield,
  								$tab,
! 								$authorised_value);
  		}
  	}
--- 263,269 ----
  								$kohafield,
  								$tab,
! 								$authorised_value,
! 								$thesaurus_category,
! 								$value_builder);
  		}
  	}
***************
*** 273,276 ****
--- 320,325 ----
  		$row_data{tab} = $results->[$i]{'tab'};
  		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
+ 		$row_data{thesaurus_category}	= $results->[$i]{'thesaurus_category'};
+ 		$row_data{value_builder}	= $results->[$i]{'value_builder'};
  		$row_data{delete} = "$script_name?op=delete_confirm&tagfield=$tagfield&tagsubfield=".$results->[$i]{'tagsubfield'};
  		$row_data{bgcolor} = $toggle;

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** marctagstructure.pl	7 Oct 2002 11:31:41 -0000	1.6
--- marctagstructure.pl	12 Nov 2002 16:43:16 -0000	1.7
***************
*** 33,37 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
! 	my $query="Select tagfield,liblibrarian,libopac,repeatable,mandatory from marc_tag_structure where (tagfield like \"$data[0]%\") order by tagfield";
  	my $sth=$dbh->prepare($query);
  	$sth->execute;
--- 33,37 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
! 	my $query="Select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where (tagfield like \"$data[0]%\") order by tagfield";
  	my $sth=$dbh->prepare($query);
  	$sth->execute;
***************
*** 50,57 ****
  my $searchfield=$input->param('searchfield');
  my $pkfield="tagfield";
! my $reqsel="select tagfield,liblibrarian,libopac,repeatable,mandatory from marc_tag_structure where $pkfield='$searchfield'";
  my $offset=$input->param('offset');
  my $script_name="/cgi-bin/koha/admin/marctagstructure.pl";
  
  my $template = gettemplate("parameters/marctagstructure.tmpl",0);
  my $pagesize=20;
--- 50,59 ----
  my $searchfield=$input->param('searchfield');
  my $pkfield="tagfield";
! my $reqsel="select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where $pkfield='$searchfield'";
  my $offset=$input->param('offset');
  my $script_name="/cgi-bin/koha/admin/marctagstructure.pl";
  
+ my $dbh = C4::Context->dbh;
+ 
  my $template = gettemplate("parameters/marctagstructure.tmpl",0);
  my $pagesize=20;
***************
*** 73,82 ****
  	my $data;
  	if ($searchfield) {
! 		my $dbh = C4::Context->dbh;
! 		my $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory from marc_tag_structure where $pkfield='$searchfield'");
  		$sth->execute;
  		$data=$sth->fetchrow_hashref;
  		$sth->finish;
  	}
  	if ($searchfield) {
  		$template->param(action => "Modify tag",
--- 75,97 ----
  	my $data;
  	if ($searchfield) {
! 		my $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where $pkfield='$searchfield'");
  		$sth->execute;
  		$data=$sth->fetchrow_hashref;
  		$sth->finish;
  	}
+ 	my $sth = $dbh->prepare("select distinct category from authorised_values");
+ 	$sth->execute;
+ 	my @authorised_values;
+ 	push @authorised_values,"";
+ 	while ((my $category) = $sth->fetchrow_array) {
+ 		push @authorised_values, $category;
+ 	}
+ 	my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
+ 			-values=> \@authorised_values,
+ 			-size=>1,
+ 			-multiple=>0,
+ 			-default => $data->{'authorised_value'},
+ 			);
+ 
  	if ($searchfield) {
  		$template->param(action => "Modify tag",
***************
*** 90,93 ****
--- 105,109 ----
  							repeatable => CGI::checkbox('repeatable',$data->{'repeatable'}?'checked':'',1,''),
  							mandatory => CGI::checkbox('mandatory',$data->{'mandatory'}?'checked':'',1,''),
+ 							authorised_value => $authorised_value,
  							);
  													# END $OP eq ADD_FORM
***************
*** 96,100 ****
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	my $sth=$dbh->prepare("replace marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory) values (?,?,?,?,?)");
  	my $tagfield       =$input->param('tagfield');
  	my $liblibrarian  = $input->param('liblibrarian');
--- 112,116 ----
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	my $sth=$dbh->prepare("replace marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value) values (?,?,?,?,?,?)");
  	my $tagfield       =$input->param('tagfield');
  	my $liblibrarian  = $input->param('liblibrarian');
***************
*** 102,105 ****
--- 118,122 ----
  	my $repeatable =$input->param('repeatable');
  	my $mandatory =$input->param('mandatory');
+ 	my $authorised_value =$input->param('authorised_value');
  	$sth->execute($tagfield,
  						$liblibrarian,
***************
*** 107,112 ****
--- 124,132 ----
  						$repeatable?1:0,
  						$mandatory?1:0,
+ 						$authorised_value
  						);
  	$sth->finish;
+ 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marctagstructure.pl\"></html>";
+ 	exit;
  													# END $OP eq ADD_VALIDATE
  ################## DELETE_CONFIRM ##################################
***************
*** 149,152 ****
--- 169,173 ----
  		$row_data{repeatable} = $results->[$i]{'repeatable'};
  		$row_data{mandatory} = $results->[$i]{'mandatory'};
+ 		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
  		$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'};
  		$row_data{edit} = "$script_name?op=add_form&searchfield=".$results->[$i]{'tagfield'};

Index: thesaurus.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/thesaurus.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** thesaurus.pl	26 Oct 2002 17:57:18 -0000	1.1
--- thesaurus.pl	12 Nov 2002 16:43:16 -0000	1.2
***************
*** 25,55 ****
  use HTML::Template;
  use C4::Context;
! 
! 
! sub StringSearch  {
! 	my ($env,$category,$toponly,$branch,$searchstring,$type)=@_;
! 	my $dbh = C4::Context->dbh;
! 	$searchstring=~ s/\'/\\\'/g;
! 	my $query="Select distinct stdlib,id,hierarchy,level from bibliothesaurus where (category like \"$category%\")";
! 	$query .= " and hierarchy='$branch'" if ($branch && $toponly);
! 	$query .= " and hierarchy like \"$branch%\"" if ($branch && !$toponly);
! 	$query .= " and hierarchy=''" if (!$branch & $toponly);
! 	$query .= " and stdlib like \"$searchstring%\"" if ($searchstring);
! 	$query .= " order by category,stdlib";
! 	my $sth=$dbh->prepare($query);
! 	$sth->execute;
! 	my @results;
! 	my $cnt=0;
! 	my $old_stdlib="";
! 	while (my $data=$sth->fetchrow_hashref){
! 	if ($old_stdlib ne $data->{'stdlib'}) {
! 		$cnt ++;
! 		push(@results,$data);
! 	}
! 	$old_stdlib = $data->{'stdlib'};
! 	}
! 	$sth->finish;
! 	return ($cnt,\@results);
! }
  
  my $input = new CGI;
--- 25,29 ----
  use HTML::Template;
  use C4::Context;
! use C4::Authorities;
  
  my $input = new CGI;
***************
*** 60,68 ****
  $searchstring=~ s/\,//g;
  my $id = $input->param('id');
  my $reqsel="select category,stdlib,freelib from authorised_values where id='$id'";
  my $reqdel="delete from authorised_values where id='$id'";
- my $offset=$input->param('offset');
  my $script_name="/cgi-bin/koha/admin/thesaurus.pl";
  my $dbh = C4::Context->dbh;
  
  my $template = gettemplate("parameters/thesaurus.tmpl",0);
--- 34,46 ----
  $searchstring=~ s/\,//g;
  my $id = $input->param('id');
+ my $offset=$input->param('offset');
+ my $father=$input->param('father');
+ 
  my $reqsel="select category,stdlib,freelib from authorised_values where id='$id'";
  my $reqdel="delete from authorised_values where id='$id'";
  my $script_name="/cgi-bin/koha/admin/thesaurus.pl";
  my $dbh = C4::Context->dbh;
+ my $authoritysep = C4::Context->preference("authoritysep");
+ warn "authority : $authoritysep";
  
  my $template = gettemplate("parameters/thesaurus.tmpl",0);
***************
*** 82,85 ****
--- 60,64 ----
  	my $data;
  	if ($id) {
+ 		warn "id => $id";
  		my $dbh = C4::Context->dbh;
  		my $sth=$dbh->prepare("select id,category,freelib,stdlib from bibliothesaurus where id='$id'");
***************
*** 99,103 ****
  							stdlib => $data->{'stdlib'},
  							freelib => $data->{'freelib'},
! 							id => $data->{'id'}
  							);
  	if ($data->{'category'}) {
--- 78,88 ----
  							stdlib => $data->{'stdlib'},
  							freelib => $data->{'freelib'},
! 							id => $data->{'id'},
! 							branch => $branch,
! 							toponly => $toponly,
! 							search_category => $search_category,
! 							searchstring => $searchstring,
! 							offset => $offset,
! 							father => $father,
  							);
  	if ($data->{'category'}) {
***************
*** 110,117 ****
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	my $sth=$dbh->prepare("replace bibliothesaurus (id,category,stdlib,freelib) values (?,?,?,?)");
! 	$sth->execute($input->param('id'), $input->param('category'), $input->param('stdlib'), $input->param('freelib'));
  	$sth->finish;
! 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?search_category=".$input->param('category')."\"></html>";
  	exit;
  ################## DELETE_CONFIRM ##################################
--- 95,102 ----
  } elsif ($op eq 'add_validate') {
  	my $dbh = C4::Context->dbh;
! 	my $sth=$dbh->prepare("replace bibliothesaurus (id,category,stdlib,freelib,father,hierarchy) values (?,?,?,?,?)");
! 	$sth->execute($input->param('id'), $input->param('category'), $input->param('stdlib'), $input->param('freelib'),$father);
  	$sth->finish;
! 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?branch=$branch&toponly=$toponly&search_category=$search_category&searchstring=$searchstring&offset=$offset\"></html>";
  	exit;
  ################## DELETE_CONFIRM ##################################
***************
*** 150,154 ****
  	my $tab_list = CGI::scrolling_list(-name=>'search_category',
  			-values=> \@category_list,
! 			-default=>"",
  			-size=>1,
  			-multiple=>0,
--- 135,139 ----
  	my $tab_list = CGI::scrolling_list(-name=>'search_category',
  			-values=> \@category_list,
! 			-default=>"$search_category",
  			-size=>1,
  			-multiple=>0,
***************
*** 161,165 ****
  	$sth->execute($id);
  	my ($stdlib,$category) = $sth->fetchrow_array;
- 	warn "ID : $id / $stdlib / $category";
  	$sth->finish;
  	$sth= $dbh->prepare("select id,freelib from bibliothesaurus where stdlib=?");
--- 146,149 ----
***************
*** 199,203 ****
  	my $tab_list = CGI::scrolling_list(-name=>'search_category',
  			-values=> \@category_list,
! 			-default=>"",
  			-size=>1,
  			-multiple=>0,
--- 183,187 ----
  	my $tab_list = CGI::scrolling_list(-name=>'search_category',
  			-values=> \@category_list,
! 			-default=>"$search_category",
  			-size=>1,
  			-multiple=>0,
***************
*** 207,211 ****
  	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$search_category,$toponly,$branch,$searchstring,'web');
  	my $toggle="white";
  	my @loop_data = ();
--- 191,195 ----
  	}
  	my $env;
! 	my ($count,$results)=searchauthority($env,$search_category,$toponly,$branch,$searchstring);
  	my $toggle="white";
  	my @loop_data = ();
***************
*** 221,236 ****
  		$row_data{stdlib} = ("&nbsp;&nbsp;&nbsp;&nbsp;" x $results->[$i]{'level'}).$results->[$i]{'stdlib'};
  		$row_data{stdlib} = $results->[$i]{'stdlib'};
! 		$row_data{dig} ="<a href=thesaurus.pl?branch=$results->[$i]{'hierarchy'}".($results->[$i]{'hierarchy'}?"|":"")."$results->[$i]{'id'}&toponly=$toponly>";
! 		$row_data{related} ="<a href=thesaurus.pl?id=$results->[$i]{'id'}&op=detail_form>";
! 		$row_data{edit} = "$script_name?op=add_form&id=".$results->[$i]{'id'};
  		$row_data{delete} = "$script_name?op=delete_confirm&search_category=$search_category&id=".$results->[$i]{'id'};
  		push(@loop_data, \%row_data);
  	}
! 	# rebuild coplete hierarchy
  	my  $sth = $dbh->prepare("select stdlib from bibliothesaurus where id=?");
  	my @hierarchy = split(/\|/,$branch);
  	my @hierarchy_loop;
- 	warn "total : $#hierarchy";
  	my $x;
  	for (my $xi=0;$xi<=$#hierarchy;$xi++) {
  		my %link;
--- 205,220 ----
  		$row_data{stdlib} = ("&nbsp;&nbsp;&nbsp;&nbsp;" x $results->[$i]{'level'}).$results->[$i]{'stdlib'};
  		$row_data{stdlib} = $results->[$i]{'stdlib'};
! 		$row_data{dig} ="<a href=thesaurus.pl?branch=$results->[$i]{'hierarchy'}".($results->[$i]{'hierarchy'}?"|":"")."$results->[$i]{'id'}&toponly=$toponly&search_category=$search_category>";
! 		$row_data{related} ="<a href=thesaurus.pl?id=$results->[$i]{'id'}&search_category=$search_category&op=detail_form>";
! 		$row_data{edit} = "$script_name?op=add_form&branch=$branch&toponly=$toponly&search_category=$search_category&searchstring=$searchstring&offset=$offset&id=".$results->[$i]{'id'};
  		$row_data{delete} = "$script_name?op=delete_confirm&search_category=$search_category&id=".$results->[$i]{'id'};
  		push(@loop_data, \%row_data);
  	}
! 	# rebuild complete hierarchy
  	my  $sth = $dbh->prepare("select stdlib from bibliothesaurus where id=?");
  	my @hierarchy = split(/\|/,$branch);
  	my @hierarchy_loop;
  	my $x;
+ 	my $father;
  	for (my $xi=0;$xi<=$#hierarchy;$xi++) {
  		my %link;
***************
*** 242,245 ****
--- 226,230 ----
  		push (@hierarchy_loop, \%link);
  		$x.='|';
+ 		$father = $t." $authoritysep ";
  	}
  	$template->param(loop => \@loop_data,
***************
*** 248,259 ****
  							toponly => $toponly,
  							searchstring => $searchstring,
! 							hierarchy_loop => \@hierarchy_loop);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
! 		$template->param(previous => "<a href=$script_name?branch=$branch&toponly=$toponly&category=$search_category&searchstring=$searchstring&offset=$prevpage>&lt;&lt; Prev</a>");
  	}
  	if ($offset+$pagesize<$count) {
  		my $nextpage =$offset+$pagesize;
! 		$template->param(next => "<a href=$script_name?branch=$branch&toponly=$toponly&category=$search_category&searchstring=$searchstring&offset=$nextpage>Next &gt;&gt;</a>");
  	}
  } #---- END $OP eq DEFAULT
--- 233,246 ----
  							toponly => $toponly,
  							searchstring => $searchstring,
! 							hierarchy_loop => \@hierarchy_loop,
! 							branch => $branch,
! 							father => $father);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
! 		$template->param(previous => "<a href=$script_name?branch=$branch&toponly=$toponly&search_category=$search_category&searchstring=$searchstring&offset=$prevpage>&lt;&lt; Prev</a>");
  	}
  	if ($offset+$pagesize<$count) {
  		my $nextpage =$offset+$pagesize;
! 		$template->param(next => "<a href=$script_name?branch=$branch&toponly=$toponly&search_category=$search_category&searchstring=$searchstring&offset=$nextpage>Next &gt;&gt;</a>");
  	}
  } #---- END $OP eq DEFAULT





More information about the Koha-cvs mailing list