use HTML::Template;
sub StringSearch {
- my ($env,$searchstring,$type)=@_;
+ my ($env,$searchstring,$frameworkcode)=@_;
my $dbh = C4::Context->dbh;
$searchstring=~ s/\'/\\\'/g;
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;
+ my $sth=$dbh->prepare("Select * from marc_subfield_structure where (tagfield like ? and frameworkcode=?) order by tagfield");
+ $sth->execute("$searchstring%",$frameworkcode);
my @results;
my $cnt=0;
+ my $u=1;
while (my $data=$sth->fetchrow_hashref){
- push(@results,$data);
- $cnt ++;
+ push(@results,$data);
+ $cnt ++;
+ $u++;
}
- # $sth->execute;
$sth->finish;
$dbh->disconnect;
return ($cnt,\@results);
my $input = new CGI;
my $tagfield=$input->param('tagfield');
my $tagsubfield=$input->param('tagsubfield');
+my $frameworkcode=$input->param('frameworkcode');
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' and tagsubfield='$tagsubfield'";
-my $reqdel="delete from marc_subfield_structure where tagfield='$tagfield' and tagsubfield='$tagsubfield'";
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/marc_subfields_structure.pl";
if ($op) {
$template->param(script_name => $script_name,
tagfield =>$tagfield,
+ frameworkcode => $frameworkcode,
$op => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
tagfield =>$tagfield,
+ frameworkcode => $frameworkcode,
else => 1); # we show only the TMPL_VAR names $op
}
my $sth2=$dbh->prepare("SHOW COLUMNS from biblioitems");
$sth2->execute;
while ((my $field) = $sth2->fetchrow_array) {
+ if ($field eq 'notes') { $field = 'bnotes'; }
push @kohafields, "biblioitems.".$field;
}
my $sth2=$dbh->prepare("SHOW COLUMNS from items");
push (@authorised_values,"itemtypes");
# build thesaurus categories list
$sth2->finish;
- $sth2 = $dbh->prepare("select distinct category from bibliothesaurus");
+ $sth2 = $dbh->prepare("select authtypecode from auth_types");
$sth2->execute;
- my @thesaurus_category;
- push @thesaurus_category,"";
- while ((my $category) = $sth2->fetchrow_array) {
- push @thesaurus_category, $category;
+ my @authtypes;
+ push @authtypes,"";
+ while ((my $authtypecode) = $sth2->fetchrow_array) {
+ push @authtypes, $authtypecode;
}
# build value_builder list
my @value_builder=('');
- opendir(DIR, "../value_builder") || die "can't opendir ../value_builder: $!";
+
+ # read value_builder directory.
+ # 2 cases here : on CVS install, $cgidir does not need a /cgi-bin
+ # on a standard install, /cgi-bin need to be added.
+ # test one, then the other
+ my $cgidir = C4::Context->intranetdir ."/cgi-bin";
+ unless (opendir(DIR, "$cgidir/value_builder")) {
+ $cgidir = C4::Context->intranetdir;
+ opendir(DIR, "$cgidir/value_builder") || die "can't opendir $cgidir/value_builder: $!";
+ }
while (my $line = readdir(DIR)) {
if ($line =~ /\.pl$/) {
push (@value_builder,$line);
closedir DIR;
# 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 $sth=$dbh->prepare("select * from marc_subfield_structure where tagfield=? and frameworkcode=?"); # and tagsubfield='$tagsubfield'");
+ $sth->execute($tagfield,$frameworkcode);
my @loop_data = ();
- my $toggle="white";
+ my $toggle=1;
my $i=0;
while ($data =$sth->fetchrow_hashref) {
my %row_data; # get a fresh hash for the row data
- if ($toggle eq 'white'){
- $toggle="#ffffcc";
+ if ($toggle eq 1){
+ $toggle=0;
} else {
- $toggle="white";
+ $toggle=1;
}
$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-values=>['-1','0','1','2','3','4','5','6','7','8','9','10'],
$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{seealso} = CGI::escapeHTML($data->{'seealso'});
$row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield",
-values=> \@kohafields,
-default=> "$data->{'kohafield'}",
-size=>1,
-multiple=>0,
);
- $row_data{thesaurus_category} = CGI::scrolling_list(-name=>'thesaurus_category',
- -values=> \@thesaurus_category,
- -default=>$data->{'thesaurus_category'},
+ $row_data{authtypes} = CGI::scrolling_list(-name=>'authtypecode',
+ -values=> \@authtypes,
+ -default=>$data->{'authtypecode'},
-size=>1,
-multiple=>0,
);
-# $row_data{kohafield} = $data->{'kohafield'};
$row_data{repeatable} = CGI::checkbox("repeatable$i",$data->{'repeatable'}?'checked':'',1,'');
$row_data{mandatory} = CGI::checkbox("mandatory$i",$data->{'mandatory'}?'checked':'',1,'');
+ $row_data{hidden} = CGI::checkbox("hidden$i",$data->{'hidden'}?'checked':'',1,'');
+ $row_data{isurl} = CGI::checkbox("isurl$i",$data->{'isurl'}?'checked':'',1,'');
$row_data{bgcolor} = $toggle;
+ $row_data{link} = CGI::escapeHTML($data->{'link'});
push(@loop_data, \%row_data);
$i++;
}
-size=>1,
-multiple=>0,
);
- $row_data{tagsubfield} = "<input type='text' name='tagsubfield' value='".$data->{'tagsubfield'}."' size=3 maxlength=1>";
+ $row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"3\" maxlength=\"1\">";
$row_data{liblibrarian} = "";
$row_data{libopac} = "";
+ $row_data{seealso} = "";
$row_data{repeatable} = CGI::checkbox('repeatable','',1,'');
$row_data{mandatory} = CGI::checkbox('mandatory','',1,'');
+ $row_data{hidden} = CGI::checkbox('hidden','',1,'');
+ $row_data{isurl} = CGI::checkbox('isurl','',1,'');
$row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield',
-values=> \@kohafields,
-default=> "",
-size=>1,
-multiple=>0,
);
- $row_data{thesaurus_category} = CGI::scrolling_list(-name=>'thesaurus_category',
- -values=> \@thesaurus_category,
+ $row_data{authtypes} = CGI::scrolling_list(-name=>'authtypecode',
+ -values=> \@authtypes,
-size=>1,
-multiple=>0,
);
+ $row_data{link} = CGI::escapeHTML($data->{'link'});
$row_data{bgcolor} = $toggle;
push(@loop_data, \%row_data);
}
+ $template->param('use-heading-flags-p' => 1);
+ $template->param('heading-edit-subfields-p' => 1);
$template->param(action => "Edit subfields",
- tagfield => "<input type=hidden name=tagfield value='$tagfield'>$tagfield",
+ tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
loop => \@loop_data,
more_subfields => $more_subfields,
more_tag => $tagfield);
} elsif ($op eq 'add_validate') {
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 $sth=$dbh->prepare("replace marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link)
+ values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
my @tagsubfield = $input->param('tagsubfield');
my @liblibrarian = $input->param('liblibrarian');
my @libopac = $input->param('libopac');
my @kohafield = $input->param('kohafield');
my @tab = $input->param('tab');
+ my @seealso = $input->param('seealso');
my @authorised_values = $input->param('authorised_value');
- my @thesaurus_category = $input->param('thesaurus_category');
+ my @authtypecodes = $input->param('authtypecode');
my @value_builder =$input->param('value_builder');
+ my @link =$input->param('link');
for (my $i=0; $i<= $#tagsubfield ; $i++) {
my $tagfield =$input->param('tagfield');
my $tagsubfield =$tagsubfield[$i];
my $mandatory =$input->param("mandatory$i")?1:0;
my $kohafield =$kohafield[$i];
my $tab =$tab[$i];
+ my $seealso =$seealso[$i];
my $authorised_value =$authorised_values[$i];
- my $thesaurus_category =$thesaurus_category[$i];
+ my $authtypecode =$authtypecodes[$i];
my $value_builder=$value_builder[$i];
+ my $hidden = $input->param("hidden$i")?1:0;
+ my $isurl = $input->param("isurl$i")?1:0;
+ my $link = $link[$i];
if ($liblibrarian) {
- $sth->execute ($tagfield,
- $tagsubfield,
- $liblibrarian,
- $libopac,
- $repeatable,
- $mandatory,
- $kohafield,
- $tab,
- $authorised_value,
- $thesaurus_category,
- $value_builder);
+ unless (C4::Context->config('demo') eq 1) {
+ $sth->execute ($tagfield,
+ $tagsubfield,
+ $liblibrarian,
+ $libopac,
+ $repeatable,
+ $mandatory,
+ $kohafield,
+ $tab,
+ $seealso,
+ $authorised_value,
+ $authtypecode,
+ $value_builder,
+ $hidden,
+ $isurl,
+ $frameworkcode,
+
+ $link,
+ );
+ }
}
}
$sth->finish;
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marc_subfields_structure.pl?tagfield=$tagfield\"></html>";
+ print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
exit;
# END $OP eq ADD_VALIDATE
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare($reqsel);
- $sth->execute;
+ my $sth=$dbh->prepare("select * from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
+ #FIXME : called with 2 bind variables when 3 are needed
+ $sth->execute($tagfield,$tagsubfield);
my $data=$sth->fetchrow_hashref;
$sth->finish;
$template->param(liblibrarian => $data->{'liblibrarian'},
delete_link => $script_name,
tagfield =>$tagfield,
tagsubfield => $tagsubfield,
+ frameworkcode => $frameworkcode,
);
# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# 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;
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marc_subfields_structure.pl?tagfield=$tagfield\"></html>";
+ unless (C4::Context->config('demo') eq 1) {
+ my $sth=$dbh->prepare("delete from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
+ $sth->execute($tagfield,$tagsubfield,$frameworkcode);
+ $sth->finish;
+ }
+ print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
exit;
$template->param(tagfield => $tagfield);
# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
my $env;
- my ($count,$results)=StringSearch($env,$tagfield,'web');
- my $toggle="white";
+ my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
+ my $toggle=1;
my @loop_data = ();
for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
- if ($toggle eq 'white'){
- $toggle="#ffffcc";
+ if ($toggle eq 1){
+ $toggle=0;
} else {
- $toggle="white";
+ $toggle=1;
}
my %row_data; # get a fresh hash for the row data
$row_data{tagfield} = $results->[$i]{'tagfield'};
$row_data{repeatable} = $results->[$i]{'repeatable'};
$row_data{mandatory} = $results->[$i]{'mandatory'};
$row_data{tab} = $results->[$i]{'tab'};
+ $row_data{seealso} = $results->[$i]{'seealso'};
$row_data{authorised_value} = $results->[$i]{'authorised_value'};
- $row_data{thesaurus_category} = $results->[$i]{'thesaurus_category'};
+ $row_data{authtypecode} = $results->[$i]{'authtypecode'};
$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;
+ $row_data{hidden} = $results->[$i]{'hidden'};
+ $row_data{isurl} = $results->[$i]{'isurl'};
+ $row_data{link} = $results->[$i]{'link'};
+ $row_data{delete} = "$script_name?op=delete_confirm&tagfield=$tagfield&tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
+ $row_data{toggle} = $toggle;
+ if ($row_data{tab} eq -1) {
+ $row_data{subfield_ignored} = 1;
+ }
+
push(@loop_data, \%row_data);
}
$template->param(loop => \@loop_data);
- $template->param(edit => "<a href='$script_name?op=add_form&tagfield=$tagfield'>");
+ $template->param(edit => "<a href=\"$script_name?op=add_form&tagfield=$tagfield&frameworkcode=$frameworkcode\">");
if ($offset>0) {
my $prevpage = $offset-$pagesize;
- $template->param(prev =>"<a href=$script_name?offset=$prevpage>");
+ $template->param(prev =>"<a href=\"$script_name?offset=$prevpage\">");
}
if ($offset+$pagesize<$count) {
my $nextpage =$offset+$pagesize;
- $template->param(next => "<a href=$script_name?offset=$nextpage>");
+ $template->param(next => "<a href=\"$script_name?offset=$nextpage\">");
}
} #---- END $OP eq DEFAULT