# 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 Modern::Perl;
+
use CGI q(-utf8);
use C4::Output;
use C4::Auth;
use Koha::BiblioFrameworks;
use Koha::DateUtils;
+use Koha::ItemTypes;
use Koha::Libraries;
+use Koha::BiblioFrameworks;
+
use Date::Calc qw(Today);
use MARC::File::USMARC;
use MARC::File::XML;
{
my ( $tag, $subfield ) = GetMarcFromKohaField("biblio.author", '');
- # my $summary = C4::Context->preference("z3950authortemplate");
my $auth_fields =
C4::Context->preference("z3950AuthorAuthFields");
my @auth_fields = split /,/, $auth_fields;
if ( $record->field($tag) ) {
foreach my $tmpfield ( $record->field($tag)->subfields ) {
- # foreach my $subfieldcode ($tmpfield->subfields){
my $subfieldcode = shift @$tmpfield;
my $subfieldvalue = shift @$tmpfield;
if ($field) {
my $title = $record->field($fieldtag)->subfield('c');
my $number = $record->field($fieldtag)->subfield('d');
if ($title) {
-
-# $field->add_subfields("$subfield"=>"[ ".ucfirst($title).ucfirst($firstname)." ".$number." ]");
$field->add_subfields(
"$subfield" => ucfirst($title) . " "
. ucfirst($firstname) . " "
. $number );
}
else {
-
-# $field->add_subfields("$subfield"=>"[ ".ucfirst($firstname).", ".ucfirst($lastname)." ]");
$field->add_subfields(
"$subfield" => ucfirst($firstname) . ", "
. ucfirst($lastname) );
}
}
elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
- push @authorised_values, ""
- unless ( $tagslib->{$tag}->{$subfield}->{mandatory}
- && ( $value || $tagslib->{$tag}->{$subfield}->{defaultvalue} ) );
+ push @authorised_values, "";
my $itemtype;
- my $itemtypes = GetItemTypes( style => 'array' );
- for my $itemtype ( @$itemtypes ) {
- push @authorised_values, $itemtype->{itemtype};
- $authorised_lib{$itemtype->{itemtype}} = $itemtype->{translated_description};
+ my $itemtypes = Koha::ItemTypes->search_with_localization;
+ while ( $itemtype = $itemtypes->next ) {
+ push @authorised_values, $itemtype->itemtype;
+ $authorised_lib{$itemtype->itemtype} = $itemtype->translated_description;
}
$value = $itemtype unless ($value);
}
elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "cn_source" ) {
- push @authorised_values, ""
- unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
+ push @authorised_values, "";
my $class_sources = GetClassSources();
$branch_limit ? $branch_limit : (),
);
- push @authorised_values, ""
- unless ( $tagslib->{$tag}->{$subfield}->{mandatory}
- && ( $value || $tagslib->{$tag}->{$subfield}->{defaultvalue} ) );
+ push @authorised_values, "";
while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
push @authorised_values, $value;
=head2 GetMandatoryFieldZ3950
- This function return an hashref which containts all mandatory field
+ This function returns a hashref which contains all mandatory field
to search with z3950 server.
=cut
my $index_subfield = CreateKey(); # create a specifique key for each subfield
- $value =~ s/"/"/g;
-
# if there is no value provided but a default value in parameters, get it
if ( $value eq '' ) {
- $value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
+ $value = $tagslib->{$tag}->{$subfield}->{defaultvalue} // q{};
# get today date & replace <<YYYY>>, <<MM>>, <<DD>> if provided in the default value
my $today_dt = dt_from_string;
- my $year = $today_dt->year;
- my $month = $today_dt->month;
- my $day = $today_dt->day;
+ my $year = $today_dt->strftime('%Y');
+ my $month = $today_dt->strftime('%m');
+ my $day = $today_dt->strftime('%d');
$value =~ s/<<YYYY>>/$year/g;
$value =~ s/<<MM>>/$month/g;
$value =~ s/<<DD>>/$day/g;
my @BIG_LOOP;
my %seen;
my @tab_data; # all tags to display
-
+
+ my $max_num_tab=-1;
+ my ( $itemtag, $itemsubfield ) = GetMarcFromKohaField( "items.itemnumber" );
foreach my $used ( @$usedTagsLib ){
+
push @tab_data,$used->{tagfield} if not $seen{$used->{tagfield}};
$seen{$used->{tagfield}}++;
- }
-
- my $max_num_tab=-1;
- foreach(@$usedTagsLib){
- if($_->{tab} > -1 && $_->{tab} >= $max_num_tab && $_->{tagfield} != '995'){ # FIXME : MARC21 ?
- $max_num_tab = $_->{tab};
+
+ if ( $used->{tab} > -1
+ && $used->{tab} >= $max_num_tab
+ && $used->{tagfield} ne $itemtag )
+ {
+ $max_num_tab = $used->{tab};
}
}
if($max_num_tab >= 9){
tag_lib => $tagslib->{$tag}->{lib},
repeatable => $tagslib->{$tag}->{repeatable},
mandatory => $tagslib->{$tag}->{mandatory},
- indicator1 => $indicator1,
- indicator2 => $indicator2,
+ indicator1 => ( $indicator1 || $tagslib->{$tag}->{ind1_defaultvalue} ), #if not set, try to load the default value
+ indicator2 => ( $indicator2 || $tagslib->{$tag}->{ind2_defaultvalue} ), #use short-circuit operator for efficiency
subfield_loop => \@subfields_data,
tagfirstsubfield => $subfields_data[0],
fixedfield => $tag < 10?1:0,
my $parentbiblio = $input->param('parentbiblionumber');
my $breedingid = $input->param('breedingid');
my $z3950 = $input->param('z3950');
-my $op = $input->param('op');
+my $op = $input->param('op') // q{};
my $mode = $input->param('mode');
my $frameworkcode = $input->param('frameworkcode');
my $redirect = $input->param('redirect');
my $userflags = 'edit_catalogue';
-my $changed_framework = $input->param('changed_framework');
+my $changed_framework = $input->param('changed_framework') // q{};
$frameworkcode = &GetFrameworkCode($biblionumber)
if ( $biblionumber and not( defined $frameworkcode) and $op ne 'addbiblio' );
}
);
+if ($biblionumber){
+ my $does_bib_exist = Koha::Biblios->find($biblionumber);
+ if (!defined $does_bib_exist){
+ $biblionumber = undef;
+ $template->param( bib_doesnt_exist => 1 );
+ }
+}
+
if ($frameworkcode eq 'FA'){
# We need to grab and set some variables in the template for use on the additems screen
$template->param(
'stickyduedate' => $fa_stickyduedate,
'duedatespec' => $fa_duedatespec,
);
-} elsif ( $op ne "delete" && C4::Context->preference('EnableAdvancedCatalogingEditor') && $input->cookie( 'catalogue_editor_' . $loggedinuser ) eq 'advanced' && !$breedingid ) {
+} elsif ( $op ne "delete" && C4::Context->preference('EnableAdvancedCatalogingEditor') && C4::Auth::haspermission(C4::Context->userenv->{id},{'editcatalogue'=>'advanced_editor'}) && $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.
exit;
}
-my $frameworkcodeloop = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
-$template->param( frameworkcodeloop => $frameworkcodeloop ,
- breedingid => $breedingid );
+my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
+$template->param(
+ frameworks => $frameworks,
+ breedingid => $breedingid,
+);
# ++ Global
$tagslib = &GetMarcStructure( 1, $frameworkcode );
);
if (($biblionumber) && !($breedingid)){
- $record = GetMarcBiblio($biblionumber);
+ $record = GetMarcBiblio({ biblionumber => $biblionumber });
}
if ($breedingid) {
( $record, $encoding ) = MARCfindbreeding( $breedingid ) ;
}
$is_a_modif = 0;
-
+
if ($biblionumber) {
$is_a_modif = 1;
my $title = C4::Context->preference('marcflavour') eq "UNIMARC" ? $record->subfield('200', 'a') : $record->title;
# 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 $oldbibitemnum;
- if (C4::Context->preference("BiblioAddsAuthorities")){
- BiblioAutoLink( $record, $frameworkcode );
- }
if ( $is_a_modif ) {
- ModBiblioframework( $biblionumber, $frameworkcode );
ModBiblio( $record, $biblionumber, $frameworkcode );
}
else {
projects / koha-equinox.git / blobdiff