X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FItems.pm;h=676c91b37ef3b2c6139d1bc2070c1b4b344c83bb;hb=aa114f53499b9cffde0571fe7e08622f9c9a332a;hp=04cb4174f1fbf07ccd4169b226f086f135eaee7c;hpb=bd28b8d6c3ab15ae278d7d9eddc73e3af786e87f;p=koha.git diff --git a/C4/Items.pm b/C4/Items.pm index 04cb4174f1..676c91b37e 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -29,10 +29,6 @@ use C4::Dates qw/format_date format_date_in_iso/; use MARC::Record; use C4::ClassSource; use C4::Log; -use C4::Branch; -require C4::Reserves; -use C4::Charset; -use C4::Acquisition; use List::MoreUtils qw/any/; use Data::Dumper; # used as part of logging item record changes, not just for # debugging; so please don't remove this @@ -82,6 +78,10 @@ BEGIN { GetAnalyticsCount GetItemHolds + + + PrepareItemrecordDisplay + ); } @@ -636,6 +636,7 @@ item that has a given branch code. sub CheckItemPreSave { my $item_ref = shift; + require C4::Branch; my %errors = (); @@ -652,7 +653,7 @@ sub CheckItemPreSave { # check for valid home branch if (exists $item_ref->{'homebranch'} and defined $item_ref->{'homebranch'}) { - my $branch_name = GetBranchName($item_ref->{'homebranch'}); + my $branch_name = C4::Branch::GetBranchName($item_ref->{'homebranch'}); unless (defined $branch_name) { # relies on fact that branches.branchname is a non-NULL column, # so GetBranchName returns undef only if branch does not exist @@ -662,7 +663,7 @@ sub CheckItemPreSave { # check for valid holding branch if (exists $item_ref->{'holdingbranch'} and defined $item_ref->{'holdingbranch'}) { - my $branch_name = GetBranchName($item_ref->{'holdingbranch'}); + my $branch_name = C4::Branch::GetBranchName($item_ref->{'holdingbranch'}); unless (defined $branch_name) { # relies on fact that branches.branchname is a non-NULL column, # so GetBranchName returns undef only if branch does not exist @@ -1184,14 +1185,15 @@ sub GetItemsInfo { items.notforloan as itemnotforloan, itemtypes.description, itemtypes.notforloan as notforloan_per_itemtype, - branchurl + holding.branchurl FROM items - LEFT JOIN branches ON items.holdingbranch = branches.branchcode + LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode + LEFT JOIN branches AS home ON items.homebranch=home.branchcode LEFT JOIN biblio ON biblio.biblionumber = items.biblionumber LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber LEFT JOIN itemtypes ON itemtypes.itemtype = " . (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype'); - $query .= " WHERE items.biblionumber = ? ORDER BY branches.branchname,items.dateaccessioned desc" ; + $query .= " WHERE items.biblionumber = ? ORDER BY home.branchname,items.dateaccessioned desc" ; my $sth = $dbh->prepare($query); $sth->execute($biblionumber); my $i = 0; @@ -1206,7 +1208,6 @@ sub GetItemsInfo { my $ssth = $dbh->prepare("SELECT serialseq,publisheddate from serialitems left join serial on serialitems.serialid=serial.serialid where serialitems.itemnumber=? "); while ( my $data = $sth->fetchrow_hashref ) { my $datedue = ''; - my $count_reserves; $isth->execute( $data->{'itemnumber'} ); if ( my $idata = $isth->fetchrow_hashref ) { $data->{borrowernumber} = $idata->{borrowernumber}; @@ -1226,14 +1227,6 @@ sub GetItemsInfo { $ssth->execute($data->{'itemnumber'}) ; ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array(); $serial = 1; - } - if ( $datedue eq '' ) { - my ( $restype, $reserves, undef ) = - C4::Reserves::CheckReserves( $data->{'itemnumber'} ); -# Previous conditional check with if ($restype) is not needed because a true -# result for one item will result in subsequent items defaulting to this true -# value. - $count_reserves = $restype; } #get branch information..... my $bsth = $dbh->prepare( @@ -1245,7 +1238,6 @@ sub GetItemsInfo { $data->{'branchname'} = $bdata->{'branchname'}; } $data->{'datedue'} = $datedue; - $data->{'count_reserves'} = $count_reserves; # get notforloan complete status if applicable my $sthnflstatus = $dbh->prepare( @@ -2178,11 +2170,12 @@ sub MoveItemFromBiblio { ModZebra( $tobiblio, "specialUpdate", "biblioserver", undef, undef ); ModZebra( $frombiblio, "specialUpdate", "biblioserver", undef, undef ); # Checking if the item we want to move is in an order - my $order = GetOrderFromItemnumber($itemnumber); + require C4::Acquisition; + my $order = C4::Acquisition::GetOrderFromItemnumber($itemnumber); if ($order) { # Replacing the biblionumber within the order if necessary $order->{'biblionumber'} = $tobiblio; - ModOrder($order); + C4::Acquisition::ModOrder($order); } return $tobiblio; } @@ -2437,9 +2430,9 @@ sub _get_unlinked_subfields_xml { sub _parse_unlinked_item_subfields_from_xml { my $xml = shift; - + require C4::Charset; return unless defined $xml and $xml ne ""; - my $marc = MARC::Record->new_from_xml(StripNonXmlChars($xml),'UTF-8'); + my $marc = MARC::Record->new_from_xml(C4::Charset::StripNonXmlChars($xml),'UTF-8'); my $unlinked_subfields = []; my @fields = $marc->fields(); if ($#fields > -1) { @@ -2497,4 +2490,270 @@ sub GetItemHolds { $holds = $sth->fetchrow; return $holds; } +=head1 OTHER FUNCTIONS + +=head2 _find_value + + ($indicators, $value) = _find_value($tag, $subfield, $record,$encoding); + +Find the given $subfield in the given $tag in the given +MARC::Record $record. If the subfield is found, returns +the (indicators, value) pair; otherwise, (undef, undef) is +returned. + +PROPOSITION : +Such a function is used in addbiblio AND additem and serial-edit and maybe could be used in Authorities. +I suggest we export it from this module. + +=cut + +sub _find_value { + my ( $tagfield, $insubfield, $record, $encoding ) = @_; + my @result; + my $indicator; + if ( $tagfield < 10 ) { + if ( $record->field($tagfield) ) { + push @result, $record->field($tagfield)->data(); + } else { + push @result, ""; + } + } else { + foreach my $field ( $record->field($tagfield) ) { + my @subfields = $field->subfields(); + foreach my $subfield (@subfields) { + if ( @$subfield[0] eq $insubfield ) { + push @result, @$subfield[1]; + $indicator = $field->indicator(1) . $field->indicator(2); + } + } + } + } + return ( $indicator, @result ); +} + + +=head2 PrepareItemrecordDisplay + + PrepareItemrecordDisplay($itemrecord,$bibnum,$itemumber,$frameworkcode); + +Returns a hash with all the fields for Display a given item data in a template + +The $frameworkcode returns the item for the given frameworkcode, ONLY if bibnum is not provided + +=cut + +sub PrepareItemrecordDisplay { + + my ( $bibnum, $itemnum, $defaultvalues, $frameworkcode ) = @_; + + my $dbh = C4::Context->dbh; + $frameworkcode = &GetFrameworkCode($bibnum) if $bibnum; + my ( $itemtagfield, $itemtagsubfield ) = &GetMarcFromKohaField( "items.itemnumber", $frameworkcode ); + my $tagslib = &GetMarcStructure( 1, $frameworkcode ); + + # return nothing if we don't have found an existing framework. + return q{} unless $tagslib; + my $itemrecord; + if ($itemnum) { + $itemrecord = C4::Items::GetMarcItem( $bibnum, $itemnum ); + } + my @loop_data; + my $authorised_values_sth = $dbh->prepare( "SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib" ); + foreach my $tag ( sort keys %{$tagslib} ) { + my $previous_tag = ''; + if ( $tag ne '' ) { + + # loop through each subfield + my $cntsubf; + foreach my $subfield ( sort keys %{ $tagslib->{$tag} } ) { + next if ( subfield_is_koha_internal_p($subfield) ); + next if ( $tagslib->{$tag}->{$subfield}->{'tab'} ne "10" ); + my %subfield_data; + $subfield_data{tag} = $tag; + $subfield_data{subfield} = $subfield; + $subfield_data{countsubfield} = $cntsubf++; + $subfield_data{kohafield} = $tagslib->{$tag}->{$subfield}->{'kohafield'}; + + # $subfield_data{marc_lib}=$tagslib->{$tag}->{$subfield}->{lib}; + $subfield_data{marc_lib} = $tagslib->{$tag}->{$subfield}->{lib}; + $subfield_data{mandatory} = $tagslib->{$tag}->{$subfield}->{mandatory}; + $subfield_data{repeatable} = $tagslib->{$tag}->{$subfield}->{repeatable}; + $subfield_data{hidden} = "display:none" + if $tagslib->{$tag}->{$subfield}->{hidden}; + my ( $x, $defaultvalue ); + if ($itemrecord) { + ( $x, $defaultvalue ) = _find_value( $tag, $subfield, $itemrecord ); + } + $defaultvalue = $tagslib->{$tag}->{$subfield}->{defaultvalue} unless $defaultvalue; + if ( !defined $defaultvalue ) { + $defaultvalue = q||; + } + $defaultvalue =~ s/"/"/g; + + # search for itemcallnumber if applicable + if ( $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.itemcallnumber' + && C4::Context->preference('itemcallnumber') ) { + my $CNtag = substr( C4::Context->preference('itemcallnumber'), 0, 3 ); + my $CNsubfield = substr( C4::Context->preference('itemcallnumber'), 3, 1 ); + if ($itemrecord) { + my $temp = $itemrecord->field($CNtag); + if ($temp) { + $defaultvalue = $temp->subfield($CNsubfield); + } + } + } + if ( $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.itemcallnumber' + && $defaultvalues + && $defaultvalues->{'callnumber'} ) { + my $temp; + if ($itemrecord) { + $temp = $itemrecord->field($subfield); + } + unless ($temp) { + $defaultvalue = $defaultvalues->{'callnumber'} if $defaultvalues; + } + } + if ( ( $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.holdingbranch' || $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.homebranch' ) + && $defaultvalues + && $defaultvalues->{'branchcode'} ) { + my $temp; + if ($itemrecord) { + $temp = $itemrecord->field($subfield); + } + unless ($temp) { + $defaultvalue = $defaultvalues->{branchcode} if $defaultvalues; + } + } + if ( ( $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.location' ) + && $defaultvalues + && $defaultvalues->{'location'} ) { + my $temp = $itemrecord->field($subfield) if ($itemrecord); + unless ($temp) { + $defaultvalue = $defaultvalues->{location} if $defaultvalues; + } + } + if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) { + my @authorised_values; + my %authorised_lib; + + # builds list, depending on authorised value... + #---- branch + if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) { + if ( ( C4::Context->preference("IndependantBranches") ) + && ( C4::Context->userenv->{flags} % 2 != 1 ) ) { + my $sth = $dbh->prepare( "SELECT branchcode,branchname FROM branches WHERE branchcode = ? ORDER BY branchname" ); + $sth->execute( C4::Context->userenv->{branch} ); + push @authorised_values, "" + unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + while ( my ( $branchcode, $branchname ) = $sth->fetchrow_array ) { + push @authorised_values, $branchcode; + $authorised_lib{$branchcode} = $branchname; + } + } else { + my $sth = $dbh->prepare( "SELECT branchcode,branchname FROM branches ORDER BY branchname" ); + $sth->execute; + push @authorised_values, "" + unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + while ( my ( $branchcode, $branchname ) = $sth->fetchrow_array ) { + push @authorised_values, $branchcode; + $authorised_lib{$branchcode} = $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} ); + while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) { + push @authorised_values, $itemtype; + $authorised_lib{$itemtype} = $description; + } + #---- class_sources + } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "cn_source" ) { + push @authorised_values, "" unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + + my $class_sources = GetClassSources(); + my $default_source = C4::Context->preference("DefaultClassificationSource"); + + foreach my $class_source (sort keys %$class_sources) { + next unless $class_sources->{$class_source}->{'used'} or + ($class_source eq $default_source); + push @authorised_values, $class_source; + $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'}; + } + + #---- "true" authorised value + } else { + $authorised_values_sth->execute( $tagslib->{$tag}->{$subfield}->{authorised_value} ); + push @authorised_values, "" + unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) { + push @authorised_values, $value; + $authorised_lib{$value} = $lib; + } + } + $subfield_data{marc_value} = CGI::scrolling_list( + -name => 'field_value', + -values => \@authorised_values, + -default => "$defaultvalue", + -labels => \%authorised_lib, + -size => 1, + -tabindex => '', + -multiple => 0, + ); + } elsif ( $tagslib->{$tag}->{$subfield}->{value_builder} ) { + # opening plugin + my $plugin = C4::Context->intranetdir . "/cataloguing/value_builder/" . $tagslib->{$tag}->{$subfield}->{'value_builder'}; + if (do $plugin) { + my $temp; + my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, undef ); + my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, undef ); + $subfield_data{random} = int(rand(1000000)); # why do we need 2 different randoms? + my $index_subfield = int(rand(1000000)); + $subfield_data{id} = "tag_".$tag."_subfield_".$subfield."_".$index_subfield; + $subfield_data{marc_value} = qq[ + ... + $javascript]; + } else { + warn "Plugin Failed: $plugin"; + $subfield_data{marc_value} = qq(); # supply default input form + } + } + elsif ( $tag eq '' ) { # it's an hidden field + $subfield_data{marc_value} = qq(); + } + elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) { # FIXME: shouldn't input type be "hidden" ? + $subfield_data{marc_value} = qq(); + } + elsif ( length($defaultvalue) > 100 + or (C4::Context->preference("marcflavour") eq "UNIMARC" and + 300 <= $tag && $tag < 400 && $subfield eq 'a' ) + or (C4::Context->preference("marcflavour") eq "MARC21" and + 500 <= $tag && $tag < 600 ) + ) { + # oversize field (textarea) + $subfield_data{marc_value} = qq(\n"); + } else { + $subfield_data{marc_value} = ""; + } + push( @loop_data, \%subfield_data ); + } + } + } + my $itemnumber; + if ( $itemrecord && $itemrecord->field($itemtagfield) ) { + $itemnumber = $itemrecord->subfield( $itemtagfield, $itemtagsubfield ); + } + return { + 'itemtagfield' => $itemtagfield, + 'itemtagsubfield' => $itemtagsubfield, + 'itemnumber' => $itemnumber, + 'iteminformation' => \@loop_data + }; +} + 1;