X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fmarctagstructure.pl;h=8b2dada530435cddc1ad46a5ae5507291644abd1;hb=c579b9c8f4dbffd0a521198d530d7012eb5d2402;hp=a20f77c13289e0ffcdcb6e416c9b79155ae9dbf5;hpb=574f613a1dfadfcd7c025139e6a63b1b1a0f729c;p=koha.git diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl index a20f77c132..8b2dada530 100755 --- a/admin/marctagstructure.pl +++ b/admin/marctagstructure.pl @@ -5,67 +5,59 @@ # # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . -use strict; -use warnings; -use CGI; +use Modern::Perl; +use CGI qw ( -utf8 ); use C4::Auth; use C4::Koha; use C4::Context; use C4::Output; use C4::Context; +use Koha::Caches; +use Koha::AuthorisedValues; +use Koha::BiblioFrameworks; # retrieve parameters my $input = new CGI; my $frameworkcode = $input->param('frameworkcode') || ''; # set to select framework my $existingframeworkcode = $input->param('existingframeworkcode') || ''; my $searchfield = $input->param('searchfield') || 0; -# set when we have to create a new framework (in frameworkcode) by copying an old one (in existingframeworkcode) -my $frameworkinfo = getframeworkinfo($frameworkcode); $searchfield=~ s/\,//g; my $offset = $input->param('offset') || 0; my $op = $input->param('op') || ''; -my $dspchoice = $input->param('select_display'); +my $dspchoice = $input->cookie("marctagstructure_selectdisplay") // $input->param('select_display'); my $pagesize = 20; my $script_name = "/cgi-bin/koha/admin/marctagstructure.pl"; my $dbh = C4::Context->dbh; +my $cache = Koha::Caches->get_instance(); # open template my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "admin/marctagstructure.tmpl", + = get_template_and_user({template_name => "admin/marctagstructure.tt", query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => {parameters => 1}, + flagsrequired => {parameters => 'parameters_remaining_permissions'}, debug => 1, }); -# get framework list -my $frameworks = getframeworks(); -my @frameworkloop; -foreach my $thisframeworkcode (keys %$frameworks) { - push @frameworkloop, { - value => $thisframeworkcode, - selected => ($thisframeworkcode eq $frameworkcode) ? 1 : 0, - frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'}, - }; -} +my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); # check that framework is defined in marc_tag_structure my $sth=$dbh->prepare("select count(*) from marc_tag_structure where frameworkcode=?"); @@ -81,12 +73,13 @@ unless ($frameworkexist) { $op = "framework_create"; } } + +my $framework = $frameworks->search({ frameworkcode => $frameworkcode })->next; $template->param( - frameworkloop => \@frameworkloop, - frameworkcode => $frameworkcode, - frameworktext => $frameworkinfo->{frameworktext}, + frameworks => $frameworks, + framework => $framework, script_name => $script_name, - ($op||'else') => 1, + ( $op || 'else' ) => 1, ); @@ -96,48 +89,27 @@ if ($op eq 'add_form') { #---- if primkey exists, it's a modify action, so read values to modify... my $data; if ($searchfield) { - $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where tagfield=? and frameworkcode=?"); + $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?"); $sth->execute($searchfield,$frameworkcode); $data=$sth->fetchrow_hashref; } - 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, - -id=>"authorised_value", - -multiple=>0, - -default => $data->{'authorised_value'}, - ); if ($searchfield) { $template->param(searchfield => $searchfield); $template->param(action => "Modify tag"); - $template->param('heading-modify-tag-p' => 1); + $template->param('heading_modify_tag_p' => 1); } else { $template->param(action => "Add tag"); - $template->param('heading-add-tag-p' => 1); + $template->param('heading_add_tag_p' => 1); } - $template->param('use-heading-flags-p' => 1); + $template->param('use_heading_flags_p' => 1); $template->param(liblibrarian => $data->{'liblibrarian'}, libopac => $data->{'libopac'}, - repeatable => CGI::checkbox(-name=>'repeatable', - -checked=> $data->{'repeatable'}?'checked':'', - -value=> 1, - -label => '', - -id=> 'repeatable'), - mandatory => CGI::checkbox(-name => 'mandatory', - -checked => $data->{'mandatory'}?'checked':'', - -value => 1, - -label => '', - -id => 'mandatory'), - authorised_value => $authorised_value, - frameworkcode => $frameworkcode, + repeatable => $data->{'repeatable'}, + mandatory => $data->{'mandatory'}, + authorised_value => $data->{authorised_value}, + ind1_defaultvalue => $data->{'ind1_defaultvalue'}, + ind2_defaultvalue => $data->{'ind2_defaultvalue'} ); # FIXME: move checkboxes to presentation layer # END $OP eq ADD_FORM ################## ADD_VALIDATE ################################## @@ -149,61 +121,67 @@ if ($op eq 'add_form') { my $repeatable = $input->param('repeatable') ? 1 : 0; my $mandatory = $input->param('mandatory') ? 1 : 0; my $authorised_value = $input->param('authorised_value'); - unless (C4::Context->config('demo') == 1) { - if ($input->param('modif')) { - $sth = $dbh->prepare( - "UPDATE marc_tag_structure SET liblibrarian=? ,libopac=? ,repeatable=? ,mandatory=? ,authorised_value=? WHERE frameworkcode=? AND tagfield=?" - ); - $sth->execute( $liblibrarian, - $libopac, - $repeatable, - $mandatory, - $authorised_value, - $frameworkcode, - $tagfield - ); - } else { - $sth = $dbh->prepare( - "INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) values (?,?,?,?,?,?,?)" - ); - $sth->execute($tagfield, - $liblibrarian, - $libopac, - $repeatable, - $mandatory, - $authorised_value, - $frameworkcode - ); - } - } + my $ind1_defaultvalue = $input->param('ind1_defaultvalue'); + my $ind2_defaultvalue = $input->param('ind2_defaultvalue'); + if ($input->param('modif')) { + $sth = $dbh->prepare( + "UPDATE marc_tag_structure SET liblibrarian=? ,libopac=? ,repeatable=? ,mandatory=? ,authorised_value=?, ind1_defaultvalue=?, ind2_defaultvalue=? WHERE frameworkcode=? AND tagfield=?" + ); + $sth->execute( $liblibrarian, + $libopac, + $repeatable, + $mandatory, + $authorised_value, + $ind1_defaultvalue, + $ind2_defaultvalue, + $frameworkcode, + $tagfield + ); + } else { + $sth = $dbh->prepare( + "INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue,frameworkcode) values (?,?,?,?,?,?,?,?,?)" + ); + $sth->execute($tagfield, + $liblibrarian, + $libopac, + $repeatable, + $mandatory, + $authorised_value, + $ind1_defaultvalue, + $ind2_defaultvalue, + $frameworkcode + ); + } + $cache->clear_from_cache("MarcStructure-0-$frameworkcode"); + $cache->clear_from_cache("MarcStructure-1-$frameworkcode"); + $cache->clear_from_cache("default_value_for_mod_marc-"); + $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode"); print $input->redirect("/cgi-bin/koha/admin/marctagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode"); - exit; + exit; # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { - $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where tagfield=? and frameworkcode=?"); + $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?"); $sth->execute($searchfield, $frameworkcode); my $data = $sth->fetchrow_hashref; $template->param( liblibrarian => $data->{'liblibrarian'}, - searchfield => $searchfield, - frameworkcode => $frameworkcode, + searchfield => $searchfield ); # 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') { - unless (C4::Context->config('demo') == 1) { - my $sth1 = $dbh->prepare("DELETE FROM marc_tag_structure WHERE tagfield=? AND frameworkcode=?"); - my $sth2 = $dbh->prepare("DELETE FROM marc_subfield_structure WHERE tagfield=? AND frameworkcode=?"); - $sth1->execute($searchfield, $frameworkcode); - $sth2->execute($searchfield, $frameworkcode); - } - $template->param( - searchfield => $searchfield, - frameworkcode => $frameworkcode, - ); + my $sth1 = $dbh->prepare("DELETE FROM marc_tag_structure WHERE tagfield=? AND frameworkcode=?"); + my $sth2 = $dbh->prepare("DELETE FROM marc_subfield_structure WHERE tagfield=? AND frameworkcode=?"); + $sth1->execute($searchfield, $frameworkcode); + $sth2->execute($searchfield, $frameworkcode); + $cache->clear_from_cache("MarcStructure-0-$frameworkcode"); + $cache->clear_from_cache("MarcStructure-1-$frameworkcode"); + $cache->clear_from_cache("default_value_for_mod_marc-"); + $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode"); + $template->param( searchfield => $searchfield ); # END $OP eq DELETE_CONFIRMED ################## ITEMTYPE_CREATE ################################## # called automatically if an unexisting frameworkis selected @@ -219,10 +197,8 @@ if ($op eq 'add_form') { }; } } - $template->param(existingframeworkloop => \@existingframeworkloop, - frameworkcode => $frameworkcode, -# FRtext => $frameworkinfo->{frameworktext}, - ); + $template->param( existingframeworkloop => \@existingframeworkloop ); + ################## DEFAULT ################################## } else { # DEFAULT # here, $op can be unset or set to "framework_create_confirm". @@ -241,6 +217,8 @@ if ($op eq 'add_form') { marc_tag_structure.repeatable as mts_repeatable, marc_tag_structure.mandatory as mts_mandatory, marc_tag_structure.authorised_value as mts_authorized_value, + marc_tag_structure.ind1_defaultvalue as mts_ind1_defaultvalue, + marc_tag_structure.ind1_defaultvalue as mts_ind2_defaultvalue, marc_subfield_structure.* FROM marc_tag_structure LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) WHERE (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 ORDER BY marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield"); @@ -262,12 +240,11 @@ if ($op eq 'add_form') { $row_data{repeatable} = $results[$i]->{'mts_repeatable'}; $row_data{mandatory} = $results[$i]->{'mts_mandatory'}; $row_data{authorised_value} = $results[$i]->{'mts_authorised_value'}; - $row_data{subfield_link} = "marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; - $row_data{edit} = "$script_name?op=add_form&searchfield=" .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; - $row_data{delete} = "$script_name?op=delete_confirm&searchfield=" .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; + $row_data{ind1_defaultvalue} = $results[$i]->{'mts_ind1_defaultvalue'}; + $row_data{ind2_defaultvalue} = $results[$i]->{'mts_ind2_defaultvalue'}; $j=$i; my @internal_loop = (); - while ( ( $results[$i]->{'tagfield'} == $results[$j]->{'tagfield'} ) and ( $j < $cnt ) ) { + while ( ( $j < $cnt ) and ( $results[$i]->{'tagfield'} == $results[$j]->{'tagfield'} ) ) { my %subfield_data; $subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'}; $subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'}; @@ -290,6 +267,12 @@ if ($op eq 'add_form') { $template->param(select_display => "True", loop => \@loop_data); } else { + # Hidden feature: If search was field$subfield, redirect to the subfield edit form + my ( $tagfield, $tagsubfield ) = split /\$/, $searchfield; + if ( $tagsubfield ) { + print $input->redirect('/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield='.$tagfield.'&frameworkcode='.$frameworkcode.'#sub'.$tagsubfield.'field'); + exit; + } #here, normal old style : display every tags my ($count,$results)=StringSearch($searchfield,$frameworkcode); $cnt = $count; @@ -301,9 +284,8 @@ if ($op eq 'add_form') { $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'}."&frameworkcode=".$frameworkcode; - $row_data{edit} = "$script_name?op=add_form&searchfield=" .$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; - $row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; + $row_data{ind1_defaultvalue} = $results->[$i]{'ind1_defaultvalue'}; + $row_data{ind2_defaultvalue} = $results->[$i]{'ind2_defaultvalue'}; push(@loop_data, \%row_data); } $template->param(loop => \@loop_data); @@ -312,15 +294,13 @@ if ($op eq 'add_form') { $template->param(isprevpage => $offset, prevpage=> $offset-$pagesize, searchfield => $searchfield, - script_name => $script_name, - frameworkcode => $frameworkcode, + script_name => $script_name ); } if ($offset+$pagesize<$cnt) { $template->param(nextpage =>$offset+$pagesize, searchfield => $searchfield, - script_name => $script_name, - frameworkcode => $frameworkcode, + script_name => $script_name ); } } #---- END $OP eq DEFAULT @@ -333,7 +313,7 @@ output_html_with_http_headers $input, $cookie, $template->output; sub StringSearch { my ($searchstring,$frameworkcode)=@_; my $sth = C4::Context->dbh->prepare(" - SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value + SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue FROM marc_tag_structure WHERE (tagfield >= ? and frameworkcode=?) ORDER BY tagfield @@ -348,18 +328,12 @@ sub StringSearch { # sub duplicate_framework { my ($newframeworkcode,$oldframeworkcode) = @_; - my $sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where frameworkcode=?"); - $sth->execute($oldframeworkcode); - my $sth_insert = $dbh->prepare("insert into marc_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, frameworkcode) values (?,?,?,?,?,?,?)"); - while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value) = $sth->fetchrow) { - $sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$newframeworkcode); - } + my $dbh = C4::Context->dbh; + $dbh->do(q|INSERT INTO marc_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, ind1_defaultvalue, ind2_defaultvalue, frameworkcode) + SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value, ind1_defaultvalue, ind2_defaultvalue, ? from marc_tag_structure where frameworkcode=?|, undef, $newframeworkcode, $oldframeworkcode ); - $sth = $dbh->prepare("select frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden from marc_subfield_structure where frameworkcode=?"); - $sth->execute($oldframeworkcode); - $sth_insert = $dbh->prepare("insert into marc_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); - while ( my ($frameworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso,$hidden) = $sth->fetchrow) { - $sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso, $hidden); - } + $dbh->do(q|INSERT INTO marc_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden) + SELECT ?,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden from marc_subfield_structure where frameworkcode=? + |, undef, $newframeworkcode, $oldframeworkcode ); }