#
# 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 <http://www.gnu.org/licenses>.
use strict;
#use warnings; FIXME - Bug 2505
-use CGI;
+use CGI q(-utf8);
use C4::Output;
use C4::Auth;
use C4::Biblio;
&& !C4::Context->IsSuperLibrarian()
&& C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
- my @branchloop;
foreach my $thisbranch ( sort keys %$branches ) {
push @authorised_values, $thisbranch;
$authorised_lib{$thisbranch} = $branches->{$thisbranch}->{'branchname'};
}
- #----- itemtypes
}
elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
- my $sth =
- $dbh->prepare(
- "select itemtype,description from itemtypes order by description");
- $sth->execute;
push @authorised_values, ""
unless ( $tagslib->{$tag}->{$subfield}->{mandatory}
&& ( $value || $tagslib->{$tag}->{$subfield}->{defaultvalue} ) );
-
+
my $itemtype;
-
- while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) {
- push @authorised_values, $itemtype;
- $authorised_lib{$itemtype} = $description;
+ my $itemtypes = GetItemTypes( style => 'array' );
+ for my $itemtype ( @$itemtypes ) {
+ push @authorised_values, $itemtype->{itemtype};
+ $authorised_lib{$itemtype->{itemtype}} = $itemtype->{translated_description};
}
$value = $itemtype unless ($value);
-
- #---- class_sources
}
elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "cn_source" ) {
push @authorised_values, ""
}
}
$authorised_values_sth->finish;
- return CGI::scrolling_list(
- -name => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
- -values => \@authorised_values,
- -default => $value,
- -labels => \%authorised_lib,
- -override => 1,
- -size => 1,
- -multiple => 0,
- -tabindex => 1,
- -id => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
- -class => "input_marceditor",
- );
+ return {
+ type => 'select',
+ id => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
+ name => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
+ default => $value,
+ values => \@authorised_values,
+ labels => \%authorised_lib,
+ };
+
}
=head2 CreateKey
my %subfield_data = (
tag => $tag,
subfield => $id_subfield,
- marc_lib => substr( $tagslib->{$tag}->{$subfield}->{lib}, 0, 22 ),
- marc_lib_plain => $tagslib->{$tag}->{$subfield}->{lib},
+ marc_lib => $tagslib->{$tag}->{$subfield}->{lib},
tag_mandatory => $tagslib->{$tag}->{mandatory},
mandatory => $tagslib->{$tag}->{$subfield}->{mandatory},
repeatable => $tagslib->{$tag}->{$subfield}->{repeatable},
defined($tagslib->{$tag}->{'a'}->{authtypecode}) and
$tagslib->{$tag}->{'a'}->{authtypecode} ne '') {
- $subfield_data{marc_value} =
- "<input type=\"text\"
- id=\"".$subfield_data{id}."\"
- name=\"".$subfield_data{id}."\"
- value=\"$value\"
- class=\"input_marceditor readonly\"
- tabindex=\"1\"
- size=\"5\"
- maxlength=\"".$subfield_data{maxlength}."\"
- readonly=\"readonly\"
- \/>";
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 5,
+ maxlength => $subfield_data{maxlength},
+ readonly => 1,
+ };
# it's a thesaurus / authority field
}
elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
# when authorities auto-creation is allowed, do not set readonly
my $is_readonly = !C4::Context->preference("BiblioAddsAuthorities");
- $subfield_data{marc_value} =
- "<input type=\"text\"
- id=\"".$subfield_data{id}."\"
- name=\"".$subfield_data{id}."\"
- value=\"$value\"
- class=\"input_marceditor readonly\"
- tabindex=\"1\"
- size=\"67\"
- maxlength=\"".$subfield_data{maxlength}."\"".
- ($is_readonly ? "readonly=\"readonly\"" : "").
- "\/>
- <span class=\"subfield_controls\"><a href=\"#\" class=\"buttonDot tag_editor\"
- onclick=\"openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."','biblio'); return false;\" tabindex=\"1\" title=\"Tag editor\">Tag editor</a></span>
- ";
+
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ readonly => ($is_readonly) ? 1 : 0,
+ authtype => $tagslib->{$tag}->{$subfield}->{authtypecode},
+ };
+
# it's a plugin field
- }
- elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
-
- # opening plugin. Just check whether we are on a developer computer on a production one
- # (the cgidir differs)
- my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder";
- unless ( opendir( DIR, "$cgidir" ) ) {
- $cgidir = C4::Context->intranetdir . "/cataloguing/value_builder";
- closedir( DIR );
- }
- my $plugin = $cgidir . "/" . $tagslib->{$tag}->{$subfield}->{'value_builder'};
- if (do $plugin) {
- my $extended_param = plugin_parameters( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
- my ( $function_name, $javascript ) = plugin_javascript( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
-
- $subfield_data{marc_value} =
- "<input tabindex=\"1\"
- type=\"text\"
- id=\"".$subfield_data{id}."\"
- name=\"".$subfield_data{id}."\"
- value=\"$value\"
- class=\"input_marceditor\"
- onfocus=\"Focus$function_name($index_tag)\"
- size=\"67\"
- maxlength=\"".$subfield_data{maxlength}."\"
- onblur=\"Blur$function_name($index_tag); \" \/>
- <span class=\"subfield_controls\"><a href=\"#\" class=\"buttonDot tag_editor\" onclick=\"Clic$function_name('$subfield_data{id}'); return false;\" tabindex=\"1\" title=\"Tag editor\">Tag editor</a></span>
- $javascript";
+ } elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
+ require Koha::FrameworkPlugin;
+ my $plugin = Koha::FrameworkPlugin->new( {
+ name => $tagslib->{$tag}->{$subfield}->{'value_builder'},
+ });
+ my $pars= { dbh => $dbh, record => $rec, tagslib => $tagslib,
+ id => $subfield_data{id}, tabloop => $tabloop };
+ $plugin->build( $pars );
+ if( !$plugin->errstr ) {
+ $subfield_data{marc_value} = {
+ type => 'text_complex',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ javascript => $plugin->javascript,
+ noclick => $plugin->noclick,
+ };
} else {
- warn "Plugin Failed: $plugin";
+ warn $plugin->errstr;
# supply default input form
- $subfield_data{marc_value} =
- "<input type=\"text\"
- id=\"".$subfield_data{id}."\"
- name=\"".$subfield_data{id}."\"
- value=\"$value\"
- tabindex=\"1\"
- size=\"67\"
- maxlength=\"".$subfield_data{maxlength}."\"
- class=\"input_marceditor\"
- \/>
- ";
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ readonly => 0,
+ };
}
- # it's an hidden field
- }
- elsif ( $tag eq '' ) {
- $subfield_data{marc_value} =
- "<input tabindex=\"1\"
- type=\"hidden\"
- id=\"".$subfield_data{id}."\"
- name=\"".$subfield_data{id}."\"
- size=\"67\"
- maxlength=\"".$subfield_data{maxlength}."\"
- value=\"$value\" \/>
- ";
+
+ # it's an hidden field
+ } elsif ( $tag eq '' ) {
+ $subfield_data{marc_value} = {
+ type => 'hidden',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ };
+
}
else {
# it's a standard field
&& C4::Context->preference("marcflavour") eq "MARC21" )
)
{
- $subfield_data{marc_value} =
- "<textarea cols=\"70\"
- rows=\"4\"
- id=\"".$subfield_data{id}."\"
- name=\"".$subfield_data{id}."\"
- class=\"input_marceditor\"
- tabindex=\"1\"
- >$value</textarea>
- ";
+ $subfield_data{marc_value} = {
+ type => 'textarea',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ };
+
}
else {
- $subfield_data{marc_value} =
- "<input type=\"text\"
- id=\"".$subfield_data{id}."\"
- name=\"".$subfield_data{id}."\"
- value=\"$value\"
- tabindex=\"1\"
- size=\"67\"
- maxlength=\"".$subfield_data{maxlength}."\"
- class=\"input_marceditor\"
- \/>
- ";
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ readonly => 0,
+ };
+
}
}
$subfield_data{'index_subfield'} = $index_subfield;
foreach my $subfield ( sort( keys %{ $tagslib->{$tag} } ) ) {
next if ( length $subfield != 1 );
next
- if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -5 )
- or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 4 ) )
+ if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -4 )
+ or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 5 ) )
and not ( $subfield eq "9" and
exists($tagslib->{$tag}->{'a'}->{authtypecode}) and
defined($tagslib->{$tag}->{'a'}->{authtypecode}) and
my $fa_duedatespec = $input->param('duedatespec');
my $userflags = 'edit_catalogue';
-if ($frameworkcode eq 'FA'){
- $userflags = 'fast_cataloging';
-}
my $changed_framework = $input->param('changed_framework');
$frameworkcode = &GetFrameworkCode($biblionumber)
if ( $biblionumber and not($frameworkcode) and $op ne 'addbiblio' );
+if ($frameworkcode eq 'FA'){
+ $userflags = 'fast_cataloging';
+}
+
$frameworkcode = '' if ( $frameworkcode eq 'Default' );
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
'stickyduedate' => $fa_stickyduedate,
'duedatespec' => $fa_duedatespec,
);
+} elsif ( C4::Context->preference('EnableAdvancedCatalogingEditor') && $input->cookie( 'catalogue_editor_' . $loggedinuser ) eq 'advanced' && !$breedingid ) {
+ # Only use the advanced editor for non-fast-cataloging.
+ # breedingid is not handled because those would only come off a Z39.50
+ # search initiated by the basic editor.
+ print $input->redirect( '/cgi-bin/koha/cataloguing/editor.pl' . ( $biblionumber ? ( '#catalog/' . $biblionumber ) : '' ) );
}
+
# Getting the list of all frameworks
# get framework list
my $frameworks = getframeworks;
$biblionumbertagsubfield,
$biblioitemnumtagfield,
$biblioitemnumtagsubfield,
- $bibitem,
$biblioitemnumber
);
if ($biblionumber) {
$is_a_modif = 1;
- $template->param( title => $record->title(), );
+ my $title = C4::Context->preference('marcflavour') eq "UNIMARC" ? $record->subfield('200', 'a') : $record->title;
+ $template->param( title => $title );
# if it's a modif, retrieve bibli and biblioitem numbers for the future modification of old-DB.
( $biblionumbertagfield, $biblionumbertagsubfield ) =
my $confirm_not_duplicate = $input->param('confirm_not_duplicate');
# it is not a duplicate (determined either by Koha itself or by user checking it's not a duplicate)
if ( !$duplicatebiblionumber or $confirm_not_duplicate ) {
- my $oldbibnum;
my $oldbibitemnum;
if (C4::Context->preference("BiblioAddsAuthorities")){
BiblioAutoLink( $record, $frameworkcode );
.'&frameworkcode='.$frameworkcode
.'&circborrowernumber='.$fa_circborrowernumber
.'&branch='.$fa_branch
- .'&barcode='.uri_escape($fa_barcode)
+ .'&barcode='.uri_escape_utf8($fa_barcode)
.'&stickyduedate='.$fa_stickyduedate
.'&duedatespec='.$fa_duedatespec
);
done =>1,
popup =>1
);
- $template->param( title => $record->subfield('200',"a") ) if ($record ne "-1" && C4::Context->preference('marcflavour') =~/unimarc/i);
- $template->param( title => $record->title() ) if ($record ne "-1" && C4::Context->preference('marcflavour') eq "usmarc");
+ if ( $record ne '-1' ) {
+ my $title = C4::Context->preference('marcflavour') eq "UNIMARC" ? $record->subfield('200', 'a') : $record->title;
+ $template->param( title => $title );
+ }
$template->param(
popup => $mode,
itemtype => $frameworkcode,
);
}
-$template->param( title => $record->title() ) if ( $record ne "-1" );
+if ( $record ne '-1' ) {
+ my $title = C4::Context->preference('marcflavour') eq "UNIMARC" ? $record->subfield('200', 'a') : $record->title;
+ $template->param( title => $title );
+}
$template->param(
popup => $mode,
frameworkcode => $frameworkcode,
projects / koha.git / blobdiff