my $record = GetMarcItem( $biblionumber, $itemnumber );
my ($tagfield, $tagsubfield) = GetMarcFromKohaField( $itemfield,'');
- if ($tagfield && $tagsubfield) {
+ # FIXME - the condition is done this way because GetMarcFromKohaField
+ # returns (0, 0) if it can't field a MARC tag for the kohafield. However,
+ # some fields like items.wthdrawn are mapped to subfield $0, making the
+ # customary test of "if ($tagfield && $tagsubfield)" incorrect.
+ # GetMarcFromKohaField should probably be returning (undef, undef), making
+ # the correct test "if (defined $tagfield && defined $tagsubfield)", but
+ # this would be a large change and consequently deferred for after 3.0.
+ if (not(int($tagfield) == 0 && int($tagsubfield) == 0)) {
my $tag = $record->field($tagfield);
if ($tag) {
# my $tagsubs = $record->field($tagfield)->subfield($tagsubfield);
$tag->update( $tagsubfield => $newvalue );
$record->delete_field($tag);
$record->insert_fields_ordered($tag);
- &ModItemInMarc( $record, $biblionumber, $itemnumber, 0 );
+ my $frameworkcode = GetFrameworkCode( $biblionumber );
+ &ModItemInMarc( $record, $biblionumber, $itemnumber, $frameworkcode );
}
}
}
=over
-&ModItemInMarc( $record, $biblionumber, $itemnumber )
+&ModItemInMarc( $record, $biblionumber, $itemnumber, $frameworkcode )
=back
my ( $date_due, $count_reserves );
my $isth = $dbh->prepare(
- "SELECT issues.*,borrowers.cardnumber,borrowers.surname,borrowers.firstname
+ "SELECT issues.*,borrowers.cardnumber,borrowers.surname,borrowers.firstname,borrowers.branchcode as bcode
FROM issues LEFT JOIN borrowers ON issues.borrowernumber=borrowers.borrowernumber
WHERE itemnumber = ?
AND returndate IS NULL"
$data->{surname} = $idata->{surname};
$data->{firstname} = $idata->{firstname};
$datedue = format_date( $idata->{'date_due'} );
+ if (C4::Context->preference("IndependantBranches")){
+ my $userenv = C4::Context->userenv;
+ if ( ($userenv) && ( $userenv->{flags} != 1 ) ) {
+ $data->{'NOTSAMEBRANCH'} = 1 if ($idata->{'bcode'} ne $userenv->{branch});
+ }
+ }
}
if ( $datedue eq '' ) {
#$datedue="Available";
my ( $restype, $reserves ) =
C4::Reserves::CheckReserves( $data->{'itemnumber'} );
if ($restype) {
-
#$datedue=$restype;
$count_reserves = $restype;
}
sub GetMarcItem {
my ( $biblionumber, $itemnumber ) = @_;
- my $dbh = C4::Context->dbh;
- my $newrecord = MARC::Record->new();
- my $marcflavour = C4::Context->preference('marcflavour');
-
- my $marcxml = GetXmlBiblio($biblionumber);
- my $record = MARC::Record->new();
- $record = MARC::Record::new_from_xml( $marcxml, "utf8", $marcflavour );
- # now, find where the itemnumber is stored & extract only the item
- my ( $itemnumberfield, $itemnumbersubfield ) =
- GetMarcFromKohaField( 'items.itemnumber', '' );
- my @fields = $record->field($itemnumberfield);
- foreach my $field (@fields) {
- if ( $field->subfield($itemnumbersubfield) eq $itemnumber ) {
- $newrecord->insert_fields_ordered($field);
- }
- }
- return $newrecord;
+
+ # GetMarcItem has been revised so that it does the following:
+ # 1. Gets the item information from the items table.
+ # 2. Converts it to a MARC field for storage in the bib record.
+ #
+ # The previous behavior was:
+ # 1. Get the bib record.
+ # 2. Return the MARC tag corresponding to the item record.
+ #
+ # The difference is that one treats the items row as authoritative,
+ # while the other treats the MARC representation as authoritative
+ # under certain circumstances.
+ #
+ # FIXME - a big one
+ #
+ # As of 2007-11-27, this change hopefully does not introduce
+ # any bugs. However, it does mean that for code that uses
+ # ModItemInMarconefield to update one subfield (corresponding to
+ # an items column) is now less efficient.
+ #
+ # The API needs to be shifted to the following:
+ # 1. User updates items record.
+ # 2. Linked bib is sent for indexing.
+ #
+ # The missing step 1.5 is updating the item tag in the bib MARC record
+ # so that the indexes are updated. Depending on performance considerations,
+ # this may ultimately mean of of the following:
+ # a. MARC field for item is updated right away.
+ # b. MARC field for item is updated only as part of indexing.
+ # c. MARC field for item is never actually stored in bib record; instead
+ # it is generated only when needed for indexing, item export, and
+ # (maybe) OPAC display.
+ #
+
+ my $itemrecord = GetItem($itemnumber);
+
+ # Tack on 'items.' prefix to column names so that TransformKohaToMarc will work.
+ # Also, don't emit a subfield if the underlying field is blank.
+ my $mungeditem = { map { $itemrecord->{$_} ne '' ? ("items.$_" => $itemrecord->{$_}) : () } keys %{ $itemrecord } };
+
+ my $itemmarc = TransformKohaToMarc($mungeditem);
+ return $itemmarc;
+
}
my @subfields = $field->subfields();
my $counter = 0;
my @link_loop;
+ # if there is an authority link, build the link with an= subfield9
+ my $subfield9 = $field->subfield('9');
for my $subject_subfield (@subfields ) {
# don't load unimarc subfields 3,4,5
next if (($marcflavour eq "UNIMARC") and ($subject_subfield->[0] =~ (3|4|5) ) );
my $linkvalue = $value;
$linkvalue =~ s/(\(|\))//g;
my $operator = " and " unless $counter==0;
- push @link_loop, {link => $linkvalue, operator => $operator };
+ if ($subfield9) {
+ @link_loop = ({'limit' => 'an' ,link => "$subfield9" });
+ } else {
+ push @link_loop, {'limit' => 'su', link => $linkvalue, operator => $operator };
+ }
my $separator = C4::Context->preference("authoritysep") unless $counter==0;
# ignore $9
push @subfields_loop, {code => $code, value => $value, link_loop => \@link_loop, separator => $separator} unless ($subject_subfield->[0] == 9 );
$maxtag = "720";
}
elsif ( $marcflavour eq "UNIMARC" ) { # assume unimarc if not marc21
- $mintag = "701";
+ $mintag = "700";
$maxtag = "712";
}
else {
my %indexes;
foreach my $line (split /('|"),/,$index) {
$line =~ /(.*)=>(.*)/;
+warn $line;
my $index = substr($1,1); # get the index, don't forget to remove initial ' or "
my $fields = $2;
- $index =~ s/'|"| //g;
- $fields =~ s/'|"| //g;
+ $index =~ s/'|"|\s//g;
+
+
+ $fields =~ s/'|"|\s//g;
$indexes{$index}=$fields;
}
return %indexes;
projects / koha_fer / blobdiff