#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
+#use warnings; FIXME - Bug 2505
use C4::Output;
use C4::Auth;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Context;
+use Koha::Authority::Types;
-sub StringSearch {
+use List::MoreUtils qw( uniq );
+
+sub string_search {
my ( $searchstring, $frameworkcode ) = @_;
my $dbh = C4::Context->dbh;
$searchstring =~ s/\'/\\\'/g;
$u++;
}
$sth->finish;
- $dbh->disconnect;
return ( $cnt, \@results );
}
+sub marc_subfield_structure_exists {
+ my ($tagfield, $tagsubfield, $frameworkcode) = @_;
+ my $dbh = C4::Context->dbh;
+ my $sql = "select tagfield from marc_subfield_structure where tagfield = ? and tagsubfield = ? and frameworkcode = ?";
+ my $rows = $dbh->selectall_arrayref($sql, {}, $tagfield, $tagsubfield, $frameworkcode);
+ return @$rows > 0;
+}
+
my $input = new CGI;
my $tagfield = $input->param('tagfield');
my $tagsubfield = $input->param('tagsubfield');
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
- template_name => "admin/marc_subfields_structure.tmpl",
+ template_name => "admin/marc_subfields_structure.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { parameters => 1 },
+ flagsrequired => { parameters => 'parameters_remaining_permissions' },
debug => 1,
}
);
-my $pagesize = 30;
+my $cache = Koha::Cache->get_instance();
+
my $op = $input->param('op');
$tagfield =~ s/\,//g;
push( @authorised_values, "cn_source" );
# build thesaurus categories list
- $sth2->finish;
- $sth2 = $dbh->prepare("select authtypecode from auth_types");
- $sth2->execute;
- my @authtypes;
- push @authtypes, "";
- while ( ( my $authtypecode ) = $sth2->fetchrow_array ) {
- push @authtypes, $authtypecode;
- }
+ my @authtypes = uniq( "", map { $_->authtypecode } Koha::Authority::Types->search );
# build value_builder list
my @value_builder = ('');
# 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";
+ my $cgidir = C4::Context->config('intranetdir') . "/cgi-bin";
unless ( opendir( DIR, "$cgidir/cataloguing/value_builder" ) ) {
- $cgidir = C4::Context->intranetdir;
+ $cgidir = C4::Context->config('intranetdir');
opendir( DIR, "$cgidir/cataloguing/value_builder" )
|| die "can't opendir $cgidir/value_builder: $!";
}
while ( my $line = readdir(DIR) ) {
- if ( $line =~ /\.pl$/ ) {
+ if ( $line =~ /\.pl$/ &&
+ $line !~ /EXAMPLE\.pl$/ ) { # documentation purposes
push( @value_builder, $line );
}
}
); # and tagsubfield='$tagsubfield'");
$sth->execute( $tagfield, $frameworkcode );
my @loop_data = ();
- 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 1 ) {
- $toggle = 0;
- }
- else {
- $toggle = 1;
- }
$row_data{defaultvalue} = $data->{defaultvalue};
- $row_data{tab} = CGI::scrolling_list(
- -name => 'tab',
- -id => "tab$i",
- -values =>
- [ '-1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ],
- -labels => {
- '-1' => 'ignore',
- '0' => '0',
- '1' => '1',
- '2' => '2',
- '3' => '3',
- '4' => '4',
- '5' => '5',
- '6' => '6',
- '7' => '7',
- '8' => '8',
- '9' => '9',
- '10' => 'items (10)',
- },
- -default => $data->{'tab'},
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
+ $row_data{maxlength} = $data->{maxlength};
+ $row_data{tab} = {
+ id => "tab$i",
+ default => $data->{'tab'},
+ };
+
$row_data{tagsubfield} =
$data->{'tagsubfield'}
. "<input type=\"hidden\" name=\"tagsubfield\" value=\""
$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",
- -id => "kohafield$i",
- -values => \@kohafields,
- -default => "$data->{'kohafield'}",
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
- $row_data{authorised_value} = CGI::scrolling_list(
- -name => 'authorised_value',
- -id => 'authorised_value',
- -values => \@authorised_values,
- -default => $data->{'authorised_value'},
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
- $row_data{value_builder} = CGI::scrolling_list(
- -name => 'value_builder',
- -id => 'value_builder',
- -values => \@value_builder,
- -default => $data->{'value_builder'},
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
- $row_data{authtypes} = CGI::scrolling_list(
- -name => 'authtypecode',
- -id => 'authtypecode',
- -values => \@authtypes,
- -default => $data->{'authtypecode'},
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
+ $row_data{kohafield} = {
+ id => "kohafield$i",
+ values => \@kohafields,
+ default => "$data->{'kohafield'}",
+ };
+ $row_data{authorised_value} = {
+ id => "authorised_value$i",
+ values => \@authorised_values,
+ default => $data->{'authorised_value'},
+ };
+ $row_data{value_builder} = {
+ id => "value_builder$i",
+ values => \@value_builder,
+ default => $data->{'value_builder'},
+ };
+ $row_data{authtypes} = {
+ id => "authtypecode$i",
+ values => \@authtypes,
+ default => $data->{'authtypecode'},
+ };
$row_data{repeatable} = CGI::checkbox(
-name => "repeatable$i",
-checked => $data->{'repeatable'} ? 'checked' : '',
-value => 1,
- -tabindex => '',
-label => '',
-id => "repeatable$i"
);
-name => "mandatory$i",
-checked => $data->{'mandatory'} ? 'checked' : '',
-value => 1,
- -tabindex => '',
-label => '',
-id => "mandatory$i"
);
-id => "isurl$i",
-checked => $data->{'isurl'} ? 'checked' : '',
-value => 1,
- -tabindex => '',
-label => ''
);
$row_data{row} = $i;
- $row_data{toggle} = $toggle;
$row_data{link} = CGI::escapeHTML( $data->{'link'} );
push( @loop_data, \%row_data );
$i++;
}
# add more_subfields empty lines for add if needed
- for ( my $j = 1 ; $j <= 1 ; $j++ ) {
my %row_data; # get a fresh hash for the row data
$row_data{'new_subfield'} = 1;
$row_data{'subfieldcode'} = '';
+ $row_data{'maxlength'} = 9999;
- $row_data{tab} = CGI::scrolling_list(
- -name => 'tab',
- -id => "tab$j",
- -values =>
- [ '-1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ],
- -labels => {
- '-1' => 'ignore',
- '0' => '0',
- '1' => '1',
- '2' => '2',
- '3' => '3',
- '4' => '4',
- '5' => '5',
- '6' => '6',
- '7' => '7',
- '8' => '8',
- '9' => '9',
- '10' => 'items (10)',
- },
- -default => "",
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
+ $row_data{tab} = {
+ id => "tab$i",
+ default => $data->{'tab'},
+ };
$row_data{tagsubfield} =
"<input type=\"text\" name=\"tagsubfield\" value=\""
. $data->{'tagsubfield'}
$row_data{liblibrarian} = "";
$row_data{libopac} = "";
$row_data{seealso} = "";
- $row_data{kohafield} = CGI::scrolling_list(
- -name => 'kohafield',
- -id => "kohafield$j",
- -values => \@kohafields,
- -default => "",
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
+ $row_data{kohafield} = {
+ id => "kohafield$i",
+ values => \@kohafields,
+ default => "$data->{'kohafield'}",
+ };
$row_data{hidden} = "";
$row_data{repeatable} = CGI::checkbox(
- -name => "repeatable$j",
- -id => "repeatable$j",
+ -name => "repeatable$i",
+ -id => "repeatable$i",
-checked => '',
-value => 1,
- -tabindex => '',
-label => ''
);
$row_data{mandatory} = CGI::checkbox(
- -name => "mandatory$j",
- -id => "mandatory$j",
+ -name => "mandatory$i",
+ -id => "mandatory$i",
-checked => '',
-value => 1,
- -tabindex => '',
-label => ''
);
$row_data{isurl} = CGI::checkbox(
- -name => "isurl$j",
- -id => "isurl$j",
+ -name => "isurl$i",
+ -id => "isurl$i",
-checked => '',
-value => 1,
- -tabindex => '',
-label => ''
);
- $row_data{value_builder} = CGI::scrolling_list(
- -name => 'value_builder',
- -id => 'value_builder',
- -values => \@value_builder,
- -default => $data->{'value_builder'},
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
- $row_data{authorised_value} = CGI::scrolling_list(
- -name => 'authorised_value',
- -id => 'authorised_value',
- -values => \@authorised_values,
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
- $row_data{authtypes} = CGI::scrolling_list(
- -name => 'authtypecode',
- -id => 'authtypecode',
- -values => \@authtypes,
- -size => 1,
- -tabindex => '',
- -multiple => 0,
- );
+ $row_data{value_builder} = {
+ id => "value_builder$i",
+ values => \@value_builder,
+ default => $data->{'value_builder'},
+ };
+ $row_data{authorised_value} = {
+ id => "authorised_value$i",
+ values => \@authorised_values,
+ default => $data->{'authorised_value'},
+ };
+ $row_data{authtypes} = {
+ id => "authtypecode$i",
+ values => \@authtypes,
+ default => $data->{'authtypecode'},
+ };
$row_data{link} = CGI::escapeHTML( $data->{'link'} );
- $row_data{toggle} = $toggle;
- $row_data{row} = $j;
+ $row_data{row} = $i;
push( @loop_data, \%row_data );
- use Data::Dumper;
- }
- $template->param( 'use-heading-flags-p' => 1 );
- $template->param( 'heading-edit-subfields-p' => 1 );
+
+ $template->param( 'use_heading_flags_p' => 1 );
+ $template->param( 'heading_edit_subfields_p' => 1 );
$template->param(
action => "Edit subfields",
tagfield => $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,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link,defaultvalue)
- 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,defaultvalue)
+# values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
+# );
+ my $sth_insert = $dbh->prepare(qq{
+ insert into marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link,defaultvalue,maxlength)
+ values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ });
+ my $sth_update = $dbh->prepare(qq{
+ update marc_subfield_structure set tagfield=?, tagsubfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, kohafield=?, tab=?, seealso=?, authorised_value=?, authtypecode=?, value_builder=?, hidden=?, isurl=?, frameworkcode=?, link=?, defaultvalue=?, maxlength=?
+ where tagfield=? and tagsubfield=? and frameworkcode=?
+ });
my @tagsubfield = $input->param('tagsubfield');
my @liblibrarian = $input->param('liblibrarian');
my @libopac = $input->param('libopac');
my @value_builder = $input->param('value_builder');
my @link = $input->param('link');
my @defaultvalue = $input->param('defaultvalue');
+ my @maxlength = $input->param('maxlength');
for ( my $i = 0 ; $i <= $#tagsubfield ; $i++ ) {
my $tagfield = $input->param('tagfield');
my $isurl = $input->param("isurl$i") ? 1 : 0;
my $link = $link[$i];
my $defaultvalue = $defaultvalue[$i];
+ my $maxlength = $maxlength[$i] ? $maxlength[$i] : 9999;
- if ($liblibrarian) {
+ if (defined($liblibrarian) && $liblibrarian ne "") {
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,
- $defaultvalue,
- );
+ if (marc_subfield_structure_exists($tagfield, $tagsubfield, $frameworkcode)) {
+ $sth_update->execute(
+ $tagfield,
+ $tagsubfield,
+ $liblibrarian,
+ $libopac,
+ $repeatable,
+ $mandatory,
+ $kohafield,
+ $tab,
+ $seealso,
+ $authorised_value,
+ $authtypecode,
+ $value_builder,
+ $hidden,
+ $isurl,
+ $frameworkcode,
+ $link,
+ $defaultvalue,
+ $maxlength,
+ (
+ $tagfield,
+ $tagsubfield,
+ $frameworkcode,
+ ),
+ );
+ } else {
+ $sth_insert->execute(
+ $tagfield,
+ $tagsubfield,
+ $liblibrarian,
+ $libopac,
+ $repeatable,
+ $mandatory,
+ $kohafield,
+ $tab,
+ $seealso,
+ $authorised_value,
+ $authtypecode,
+ $value_builder,
+ $hidden,
+ $isurl,
+ $frameworkcode,
+ $link,
+ $defaultvalue,
+ $maxlength,
+ );
+ }
}
}
}
- $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>";
+ $sth_insert->finish;
+ $sth_update->finish;
+ $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
+ $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
+
+ print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode");
exit;
# END $OP eq ADD_VALIDATE
$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>";
+ $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
+ $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
+ print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode");
exit;
- $template->param( tagfield => $tagfield );
# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
}
else { # DEFAULT
- my ( $count, $results ) = StringSearch( $tagfield, $frameworkcode );
- my $toggle = 1;
+ my ( $count, $results ) = string_search( $tagfield, $frameworkcode );
my @loop_data = ();
- for (
- my $i = $offset ;
- $i < ( $offset + $pagesize < $count ? $offset + $pagesize : $count ) ;
- $i++
- )
- {
- if ( $toggle eq 1 ) {
- $toggle = 0;
- }
- else {
- $toggle = 1;
- }
+ for ( my $i = 0; $i < $count; $i++ ) {
my %row_data; # get a fresh hash for the row data
$row_data{tagfield} = $results->[$i]{'tagfield'};
$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
$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;
edit_frameworkcode => $frameworkcode
);
- if ( $offset > 0 ) {
- my $prevpage = $offset - $pagesize;
- $template->param(
- prev => "<a href=\"$script_name?offset=$prevpage\&tagfield=$tagfield\&frameworkcode=$frameworkcode \">" );
- }
- if ( $offset + $pagesize < $count ) {
- my $nextpage = $offset + $pagesize;
- $template->param(
- next => "<a href=\"$script_name?offset=$nextpage\&tagfield=$tagfield\&frameworkcode=$frameworkcode \">" );
- }
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;
projects / koha.git / blobdiff