X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=cataloguing%2Fadditem.pl;h=268ef66e21ae0b274ca3f28c80670607a0c6337c;hb=1aeb1d7e0b4c027b0277f5f5878a3b047abd4b82;hp=f9708909650f9638112c6b5d93de07da826b81ca;hpb=6e60986819e9c37e3d41584b89fbddbf68e7484d;p=koha_fer
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index f970890965..268ef66e21 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -27,17 +27,21 @@ 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::ClassSource;
use C4::Dates;
use List::MoreUtils qw/any/;
use C4::Search;
+use Storable qw(thaw freeze);
+use URI::Escape;
+
use MARC::File::XML;
use URI::Escape;
-my $dbh = C4::Context->dbh;
+our $dbh = C4::Context->dbh;
sub find_value {
my ($tagfield,$insubfield,$record) = @_;
@@ -104,8 +108,7 @@ sub generate_subfield_form {
my $frameworkcode = &GetFrameworkCode($biblionumber);
my %subfield_data;
- my $dbh = C4::Context->dbh;
- my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib");
+ my $dbh = C4::Context->dbh;
my $index_subfield = int(rand(1000000));
if ($subfieldtag eq '@'){
@@ -151,7 +154,8 @@ sub generate_subfield_form {
my $input = new CGI;
$value = $input->param('barcode');
}
- my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="$subfield_data{maxlength}" );
+ my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="50" maxlength="$subfield_data{maxlength}" );
+ my $attributes_no_value_textarea = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" rows="5" cols="64" );
my $attributes = qq($attributes_no_value value="$value" );
if ( $subfieldlib->{authorised_value} ) {
@@ -200,11 +204,11 @@ sub generate_subfield_form {
#---- "true" authorised value
}
else {
- push @authorised_values, "" unless ( $subfieldlib->{mandatory} );
- $authorised_values_sth->execute( $subfieldlib->{authorised_value} );
- while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
- push @authorised_values, $value;
- $authorised_lib{$value} = $lib;
+ push @authorised_values, qq{} unless ( $subfieldlib->{mandatory} );
+ my $av = GetAuthorisedValues( $subfieldlib->{authorised_value} );
+ for my $r ( @$av ) {
+ push @authorised_values, $r->{authorised_value};
+ $authorised_lib{$r->{authorised_value}} = $r->{lib};
}
}
@@ -244,7 +248,7 @@ sub generate_subfield_form {
my $change = index($javascript, 'function Change') > -1 ?
"return Change$function_name($subfield_data{random}, '$subfield_data{id}');" :
'return 1;';
- $subfield_data{marc_value} = qq[
@@ -252,7 +256,7 @@ sub generate_subfield_form {
$javascript];
} else {
warn "Plugin Failed: $plugin";
- $subfield_data{marc_value} = ""; # supply default input form
+ $subfield_data{marc_value} = ""; # supply default input form
}
}
elsif ( $tag eq '' ) { # it's an hidden field
@@ -268,15 +272,42 @@ sub generate_subfield_form {
500 <= $tag && $tag < 600 )
) {
# oversize field (textarea)
- $subfield_data{marc_value} = "\n";
+ $subfield_data{marc_value} = "\n";
} else {
# it's a standard field
- $subfield_data{marc_value} = "";
+ $subfield_data{marc_value} = "";
}
return \%subfield_data;
}
+# Removes some subfields when prefilling items
+# This function will remove any subfield that is not in the SubfieldsToUseWhenPrefill syspref
+sub removeFieldsForPrefill {
+
+ my $item = shift;
+
+ # Getting item tag
+ my ($tag, $subtag) = GetMarcFromKohaField("items.barcode", '');
+
+ # Getting list of subfields to keep
+ my $subfieldsToUseWhenPrefill = C4::Context->preference('SubfieldsToUseWhenPrefill');
+
+ # Removing subfields that are not in the syspref
+ if ($tag && $subfieldsToUseWhenPrefill) {
+ my $field = $item->field($tag);
+ my @subfieldsToUse= split(/ /,$subfieldsToUseWhenPrefill);
+ foreach my $subfield ($field->subfields()) {
+ if (!grep { $subfield->[0] eq $_ } @subfieldsToUse) {
+ $field->delete_subfield(code => $subfield->[0]);
+ }
+
+ }
+ }
+
+ return $item;
+
+}
my $input = new CGI;
my $error = $input->param('error');
@@ -285,6 +316,13 @@ my $itemnumber = $input->param('itemnumber');
my $op = $input->param('op');
my $hostitemnumber = $input->param('hostitemnumber');
my $marcflavour = C4::Context->preference("marcflavour");
+my $searchid = $input->param('searchid');
+# fast cataloguing datas
+my $fa_circborrowernumber = $input->param('circborrowernumber');
+my $fa_barcode = $input->param('barcode');
+my $fa_branch = $input->param('branch');
+my $fa_stickyduedate = $input->param('stickyduedate');
+my $fa_duedatespec = $input->param('duedatespec');
my $frameworkcode = &GetFrameworkCode($biblionumber);
@@ -315,9 +353,26 @@ my $oldrecord = TransformMarcToKoha($dbh,$record);
my $itemrecord;
my $nextop="additem";
my @errors; # store errors found while checking data BEFORE saving item.
+
+# Getting last created item cookie
+my $prefillitem = C4::Context->preference('PrefillItem');
+my $justaddeditem;
+my $cookieitemrecord;
+if ($prefillitem) {
+ my $lastitemcookie = $input->cookie('LastCreatedItem');
+ if ($lastitemcookie) {
+ $lastitemcookie = uri_unescape($lastitemcookie);
+ if ( thaw($lastitemcookie) ) {
+ $cookieitemrecord = thaw($lastitemcookie) ;
+ $cookieitemrecord = removeFieldsForPrefill($cookieitemrecord);
+ }
+ }
+}
+
#-------------------------------------------------------------------------------
if ($op eq "additem") {
-#-------------------------------------------------------------------------------
+
+ #-------------------------------------------------------------------------------
# rebuild
my @tags = $input->param('tag');
my @subfields = $input->param('subfield');
@@ -334,26 +389,51 @@ if ($op eq "additem") {
my $add_multiple_copies_submit = $input->param('add_multiple_copies_submit');
my $number_of_copies = $input->param('number_of_copies');
- if (C4::Context->preference('autoBarcode') eq 'incremental') {
+ # This is a bit tricky : if there is a cookie for the last created item and
+ # we just added an item, the cookie value is not correct yet (it will be updated
+ # next page). To prevent the form from being filled with outdated values, we
+ # force the use of "add and duplicate" feature, so the form will be filled with
+ # correct values.
+ $add_duplicate_submit = 1 if ($prefillitem);
+ $justaddeditem = 1;
+
+ # if autoBarcode is set to 'incremental', calculate barcode...
+ if ( C4::Context->preference('autoBarcode') eq 'incremental' ) {
$record = _increment_barcode($record, $frameworkcode);
}
- my $addedolditem = TransformMarcToKoha($dbh,$record);
+ my $addedolditem = TransformMarcToKoha( $dbh, $record );
# If we have to add or add & duplicate, we add the item
- if ($add_submit || $add_duplicate_submit) {
- # check for item barcode # being unique
- my $exist_itemnumber = get_item_from_barcode($addedolditem->{'barcode'});
- push @errors,"barcode_not_unique" if($exist_itemnumber);
- # if barcode exists, don't create, but report The problem.
- unless ($exist_itemnumber) {
- my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber);
- set_item_default_location($oldbibitemnum);
- }
- $nextop = "additem";
- if ($exist_itemnumber) {
- $itemrecord = $record;
- }
+ if ( $add_submit || $add_duplicate_submit ) {
+
+ # check for item barcode # being unique
+ my $exist_itemnumber = get_item_from_barcode( $addedolditem->{'barcode'} );
+ push @errors, "barcode_not_unique" if ($exist_itemnumber);
+
+ # if barcode exists, don't create, but report The problem.
+ unless ($exist_itemnumber) {
+ my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) = AddItemFromMarc( $record, $biblionumber );
+ set_item_default_location($oldbibitemnum);
+
+ # Pushing the last created item cookie back
+ if ($prefillitem && defined $record) {
+ my $itemcookie = $input->cookie(
+ -name => 'LastCreatedItem',
+ # We uri_escape the whole freezed structure so we're sure we won't have any encoding problems
+ -value => uri_escape_utf8( freeze( $record ) ),
+ -HttpOnly => 1,
+ -expires => ''
+ );
+
+ $cookie = [ $cookie, $itemcookie ];
+ }
+
+ }
+ $nextop = "additem";
+ if ($exist_itemnumber) {
+ $itemrecord = $record;
+ }
}
# If we have to add & duplicate
@@ -370,6 +450,7 @@ if ($op eq "additem") {
$fieldItem->delete_subfields($tagsubfield);
$itemrecord->insert_fields_ordered($fieldItem);
}
+ $itemrecord = removeFieldsForPrefill($itemrecord) if ($prefillitem);
}
# If we have to add multiple copies
@@ -430,13 +511,15 @@ if ($op eq "additem") {
undef($itemrecord);
}
}
- if ($frameworkcode eq 'FA' && $input->param('borrowernumber')){
- my $redirect_string = 'borrowernumber=' . uri_escape($input->param('borrowernumber')) .
- '&barcode=' . uri_escape($input->param('barcode'));
- $redirect_string .= '&duedatespec=' . uri_escape($input->param('duedatespec')) .
- '&stickyduedate=1';
- print $input->redirect("/cgi-bin/koha/circ/circulation.pl?" . $redirect_string);
- exit;
+ if ($frameworkcode eq 'FA' && $fa_circborrowernumber){
+ print $input->redirect(
+ '/cgi-bin/koha/circ/circulation.pl?'
+ .'borrowernumber='.$fa_circborrowernumber
+ .'&barcode='.uri_escape($fa_barcode)
+ .'&duedatespec='.$fa_duedatespec
+ .'&stickyduedate=1'
+ );
+ exit;
}
@@ -452,7 +535,7 @@ if ($op eq "additem") {
# check that there is no issue on this item before deletion.
$error = &DelItemCheck($dbh,$biblionumber,$itemnumber);
if($error == 1){
- print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode");
+ print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&searchid=$searchid");
}else{
push @errors,$error;
$nextop="additem";
@@ -484,13 +567,13 @@ if ($op eq "additem") {
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");
+ 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");
+ 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");
+ 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");
+ print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber&searchid=$searchid");
}
exit;
}
@@ -519,6 +602,15 @@ if ($op eq "additem") {
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');
+ }
$nextop="additem";
} elsif ($op eq "delinkitem"){
my $analyticfield = '773';
@@ -564,13 +656,16 @@ if ( C4::Context->preference('EasyAnalyticalRecords') ) {
$analyticfield = '461';
}
foreach my $hostfield ($temp->field($analyticfield)){
- if ($hostfield->subfield('0')){
- my $hostrecord = GetMarcBiblio($hostfield->subfield('0'), 1);
- my ($itemfield, undef) = GetMarcFromKohaField( 'items.itemnumber', GetFrameworkCode($hostfield->subfield('0')) );
- foreach my $hostitem ($hostrecord->field($itemfield)){
- if ($hostitem->subfield('9') eq $hostfield->subfield('9')){
- push (@fields, $hostitem);
- push (@hostitemnumbers, $hostfield->subfield('9'));
+ my $hostbiblionumber = $hostfield->subfield('0');
+ if ($hostbiblionumber){
+ my $hostrecord = GetMarcBiblio($hostbiblionumber, 1);
+ if ($hostrecord) {
+ my ($itemfield, undef) = GetMarcFromKohaField( 'items.itemnumber', GetFrameworkCode($hostbiblionumber) );
+ foreach my $hostitem ($hostrecord->field($itemfield)){
+ if ($hostitem->subfield('9') eq $hostfield->subfield('9')){
+ push (@fields, $hostitem);
+ push (@hostitemnumbers, $hostfield->subfield('9'));
+ }
}
}
}
@@ -600,10 +695,10 @@ foreach my $field (@fields) {
|| $subfieldvalue;
}
- if (($field->tag eq $branchtagfield) && ($subfieldcode eq $branchtagsubfield) && C4::Context->preference("IndependantBranches")) {
+ if (($field->tag eq $branchtagfield) && ($subfieldcode eq $branchtagsubfield) && C4::Context->preference("IndependentBranches")) {
#verifying rights
my $userenv = C4::Context->userenv();
- unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $subfieldvalue))){
+ unless (C4::Context->IsSuperLibrarian() or (($userenv->{'branch'} eq $subfieldvalue))){
$this_row{'nomod'} = 1;
}
}
@@ -661,10 +756,11 @@ my $i=0;
my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');
-my $onlymine = C4::Context->preference('IndependantBranches') &&
- C4::Context->userenv &&
- C4::Context->userenv->{flags}!=1 &&
- C4::Context->userenv->{branch};
+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.
@@ -693,6 +789,11 @@ if($itemrecord){
}
# and now we add fields that are empty
+# Using last created item if it exists
+
+$itemrecord = $cookieitemrecord if ($prefillitem and not $justaddeditem and $op ne "edititem");
+
+# 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);
@@ -700,7 +801,7 @@ foreach my $tag ( keys %{$tagslib}){
next if any { /^$tag$subtag$/ } @fields;
my @values = (undef);
- @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)->subfield($subtag)));
+ @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);
push (@loop_data, $subfield_data);
@@ -720,6 +821,7 @@ $template->param(
item_header_loop => \@header_value_loop,
item => \@loop_data,
itemnumber => $itemnumber,
+ barcode => GetBarcodeFromItemnumber($itemnumber),
itemtagfield => $itemtagfield,
itemtagsubfield => $itemtagsubfield,
op => $nextop,
@@ -727,13 +829,18 @@ $template->param(
popup => $input->param('popup') ? 1: 0,
C4::Search::enabled_staff_search_views,
);
+$template->{'VARS'}->{'searchid'} = $searchid;
if ($frameworkcode eq 'FA'){
- $template->{VARS}->{'borrowernumber'}=$input->param('borrowernumber');
- $template->{VARS}->{'barcode'}=$input->param('barcode');
- $template->{VARS}->{'stickyduedate'}=$input->param('stickduedate');
- $template->{VARS}->{'duedatespec'}=$input->param('duedatespec');
-}
+ # fast cataloguing datas
+ $template->param(
+ 'circborrowernumber' => $fa_circborrowernumber,
+ 'barcode' => $fa_barcode,
+ 'branch' => $fa_branch,
+ 'stickyduedate' => $fa_stickyduedate,
+ 'duedatespec' => $fa_duedatespec,
+ );
+}
foreach my $error (@errors) {
$template->param($error => 1);