use Modern::Perl;
-#use warnings; FIXME - Bug 2505
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
sub set_item_default_location {
my $itemnumber = shift;
- my $item = GetItem( $itemnumber );
+ my $item = Koha::Items->find($itemnumber);
if ( C4::Context->preference('NewItemsDefaultLocation') ) {
- $item->{'permanent_location'} = $item->{'location'};
- $item->{'location'} = C4::Context->preference('NewItemsDefaultLocation');
- ModItem( $item, undef, $itemnumber);
+ $item->permanent_location($item->location);
+ $item->location(C4::Context->preference('NewItemsDefaultLocation'));
}
else {
- $item->{'permanent_location'} = $item->{'location'} if !defined($item->{'permanent_location'});
- ModItem( $item, undef, $itemnumber);
+ # It seems that we are dealing with that in too many places
+ $item->permanent_location($item->location) unless defined $item->permanent_location;
}
+ $item->store;
}
# NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code
# NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript
sub _increment_barcode {
my ($record, $frameworkcode) = @_;
- my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode);
+ my ($tagfield,$tagsubfield) = &GetMarcFromKohaField( "items.barcode" );
unless ($record->field($tagfield)->subfield($tagsubfield)) {
my $sth_barcode = $dbh->prepare("select max(abs(barcode)) from items");
$sth_barcode->execute;
sub generate_subfield_form {
- my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $loop_data, $i, $restrictededition) = @_;
+ my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $loop_data, $i, $restrictededition, $item) = @_;
my $frameworkcode = &GetFrameworkCode($biblionumber);
$subfield_data{subfield} = $subfieldtag;
$subfield_data{marc_lib} ="<span id=\"error$i\" title=\"".$subfieldlib->{lib}."\">".$subfieldlib->{lib}."</span>";
$subfield_data{mandatory} = $subfieldlib->{mandatory};
+ $subfield_data{important} = $subfieldlib->{important};
$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 $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;
+ if ( $value ) {
+ # get today date & replace <<YYYY>>, <<YY>>, <<MM>>, <<DD>> if provided in the default value
+ my $today_dt = dt_from_string;
+ my $year = $today_dt->strftime('%Y');
+ my $shortyear = $today_dt->strftime('%y');
+ my $month = $today_dt->strftime('%m');
+ my $day = $today_dt->strftime('%d');
+ $value =~ s/<<YYYY>>/$year/g;
+ $value =~ s/<<YY>>/$shortyear/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;
+ }
}
-
+
$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 $CNtag = substr($pref_itemcallnumber, 0, 3);
- my $CNsubfield = substr($pref_itemcallnumber, 3, 1);
- my $CNsubfield2 = substr($pref_itemcallnumber, 4, 1);
- my $temp2 = $temp->field($CNtag);
- if ($temp2) {
- $value = ($temp2->subfield($CNsubfield)).' '.($temp2->subfield($CNsubfield2));
- #remove any trailing space incase one subfield is used
- $value =~ s/^\s+|\s+$//g;
+ foreach my $pref_itemcallnumber_part (split(/,/, $pref_itemcallnumber)){
+ my $CNtag = substr( $pref_itemcallnumber_part, 0, 3 ); # 3-digit tag number
+ my $CNsubfields = substr( $pref_itemcallnumber_part, 3 ); # Any and all subfields
+ my $temp2 = $temp->field($CNtag);
+
+ next unless $temp2;
+ $value = $temp2->as_string( $CNsubfields, ' ' );
+ last if $value;
}
}
-
+
if ($frameworkcode eq 'FA' && $subfieldlib->{kohafield} eq 'items.barcode' && !$value){
my $input = new CGI;
$value = $input->param('barcode');
my @authorised_values;
my %authorised_lib;
# builds list, depending on authorised value...
- if ( $subfieldlib->{authorised_value} eq "branches" ) {
+ if ( $subfieldlib->{authorised_value} eq "LOST" ) {
+ my $ClaimReturnedLostValue = C4::Context->preference('ClaimReturnedLostValue');
+ my $item_is_return_claim = $ClaimReturnedLostValue && $item && $item->itemlost && $ClaimReturnedLostValue eq $item->itemlost;
+ $subfield_data{IS_RETURN_CLAIM} = $item_is_return_claim;
+
+ $subfield_data{IS_LOST_AV} = 1;
+
+ push @authorised_values, qq{};
+ my $av = GetAuthorisedValues( $subfieldlib->{authorised_value} );
+ for my $r ( @$av ) {
+ push @authorised_values, $r->{authorised_value};
+ $authorised_lib{$r->{authorised_value}} = $r->{lib};
+ }
+ }
+ elsif ( $subfieldlib->{authorised_value} eq "branches" ) {
foreach my $thisbranch (@$branches) {
push @authorised_values, $thisbranch->{branchcode};
$authorised_lib{$thisbranch->{branchcode}} = $thisbranch->{branchname};
}
}
elsif ( $subfieldlib->{authorised_value} eq "itemtypes" ) {
- push @authorised_values, "" unless ( $subfieldlib->{mandatory} );
- my $itemtypes = Koha::ItemTypes->search_with_localization;
+ push @authorised_values, "";
+ my $branch_limit = C4::Context->userenv && C4::Context->userenv->{"branch"};
+ my $itemtypes;
+ if($branch_limit) {
+ $itemtypes = Koha::ItemTypes->search_with_localization({branchcode => $branch_limit});
+ } else {
+ $itemtypes = Koha::ItemTypes->search_with_localization;
+ }
while ( my $itemtype = $itemtypes->next ) {
push @authorised_values, $itemtype->itemtype;
$authorised_lib{$itemtype->itemtype} = $itemtype->translated_description;
#---- 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};
$subfield_data{marc_value} = {
type => 'hidden',
id => $subfield_data{id},
- maxlength => $subfield_data{max_length},
+ maxlength => $subfield_data{maxlength},
value => $value,
+ ( ( grep { $_ eq $subfieldlib->{authorised_value}} ( qw(branches itemtypes cn_source) ) ) ? () : ( category => $subfieldlib->{authorised_value}) ),
};
}
else {
values => \@authorised_values,
labels => \%authorised_lib,
default => $value,
+ ( ( grep { $_ eq $subfieldlib->{authorised_value}} ( qw(branches itemtypes cn_source) ) ) ? () : ( category => $subfieldlib->{authorised_value}) ),
};
}
}
$subfield_data{marc_value} = {
type => 'text_auth',
id => $subfield_data{id},
- maxlength => $subfield_data{max_length},
+ maxlength => $subfield_data{maxlength},
value => $value,
authtypecode => $subfieldlib->{authtypecode},
};
$subfield_data{marc_value} = {
type => 'text_plugin',
id => $subfield_data{id},
- maxlength => $subfield_data{max_length},
+ maxlength => $subfield_data{maxlength},
value => $value,
class => $class,
nopopup => $plugin->noclick,
$subfield_data{marc_value} = {
type => 'text',
id => $subfield_data{id},
- maxlength => $subfield_data{max_length},
+ maxlength => $subfield_data{maxlength},
value => $value,
}; # supply default input form
}
$subfield_data{marc_value} = {
type => 'hidden',
id => $subfield_data{id},
- maxlength => $subfield_data{max_length},
+ maxlength => $subfield_data{maxlength},
value => $value,
};
}
$subfield_data{marc_value} = {
type => 'text',
id => $subfield_data{id},
- maxlength => $subfield_data{max_length},
+ maxlength => $subfield_data{maxlength},
value => $value,
};
}
elsif (
- length($value) > 100
+ (
+ $value and length($value) > 100
+ )
or (
C4::Context->preference("marcflavour") eq "UNIMARC"
and 300 <= $tag && $tag < 400 && $subfieldtag eq 'a'
$subfield_data{marc_value} = {
type => 'text',
id => $subfield_data{id},
- maxlength => $subfield_data{max_length},
+ maxlength => $subfield_data{maxlength},
value => $value,
};
}
my $subfieldsToAllowForRestrictedEditing = C4::Context->preference('SubfieldsToAllowForRestrictedEditing');
my $allowAllSubfields = (
not defined $subfieldsToAllowForRestrictedEditing
- or $subfieldsToAllowForRestrictedEditing == q||
+ or $subfieldsToAllowForRestrictedEditing eq q||
) ? 1 : 0;
my @subfieldsToAllow = split(/ /, $subfieldsToAllowForRestrictedEditing);
my $item = shift;
# Getting item tag
- my ($tag, $subtag) = GetMarcFromKohaField("items.barcode", '');
+ my ($tag, $subtag) = GetMarcFromKohaField( "items.barcode" );
# Getting list of subfields to keep
my $subfieldsToUseWhenPrefill = C4::Context->preference('SubfieldsToUseWhenPrefill');
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');
my $tagslib = &GetMarcStructure(1,$frameworkcode);
my $record = GetMarcBiblio({ biblionumber => $biblionumber });
+
+output_and_exit_if_error( $input, $cookie, $template,
+ { module => 'cataloguing', record => $record } );
+
my $oldrecord = TransformMarcToKoha($record);
my $itemrecord;
my $nextop="additem";
}
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 ($tagfield,$tagsubfield) = &GetMarcFromKohaField( "items.barcode" );
my $fieldItem = $itemrecord->field($tagfield);
$itemrecord->delete_field($fieldItem);
$fieldItem->delete_subfields($tagsubfield);
use C4::Barcodes;
my $barcodeobj = C4::Barcodes->new;
+ my $copynumber = $addedolditem->{'copynumber'};
my $oldbarcode = $addedolditem->{'barcode'};
- my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode);
+ my ($tagfield,$tagsubfield) = &GetMarcFromKohaField( "items.barcode" );
+ my ($copytagfield,$copytagsubfield) = &GetMarcFromKohaField( "items.copynumber" );
# If there is a barcode and we can't find their new values, we can't add multiple copies
my $testbarcode;
# Putting it into the record
if ($barcodevalue) {
- $record->field($tagfield)->update($tagsubfield => $barcodevalue);
+ if ( C4::Context->preference("autoBarcode") eq 'hbyymmincr' && $i > 0 ) { # The first copy already contains the homebranch prefix
+ # This is terribly hacky but the easiest way to fix the way hbyymmincr is working
+ # Contrary to what one might think, the barcode plugin does not prefix the returned string with the homebranch
+ # For a single item, it is handled with some JS code (see cataloguing/value_builder/barcode.pl)
+ # But when adding multiple copies we need to prefix it here,
+ # so we retrieve the homebranch from the item and prefix the barcode with it.
+ my ($hb_field, $hb_subfield) = GetMarcFromKohaField( "items.homebranch" );
+ my $homebranch = $record->subfield($hb_field, $hb_subfield);
+ $barcodevalue = $homebranch . $barcodevalue;
+ }
+ $record->field($tagfield)->update($tagsubfield => $barcodevalue);
}
# Checking if the barcode already exists
$exist_itemnumber = get_item_from_barcode($barcodevalue);
}
+ # Updating record with the new copynumber
+ if ( $copynumber ){
+ $record->field($copytagfield)->update($copytagsubfield => $copynumber);
+ }
# Adding the item
if (!$exist_itemnumber) {
- my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber);
+ my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) =
+ AddItemFromMarc( $record, $biblionumber, { skip_modzebra_update => 1 } );
set_item_default_location($oldbibitemnum);
# We count the item only if it was really added
# That way, all items are added, even if there was some already existing barcodes
# FIXME : Please note that there is a risk of infinite loop here if we never find a suitable barcode
$i++;
+ # Only increment copynumber if item was really added
+ $copynumber++ if ( $copynumber && $copynumber =~ m/^\d+$/ );
}
# Preparing the next iteration
$oldbarcode = $barcodevalue;
}
+
+ C4::Biblio::ModZebra( $biblionumber, "specialUpdate", "biblioserver" );
+
undef($itemrecord);
}
}
}
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 ($tagfield,$tagsubfield) = &GetMarcFromKohaField( "items.barcode" );
my $fieldItem = $itemrecord->field($tagfield);
$itemrecord->delete_field($fieldItem);
$fieldItem->delete_subfields($tagsubfield);
} elsif ($op eq "delitem") {
#-------------------------------------------------------------------------------
# check that there is no issue on this item before deletion.
- $error = &DelItemCheck( $biblionumber,$itemnumber);
- if($error == 1){
+ my $item = Koha::Items->find($itemnumber);
+ $error = $item->safe_delete;
+ if(ref($error) eq 'Koha::Item'){
print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&searchid=$searchid");
}else{
push @errors,$error;
#-------------------------------------------------------------------------------
} elsif ($op eq "delallitems") {
#-------------------------------------------------------------------------------
- my $itemnumbers = C4::Items::GetItemnumbersForBiblio( $biblionumber );
- foreach my $itemnumber ( @$itemnumbers ) {
- $error = C4::Items::DelItemCheck( $biblionumber, $itemnumber );
- next if $error == 1; # Means ok
+ my $items = Koha::Items->search({ biblionumber => $biblionumber });
+ while ( my $item = $items->next ) {
+ $error = $item->safe_delete({ skip_modzebra_update => 1 });
+ next if ref $error eq 'Koha::Item'; # Deleted item is returned if deletion successful
push @errors,$error;
}
+ C4::Biblio::ModZebra( $biblionumber, "specialUpdate", "biblioserver" );
if ( @errors ) {
$nextop="additem";
} else {
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);
+ my $item = Koha::Items->find($itemnumber );
+ my $newitem = ModItemFromMarc($itemtosave, $biblionumber, $itemnumber);
+ $itemnumber = q{};
+ my $olditemlost = $item->itemlost;
+ my $newitemlost = $newitem->{itemlost};
+ if ( $newitemlost && $newitemlost ge '1' && !$olditemlost ) {
+ LostItem( $item->itemnumber, 'additem' )
+ }
}
$nextop="additem";
} elsif ($op eq "delinkitem"){
my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code
my @big_array;
#---- finds where items.itemnumber is stored
-my ( $itemtagfield, $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", $frameworkcode);
-my ($branchtagfield, $branchtagsubfield) = &GetMarcFromKohaField("items.homebranch", $frameworkcode);
-C4::Biblio::EmbedItemsInMarcBiblio($temp, $biblionumber);
+my ( $itemtagfield, $itemtagsubfield) = &GetMarcFromKohaField( "items.itemnumber" );
+my ($branchtagfield, $branchtagsubfield) = &GetMarcFromKohaField( "items.homebranch" );
+C4::Biblio::EmbedItemsInMarcBiblio({
+ marc_record => $temp,
+ biblionumber => $biblionumber });
my @fields = $temp->fields();
biblionumber => $hostbiblionumber,
embed_items => 1 });
if ($hostrecord) {
- my ($itemfield, undef) = GetMarcFromKohaField( 'items.itemnumber', GetFrameworkCode($hostbiblionumber) );
+ my ($itemfield, undef) = GetMarcFromKohaField( 'items.itemnumber' );
foreach my $hostitem ($hostrecord->field($itemfield)){
if ($hostitem->subfield('9') eq $hostfield->subfield('9')){
push (@fields, $hostitem);
}
}
-
foreach my $field (@fields) {
next if ( $field->tag() < 10 );
}
$this_row{itemnumber} = $subfieldvalue if ($field->tag() eq $itemtagfield && $subfieldcode eq $itemtagsubfield);
- 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;
- }
- }
-
-# 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);
}
}
-my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField("items.holdingbranch",$frameworkcode);
+my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField( "items.holdingbranch" );
@big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array;
# now, construct template !
my @header_value_loop;
for my $row ( @big_array ) {
my %row_data;
- my @item_fields = map +{ field => $_ || '' }, @$row{ sort keys(%witness) };
+ my @item_fields;
+ foreach my $key (sort keys %witness){
+ my $item_field;
+ if ( $row->{$key} ){
+ $item_field->{field} = $row->{$key};
+ } else {
+ $item_field->{field} = '';
+ }
+
+ for my $kohafield (
+ qw( items.dateaccessioned items.onloan items.datelastseen items.datelastborrowed items.replacementpricedate )
+ )
+ {
+ my ( undef, $subfield ) = GetMarcFromKohaField($kohafield);
+ next unless $key eq $subfield;
+ $item_field->{datatype} = 'date';
+ }
+
+ push @item_fields, $item_field;
+ }
$row_data{item_value} = [ @item_fields ];
$row_data{itemnumber} = $row->{itemnumber};
#reporting this_row values
my @loop_data =();
my $i=0;
-my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');
-
my $branch = $input->param('branch') || C4::Context->userenv->{branch};
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
}
+my $item = Koha::Items->find($itemnumber);
+
# We generate form, from actuel record
@fields = ();
if($itemrecord){
next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");
- my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
+ my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition, $item);
push @fields, "$tag$subfieldtag";
push (@loop_data, $subfield_data);
$i++;
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}, $libraries, $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, $item);
push (@loop_data, $subfield_data);
$i++;
}
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 => scalar $input->param('popup') ? 1: 0,
C4::Search::enabled_staff_search_views,
);
projects / koha-equinox.git / blobdiff