#
# 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 Modern::Perl;
+
+use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use C4::Biblio;
use C4::Items;
use C4::Context;
use C4::Circulation;
-use C4::Koha; # XXX subfield_is_koha_internal_p
-use C4::Branch; # XXX subfield_is_koha_internal_p
+use C4::Koha;
use C4::ClassSource;
-use C4::Dates;
+use Koha::DateUtils;
+use Koha::Items;
+use Koha::ItemTypes;
+use Koha::Libraries;
+use Koha::Patrons;
use List::MoreUtils qw/any/;
use C4::Search;
use Storable qw(thaw freeze);
sub generate_subfield_form {
- my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $today_iso, $biblionumber, $temp, $loop_data, $i, $restrictededition) = @_;
+ my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $loop_data, $i, $restrictededition) = @_;
my $frameworkcode = &GetFrameworkCode($biblionumber);
$subfield_data{tag} = $tag;
$subfield_data{subfield} = $subfieldtag;
- $subfield_data{random} = int(rand(1000000)); # why do we need 2 different randoms?
$subfield_data{marc_lib} ="<span id=\"error$i\" title=\"".$subfieldlib->{lib}."\">".$subfieldlib->{lib}."</span>";
$subfield_data{mandatory} = $subfieldlib->{mandatory};
$subfield_data{repeatable} = $subfieldlib->{repeatable};
$subfield_data{maxlength} = $subfieldlib->{maxlength};
- $value =~ s/"/"/g;
if ( ! defined( $value ) || $value eq '') {
$value = $subfieldlib->{defaultvalue};
- # get today date & replace YYYY, MM, DD if provided in the default value
- my ( $year, $month, $day ) = split ',', $today_iso; # FIXME: iso dates don't have commas!
- $value =~ s/YYYY/$year/g;
- $value =~ s/MM/$month/g;
- $value =~ s/DD/$day/g;
+ if ( $value ) {
+ # get today date & replace <<YYYY>>, <<MM>>, <<DD>> if provided in the default value
+ my $today_dt = dt_from_string;
+ 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;
+ # And <<USER>> with surname (?)
+ my $username=(C4::Context->userenv?C4::Context->userenv->{'surname'}:"superlibrarian");
+ $value=~s/<<USER>>/$username/g;
+ }
+ } else {
+ $value =~ s/"/"/g;
}
- $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} < -4));
+ $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} <= -4));
my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');
if (!$value && $subfieldlib->{kohafield} eq 'items.itemcallnumber' && $pref_itemcallnumber) {
my $CNsubfield2 = substr($pref_itemcallnumber, 4, 1);
my $temp2 = $temp->field($CNtag);
if ($temp2) {
- $value = ($temp2->subfield($CNsubfield)).' '.($temp2->subfield($CNsubfield2));
+ $value = join ' ', $temp2->subfield($CNsubfield) || q{}, $temp2->subfield($CNsubfield2) || q{};
#remove any trailing space incase one subfield is used
$value =~ s/^\s+|\s+$//g;
}
my $input = new CGI;
$value = $input->param('barcode');
}
- my $attributes_no_value = qq(id="$subfield_data{id}" name="field_value" class="input_marceditor" size="50" maxlength="$subfield_data{maxlength}" );
- my $attributes_no_value_textarea = qq(id="$subfield_data{id}" name="field_value" class="input_marceditor" rows="5" cols="64" );
- # Getting list of subfields to keep when restricted edition is enabled
- my $subfieldsToAllowForRestrictedEdition = C4::Context->preference('SubfieldsToAllowForRestrictedEdition');
- my $allowAllSubfields = (
- not defined $subfieldsToAllowForRestrictedEdition
- or $subfieldsToAllowForRestrictedEdition == q||
- ) ? 1 : 0;
- my @subfieldsToAllow = split(/ /, $subfieldsToAllowForRestrictedEdition);
-
- # If we're on restricted edition, and our field is not in the list of subfields to allow,
- # then it is read-only
- $attributes_no_value .= 'readonly="readonly" '
- if (
- not $allowAllSubfields
- and $restrictededition
- and !grep { $tag . '$' . $subfieldtag eq $_ } @subfieldsToAllow
- );
-
- my $attributes = qq($attributes_no_value value="$value" );
-
if ( $subfieldlib->{authorised_value} ) {
my @authorised_values;
my %authorised_lib;
# builds list, depending on authorised value...
if ( $subfieldlib->{authorised_value} eq "branches" ) {
foreach my $thisbranch (@$branches) {
- push @authorised_values, $thisbranch->{value};
- $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};
- $value = $thisbranch->{value} if $thisbranch->{selected} && !$value;
+ push @authorised_values, $thisbranch->{branchcode};
+ $authorised_lib{$thisbranch->{branchcode}} = $thisbranch->{branchname};
+ $value = $thisbranch->{branchcode} if $thisbranch->{selected} && !$value;
}
}
elsif ( $subfieldlib->{authorised_value} eq "itemtypes" ) {
- push @authorised_values, "" unless ( $subfieldlib->{mandatory} );
- my $sth = $dbh->prepare("SELECT itemtype,description FROM itemtypes ORDER BY description");
- $sth->execute;
- while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) {
- push @authorised_values, $itemtype;
- $authorised_lib{$itemtype} = $description;
+ push @authorised_values, "";
+ my $itemtypes = Koha::ItemTypes->search_with_localization;
+ while ( my $itemtype = $itemtypes->next ) {
+ push @authorised_values, $itemtype->itemtype;
+ $authorised_lib{$itemtype->itemtype} = $itemtype->translated_description;
}
-
+
unless ( $value ) {
my $itype_sth = $dbh->prepare("SELECT itemtype FROM biblioitems WHERE biblionumber = ?");
$itype_sth->execute( $biblionumber );
#---- class_sources
}
elsif ( $subfieldlib->{authorised_value} eq "cn_source" ) {
- push @authorised_values, "" unless ( $subfieldlib->{mandatory} );
+ push @authorised_values, "";
my $class_sources = GetClassSources();
my $default_source = C4::Context->preference("DefaultClassificationSource");
#---- "true" authorised value
}
else {
- push @authorised_values, qq{} unless ( $subfieldlib->{mandatory} );
+ push @authorised_values, qq{};
my $av = GetAuthorisedValues( $subfieldlib->{authorised_value} );
for my $r ( @$av ) {
push @authorised_values, $r->{authorised_value};
}
}
- if ($subfieldlib->{'hidden'}) {
- $subfield_data{marc_value} = qq(<input type="hidden" $attributes /> $authorised_lib{$value});
+ if ( $subfieldlib->{hidden} > 4 or $subfieldlib->{hidden} <= -4 ) {
+ $subfield_data{marc_value} = {
+ type => 'hidden',
+ id => $subfield_data{id},
+ maxlength => $subfield_data{maxlength},
+ value => $value,
+ };
}
else {
- my @scrparam = (
- -name => "field_value",
- -values => \@authorised_values,
- -default => $value,
- -labels => \%authorised_lib,
- -override => 1,
- -size => 1,
- -multiple => 0,
- -id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield,
- -class => "input_marceditor",
- );
-
- # If we're on restricted edition, and our field is not in the list of subfields to allow,
- # then it is read-only
- push @scrparam, (-readonly => "readonly"), (-disabled => "disabled")
- if (
- not $allowAllSubfields
- and $restrictededition
- and !grep { $tag . '$' . $subfieldtag eq $_ } @subfieldsToAllow
- );
- $subfield_data{marc_value} =CGI::scrolling_list(@scrparam);
+ $subfield_data{marc_value} = {
+ type => 'select',
+ id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield,
+ values => \@authorised_values,
+ labels => \%authorised_lib,
+ default => $value,
+ };
}
-
}
# it's a thesaurus / authority field
elsif ( $subfieldlib->{authtypecode} ) {
- $subfield_data{marc_value} = "<input type=\"text\" $attributes />
- <a href=\"#\" class=\"buttonDot\"
- onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$subfieldlib->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">...</a>
- ";
+ $subfield_data{marc_value} = {
+ type => 'text_auth',
+ id => $subfield_data{id},
+ maxlength => $subfield_data{maxlength},
+ value => $value,
+ authtypecode => $subfieldlib->{authtypecode},
+ };
}
# it's a plugin field
- elsif ( $subfieldlib->{value_builder} ) {
- # opening plugin
- my $plugin = C4::Context->intranetdir . "/cataloguing/value_builder/" . $subfieldlib->{'value_builder'};
- if (do $plugin) {
- my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, $loop_data );
- my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, $loop_data );
- my $change = index($javascript, 'function Change') > -1 ?
- "return Change$function_name($subfield_data{random}, '$subfield_data{id}');" :
- 'return 1;';
- $subfield_data{marc_value} = qq[<input type="text" $attributes
- onfocus="Focus$function_name($subfield_data{random}, '$subfield_data{id}');"
- onchange=" $change"
- onblur=" Blur$function_name($subfield_data{random}, '$subfield_data{id}');" />
- <a href="#" class="buttonDot" onclick="Clic$function_name('$subfield_data{id}'); return false;" title="Tag Editor">...</a>
- $javascript];
- } else {
- warn "Plugin Failed: $plugin";
- $subfield_data{marc_value} = "<input type=\"text\" $attributes />"; # supply default input form
- }
+ elsif ( $subfieldlib->{value_builder} ) { # plugin
+ require Koha::FrameworkPlugin;
+ my $plugin = Koha::FrameworkPlugin->new({
+ name => $subfieldlib->{'value_builder'},
+ item_style => 1,
+ });
+ my $pars= { dbh => $dbh, record => $temp, tagslib =>$tagslib,
+ id => $subfield_data{id}, tabloop => $loop_data };
+ $plugin->build( $pars );
+ if( !$plugin->errstr ) {
+ my $class= 'buttonDot'. ( $plugin->noclick? ' disabled': '' );
+ $subfield_data{marc_value} = {
+ type => 'text_plugin',
+ id => $subfield_data{id},
+ maxlength => $subfield_data{maxlength},
+ value => $value,
+ class => $class,
+ nopopup => $plugin->noclick,
+ javascript => $plugin->javascript,
+ };
+ } else {
+ warn $plugin->errstr;
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ maxlength => $subfield_data{maxlength},
+ value => $value,
+ }; # supply default input form
+ }
}
elsif ( $tag eq '' ) { # it's an hidden field
- $subfield_data{marc_value} = qq(<input type="hidden" $attributes />);
+ $subfield_data{marc_value} = {
+ type => 'hidden',
+ id => $subfield_data{id},
+ maxlength => $subfield_data{maxlength},
+ value => $value,
+ };
}
elsif ( $subfieldlib->{'hidden'} ) { # FIXME: shouldn't input type be "hidden" ?
- $subfield_data{marc_value} = qq(<input type="text" $attributes />);
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ maxlength => $subfield_data{maxlength},
+ value => $value,
+ };
}
- elsif ( length($value) > 100
- or (C4::Context->preference("marcflavour") eq "UNIMARC" and
- 300 <= $tag && $tag < 400 && $subfieldtag eq 'a' )
- or (C4::Context->preference("marcflavour") eq "MARC21" and
- 500 <= $tag && $tag < 600 )
- ) {
+ elsif (
+ (
+ $value and length($value) > 100
+ )
+ or (
+ C4::Context->preference("marcflavour") eq "UNIMARC"
+ and 300 <= $tag && $tag < 400 && $subfieldtag eq 'a'
+ )
+ or (
+ C4::Context->preference("marcflavour") eq "MARC21"
+ and 500 <= $tag && $tag < 600
+ )
+ ) {
# oversize field (textarea)
- $subfield_data{marc_value} = "<textarea $attributes_no_value_textarea>$value</textarea>\n";
+ $subfield_data{marc_value} = {
+ type => 'textarea',
+ id => $subfield_data{id},
+ value => $value,
+ };
} else {
- # it's a standard field
- $subfield_data{marc_value} = "<input type=\"text\" $attributes />";
+ # it's a standard field
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ maxlength => $subfield_data{maxlength},
+ value => $value,
+ };
}
-
+
+ # Getting list of subfields to keep when restricted editing is enabled
+ my $subfieldsToAllowForRestrictedEditing = C4::Context->preference('SubfieldsToAllowForRestrictedEditing');
+ my $allowAllSubfields = (
+ not defined $subfieldsToAllowForRestrictedEditing
+ or $subfieldsToAllowForRestrictedEditing eq q||
+ ) ? 1 : 0;
+ my @subfieldsToAllow = split(/ /, $subfieldsToAllowForRestrictedEditing);
+
+ # If we're on restricted editing, and our field is not in the list of subfields to allow,
+ # then it is read-only
+ $subfield_data{marc_value}->{readonly} = (
+ not $allowAllSubfields
+ and $restrictededition
+ and !grep { $tag . '$' . $subfieldtag eq $_ } @subfieldsToAllow
+ ) ? 1: 0;
+
return \%subfield_data;
}
my $error = $input->param('error');
my $biblionumber = $input->param('biblionumber');
my $itemnumber = $input->param('itemnumber');
-my $op = $input->param('op');
+my $op = $input->param('op') || q{};
my $hostitemnumber = $input->param('hostitemnumber');
my $marcflavour = C4::Context->preference("marcflavour");
my $searchid = $input->param('searchid');
});
-# Does the user have a restricted item edition permission?
-my $uid = $loggedinuser ? GetMember( borrowernumber => $loggedinuser )->{userid} : undef;
+# Does the user have a restricted item editing permission?
+my $uid = Koha::Patrons->find( $loggedinuser )->userid;
my $restrictededition = $uid ? haspermission($uid, {'editcatalogue' => 'edit_items_restricted'}) : undef;
-# In case user is a superlibrarian, edition is not restricted
+# In case user is a superlibrarian, editing is not restricted
$restrictededition = 0 if ($restrictededition != 0 && C4::Context->IsSuperLibrarian());
-# In case user has fast cataloging permission (and we're in fast cataloging), edition is not restricted
+# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted
$restrictededition = 0 if ($restrictededition != 0 && $frameworkcode eq 'FA' && haspermission($uid, {'editcatalogue' => 'fast_cataloging'}));
-my $today_iso = C4::Dates->today('iso');
my $tagslib = &GetMarcStructure(1,$frameworkcode);
-my $record = GetMarcBiblio($biblionumber);
-my $oldrecord = TransformMarcToKoha($dbh,$record);
+my $record = GetMarcBiblio({ biblionumber => $biblionumber });
+my $oldrecord = TransformMarcToKoha($record);
my $itemrecord;
my $nextop="additem";
my @errors; # store errors found while checking data BEFORE saving item.
my $lastitemcookie = $input->cookie('LastCreatedItem');
if ($lastitemcookie) {
$lastitemcookie = uri_unescape($lastitemcookie);
- if ( thaw($lastitemcookie) ) {
- $cookieitemrecord = thaw($lastitemcookie) ;
- $cookieitemrecord = removeFieldsForPrefill($cookieitemrecord);
+ eval {
+ if ( thaw($lastitemcookie) ) {
+ $cookieitemrecord = thaw($lastitemcookie);
+ $cookieitemrecord = removeFieldsForPrefill($cookieitemrecord);
+ }
+ };
+ if ($@) {
+ $lastitemcookie = 'undef' unless $lastitemcookie;
+ warn "Storable::thaw failed to thaw LastCreatedItem-cookie. Cookie value '$lastitemcookie'. Caught error follows: '$@'";
}
}
}
#-------------------------------------------------------------------------------
# rebuild
- my @tags = $input->param('tag');
- my @subfields = $input->param('subfield');
- my @values = $input->param('field_value');
+ my @tags = $input->multi_param('tag');
+ my @subfields = $input->multi_param('subfield');
+ my @values = $input->multi_param('field_value');
# build indicator hash.
- my @ind_tag = $input->param('ind_tag');
- my @indicator = $input->param('indicator');
+ my @ind_tag = $input->multi_param('ind_tag');
+ my @indicator = $input->multi_param('indicator');
my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM');
my $record = MARC::Record::new_from_xml($xml, 'UTF-8');
$record = _increment_barcode($record, $frameworkcode);
}
- my $addedolditem = TransformMarcToKoha( $dbh, $record );
+ my $addedolditem = TransformMarcToKoha( $record );
# If we have to add or add & duplicate, we add the item
if ( $add_submit || $add_duplicate_submit ) {
my $oldbarcode = $addedolditem->{'barcode'};
my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode);
- # If there is a barcode and we can't find him new values, we can't add multiple copies
+ # If there is a barcode and we can't find their new values, we can't add multiple copies
my $testbarcode;
$testbarcode = $barcodeobj->next_value($oldbarcode) if $barcodeobj;
if ($oldbarcode && !$testbarcode) {
print $input->redirect(
'/cgi-bin/koha/circ/circulation.pl?'
.'borrowernumber='.$fa_circborrowernumber
- .'&barcode='.uri_escape($fa_barcode)
+ .'&barcode='.uri_escape_utf8($fa_barcode)
.'&duedatespec='.$fa_duedatespec
.'&stickyduedate=1'
);
$itemrecord = C4::Items::GetMarcItem($biblionumber,$itemnumber);
$nextop = "saveitem";
#-------------------------------------------------------------------------------
+} elsif ($op eq "dupeitem") {
+#-------------------------------------------------------------------------------
+# retrieve item if exist => then, it's a modif
+ $itemrecord = C4::Items::GetMarcItem($biblionumber,$itemnumber);
+ if (C4::Context->preference('autoBarcode') eq 'incremental') {
+ $itemrecord = _increment_barcode($itemrecord, $frameworkcode);
+ }
+ else {
+ # we have to clear the barcode field in the duplicate item record to make way for the new one generated by the javascript plugin
+ my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode);
+ my $fieldItem = $itemrecord->field($tagfield);
+ $itemrecord->delete_field($fieldItem);
+ $fieldItem->delete_subfields($tagsubfield);
+ $itemrecord->insert_fields_ordered($fieldItem);
+ }
+
+ #check for hidden subfield and remove them for the duplicated item
+ foreach my $field ($itemrecord->fields()){
+ my $tag = $field->{_tag};
+ foreach my $subfield ($field->subfields()){
+ my $subfieldtag = $subfield->[0];
+ if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10"
+ || abs($tagslib->{$tag}->{$subfieldtag}->{hidden})>4 ){
+ my $fieldItem = $itemrecord->field($tag);
+ $itemrecord->delete_field($fieldItem);
+ $fieldItem->delete_subfields($subfieldtag);
+ $itemrecord->insert_fields_ordered($fieldItem);
+ }
+ }
+ }
+
+ $itemrecord = removeFieldsForPrefill($itemrecord) if ($prefillitem);
+ $nextop = "additem";
+#-------------------------------------------------------------------------------
} elsif ($op eq "delitem") {
#-------------------------------------------------------------------------------
# check that there is no issue on this item before deletion.
- $error = &DelItemCheck($dbh,$biblionumber,$itemnumber);
+ $error = &DelItemCheck( $biblionumber,$itemnumber);
if($error == 1){
print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&searchid=$searchid");
}else{
#-------------------------------------------------------------------------------
} elsif ($op eq "delallitems") {
#-------------------------------------------------------------------------------
- my @biblioitems = &GetBiblioItemByBiblioNumber($biblionumber);
- my $errortest=0;
- my $itemfail;
- foreach my $biblioitem (@biblioitems) {
- my $items = &GetItemsByBiblioitemnumber( $biblioitem->{biblioitemnumber} );
-
- foreach my $item (@$items) {
- $error =&DelItemCheck( $dbh, $biblionumber, $item->{itemnumber} );
- $itemfail =$item;
- if($error == 1){
- next
- }
- else {
- push @errors,$error;
- $errortest++
- }
- }
- if($errortest > 0){
- $nextop="additem";
- }
- else {
- my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
- my $views = { C4::Search::enabled_staff_search_views };
- if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
- print $input->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber&searchid=$searchid");
- } elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) {
- print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&searchid=$searchid");
- } elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
- print $input->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber&searchid=$searchid");
- } else {
- print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber&searchid=$searchid");
- }
- exit;
+ my @itemnumbers = Koha::Items->search({ biblionumber => $biblionumber })->get_column('itemnumber');
+ foreach my $itemnumber ( @itemnumbers ) {
+ $error = C4::Items::DelItemCheck( $biblionumber, $itemnumber );
+ next if $error == 1; # Means ok
+ push @errors,$error;
+ }
+ if ( @errors ) {
+ $nextop="additem";
+ } else {
+ my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
+ my $views = { C4::Search::enabled_staff_search_views };
+ if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
+ print $input->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber&searchid=$searchid");
+ } elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) {
+ print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&searchid=$searchid");
+ } elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
+ print $input->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber&searchid=$searchid");
+ } else {
+ print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber&searchid=$searchid");
}
- }
+ exit;
+ }
#-------------------------------------------------------------------------------
} elsif ($op eq "saveitem") {
#-------------------------------------------------------------------------------
# rebuild
- my @tags = $input->param('tag');
- my @subfields = $input->param('subfield');
- my @values = $input->param('field_value');
+ my @tags = $input->multi_param('tag');
+ my @subfields = $input->multi_param('subfield');
+ my @values = $input->multi_param('field_value');
# build indicator hash.
- my @ind_tag = $input->param('ind_tag');
- my @indicator = $input->param('indicator');
+ my @ind_tag = $input->multi_param('ind_tag');
+ my @indicator = $input->multi_param('indicator');
# my $itemnumber = $input->param('itemnumber');
my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag,'ITEM');
my $itemtosave=MARC::Record::new_from_xml($xml, 'UTF-8');
# MARC::Record builded => now, record in DB
# warn "R: ".$record->as_formatted;
# check that the barcode don't exist already
- my $addedolditem = TransformMarcToKoha($dbh,$itemtosave);
+ my $addedolditem = TransformMarcToKoha($itemtosave);
my $exist_itemnumber = get_item_from_barcode($addedolditem->{'barcode'});
if ($exist_itemnumber && $exist_itemnumber != $itemnumber) {
push @errors,"barcode_not_unique";
} else {
- ModItemFromMarc($itemtosave,$biblionumber,$itemnumber);
- $itemnumber="";
- }
- my $item = GetItem( $itemnumber );
- my $olditemlost = $item->{'itemlost'};
-
- my ($lost_tag,$lost_subfield) = GetMarcFromKohaField("items.itemlost",'');
-
- my $newitemlost = $itemtosave->subfield( $lost_tag, $lost_subfield );
- if (($olditemlost eq '0' or $olditemlost eq '' ) and $newitemlost ge '1'){
- LostItem($itemnumber,'MARK RETURNED');
+ my $item = GetItem( $itemnumber );
+ my $newitem = ModItemFromMarc($itemtosave, $biblionumber, $itemnumber);
+ $itemnumber = q{};
+ my $olditemlost = $item->{itemlost};
+ my $newitemlost = $newitem->{itemlost};
+ LostItem( $item->{itemnumber}, 'additem' )
+ if $newitemlost && $newitemlost ge '1' && !$olditemlost;
}
$nextop="additem";
} elsif ($op eq "delinkitem"){
#-------------------------------------------------------------------------------
# now, build existiing item list
-my $temp = GetMarcBiblio( $biblionumber );
+my $temp = GetMarcBiblio({ biblionumber => $biblionumber });
#my @fields = $record->fields();
foreach my $hostfield ($temp->field($analyticfield)){
my $hostbiblionumber = $hostfield->subfield('0');
if ($hostbiblionumber){
- my $hostrecord = GetMarcBiblio($hostbiblionumber, 1);
+ my $hostrecord = GetMarcBiblio({
+ biblionumber => $hostbiblionumber,
+ embed_items => 1 });
if ($hostrecord) {
my ($itemfield, undef) = GetMarcFromKohaField( 'items.itemnumber', GetFrameworkCode($hostbiblionumber) );
foreach my $hostitem ($hostrecord->field($itemfield)){
}
$this_row{itemnumber} = $subfieldvalue if ($field->tag() eq $itemtagfield && $subfieldcode eq $itemtagsubfield);
- if ( C4::Context->preference('EasyAnalyticalRecords') ) {
- foreach my $hostitemnumber (@hostitemnumbers){
- if ($this_row{itemnumber} eq $hostitemnumber){
- $this_row{hostitemflag} = 1;
- $this_row{hostbiblionumber}= GetBiblionumberFromItemnumber($hostitemnumber);
- last;
- }
- }
-
-# my $countanalytics=GetAnalyticsCount($this_row{itemnumber});
-# if ($countanalytics > 0){
-# $this_row{countanalytics} = $countanalytics;
-# }
- }
-
+ if ( C4::Context->preference('EasyAnalyticalRecords') ) {
+ foreach my $hostitemnumber (@hostitemnumbers) {
+ my $item = Koha::Items->find( $hostitemnumber );
+ if ($this_row{itemnumber} eq $hostitemnumber) {
+ $this_row{hostitemflag} = 1;
+ $this_row{hostbiblionumber}= $item->biblio->biblionumber;
+ last;
+ }
+ }
+ }
}
if (%this_row) {
push(@big_array, \%this_row);
foreach my $subfield_code (sort keys(%witness)) {
my %header_value;
$header_value{header_value} = $witness{$subfield_code};
+
+ my $subfieldlib = $tagslib->{$itemtagfield}->{$subfield_code};
+ my $kohafield = $subfieldlib->{kohafield};
+ if ( $kohafield && $kohafield =~ /items.(.+)/ ) {
+ $header_value{column_name} = $1;
+ }
+
push(@header_value_loop, \%header_value);
}
my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');
-my $onlymine =
- C4::Context->preference('IndependentBranches')
- && C4::Context->userenv
- && !C4::Context->IsSuperLibrarian()
- && C4::Context->userenv->{branch};
my $branch = $input->param('branch') || C4::Context->userenv->{branch};
-my $branches = GetBranchesLoop($branch,$onlymine); # build once ahead of time, instead of multiple times later.
+my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;# build once ahead of time, instead of multiple times later.
+for my $library ( @$libraries ) {
+ $library->{selected} = 1 if $library->{branchcode} eq $branch
+}
# We generate form, from actuel record
@fields = ();
my $value = $subfield->[1];
my $subfieldlib = $tagslib->{$tag}->{$subfieldtag};
- next if subfield_is_koha_internal_p($subfieldtag);
next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");
- my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
+ my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
push @fields, "$tag$subfieldtag";
push (@loop_data, $subfield_data);
$i++;
# We generate form, and fill with values if defined
foreach my $tag ( keys %{$tagslib}){
foreach my $subtag (keys %{$tagslib->{$tag}}){
- next if subfield_is_koha_internal_p($subtag);
+ next if IsMarcStructureInternal($tagslib->{$tag}{$subtag});
next if ($tagslib->{$tag}->{$subtag}->{'tab'} ne "10");
next if any { /^$tag$subtag$/ } @fields;
my @values = (undef);
@values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag)));
for my $value (@values){
- my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
+ my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
push (@loop_data, $subfield_data);
$i++;
}
}
@loop_data = sort {$a->{subfield} cmp $b->{subfield} } @loop_data;
+my $item = Koha::Items->find($itemnumber); # We certainly want to fetch it earlier
+
# what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
-$template->param( title => $record->title() ) if ($record ne "-1");
$template->param(
biblionumber => $biblionumber,
title => $oldrecord->{title},
item_header_loop => \@header_value_loop,
item => \@loop_data,
itemnumber => $itemnumber,
- barcode => GetBarcodeFromItemnumber($itemnumber),
+ barcode => $item ? $item->barcode : undef,
itemtagfield => $itemtagfield,
itemtagsubfield => $itemtagsubfield,
op => $nextop,
opisadd => ($nextop eq "saveitem") ? 0 : 1,
- popup => $input->param('popup') ? 1: 0,
+ popup => scalar $input->param('popup') ? 1: 0,
C4::Search::enabled_staff_search_views,
);
$template->{'VARS'}->{'searchid'} = $searchid;