X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cataloguing%2Faddbiblio.pl;h=9013a4e4be3886b4a54856683e6119d46ba615b2;hb=4f60138080cba847a53b7373c0c98ec42766b8df;hp=f29e41004223ee68db729c2ac58654941b5ddfbc;hpb=5baff558a53fabb7b719bf627064cf2c1680f246;p=koha.git
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index f29e410042..9013a4e4be 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -21,7 +21,7 @@
use strict;
#use warnings; FIXME - Bug 2505
-use CGI;
+use CGI q(-utf8);
use C4::Output;
use C4::Auth;
use C4::Biblio;
@@ -39,6 +39,7 @@ use C4::Charset;
use Date::Calc qw(Today);
use MARC::File::USMARC;
use MARC::File::XML;
+use URI::Escape;
if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) {
MARC::File::XML->default_record_format('UNIMARC');
@@ -93,9 +94,10 @@ sub MARCfindbreeding {
return -1;
}
else {
- # normalize author : probably UNIMARC specific...
+ # normalize author : UNIMARC specific...
if ( C4::Context->preference("z3950NormalizeAuthor")
- and C4::Context->preference("z3950AuthorAuthFields") )
+ and C4::Context->preference("z3950AuthorAuthFields")
+ and C4::Context->preference("marcflavour") eq 'UNIMARC' )
{
my ( $tag, $subfield ) = GetMarcFromKohaField("biblio.author", '');
@@ -170,10 +172,11 @@ sub build_authorized_values_list {
#---- branch
if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
#Use GetBranches($onlymine)
- my $onlymine=C4::Context->preference('IndependantBranches') &&
- C4::Context->userenv &&
- C4::Context->userenv->{flags} % 2 == 0 &&
- C4::Context->userenv->{branch};
+ my $onlymine =
+ C4::Context->preference('IndependentBranches')
+ && C4::Context->userenv
+ && !C4::Context->IsSuperLibrarian()
+ && C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
my @branchloop;
foreach my $thisbranch ( sort keys %$branches ) {
@@ -189,7 +192,8 @@ sub build_authorized_values_list {
"select itemtype,description from itemtypes order by description");
$sth->execute;
push @authorised_values, ""
- unless ( $tagslib->{$tag}->{$subfield}->{defaultvalue} and $tagslib->{$tag}->{$subfield}->{mandatory} );
+ unless ( $tagslib->{$tag}->{$subfield}->{mandatory}
+ && ( $value || $tagslib->{$tag}->{$subfield}->{defaultvalue} ) );
my $itemtype;
@@ -215,35 +219,35 @@ sub build_authorized_values_list {
($class_source eq $default_source);
push @authorised_values, $class_source;
$authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
- $value = $class_source unless ($value);
- $value = $default_source unless ($value);
}
- #---- "true" authorised value
+ $value = $default_source unless $value;
}
else {
+ my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
$authorised_values_sth->execute(
- $tagslib->{$tag}->{$subfield}->{authorised_value} );
+ $tagslib->{$tag}->{$subfield}->{authorised_value},
+ $branch_limit ? $branch_limit : (),
+ );
push @authorised_values, ""
- unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
+ unless ( $tagslib->{$tag}->{$subfield}->{mandatory}
+ && ( $value || $tagslib->{$tag}->{$subfield}->{defaultvalue} ) );
while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
push @authorised_values, $value;
$authorised_lib{$value} = $lib;
}
}
- return CGI::scrolling_list(
- -name => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
- -values => \@authorised_values,
- -default => $value,
- -labels => \%authorised_lib,
- -override => 1,
- -size => 1,
- -multiple => 0,
- -tabindex => 1,
- -id => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
- -class => "input_marceditor",
- );
+ $authorised_values_sth->finish;
+ return {
+ type => 'select',
+ id => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
+ name => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
+ default => $value,
+ values => \@authorised_values,
+ labels => \%authorised_lib,
+ };
+
}
=head2 CreateKey
@@ -293,14 +297,6 @@ sub create_input {
$value =~ s/"/"/g;
- # determine maximum length; 9999 bytes per ISO 2709 except for leader and MARC21 008
- my $max_length = 9999;
- if ($tag eq '000') {
- $max_length = 24;
- } elsif ($tag eq '008' and C4::Context->preference('marcflavour') eq 'MARC21') {
- $max_length = 40;
- }
-
# if there is no value provided but a default value in parameters, get it
if ( $value eq '' ) {
$value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
@@ -335,6 +331,7 @@ sub create_input {
index => $index_tag,
id => "tag_".$tag."_subfield_".$id_subfield."_".$index_tag."_".$index_subfield,
value => $value,
+ maxlength => $tagslib->{$tag}->{$subfield}->{maxlength},
random => CreateKey(),
);
@@ -366,50 +363,33 @@ sub create_input {
defined($tagslib->{$tag}->{'a'}->{authtypecode}) and
$tagslib->{$tag}->{'a'}->{authtypecode} ne '') {
- $subfield_data{marc_value} =
- "";
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 5,
+ maxlength => $subfield_data{maxlength},
+ readonly => 1,
+ };
# it's a thesaurus / authority field
}
elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
- if (C4::Context->preference("BiblioAddsAuthorities")) {
- $subfield_data{marc_value} =
- "
- {$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">![\"Tag](\"/intranet-tmpl/prog/img/edit-tag.png\")
- ";
- } else {
- $subfield_data{marc_value} =
- "{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">
- ";
- }
+ # when authorities auto-creation is allowed, do not set readonly
+ my $is_readonly = !C4::Context->preference("BiblioAddsAuthorities");
+
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ readonly => ($is_readonly) ? 1 : 0,
+ authtype => $tagslib->{$tag}->{$subfield}->{authtypecode},
+ };
+
# it's a plugin field
}
elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
@@ -426,46 +406,44 @@ sub create_input {
my $extended_param = plugin_parameters( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
my ( $function_name, $javascript ) = plugin_javascript( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
- $subfield_data{marc_value} =
- "
-
- $javascript";
+ $subfield_data{marc_value} = {
+ type => 'text_complex',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ function_name => $function_name,
+ index_tag => $index_tag,
+ javascript => $javascript,
+ };
+
} else {
warn "Plugin Failed: $plugin";
# supply default input form
- $subfield_data{marc_value} =
- "
- ";
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ readonly => 0,
+ };
+
}
# it's an hidden field
}
elsif ( $tag eq '' ) {
- $subfield_data{marc_value} =
- "
- ";
+ $subfield_data{marc_value} = {
+ type => 'hidden',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ };
+
}
else {
# it's a standard field
@@ -479,28 +457,25 @@ sub create_input {
&& C4::Context->preference("marcflavour") eq "MARC21" )
)
{
- $subfield_data{marc_value} =
- "
- ";
+ $subfield_data{marc_value} = {
+ type => 'textarea',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ };
+
}
else {
- $subfield_data{marc_value} =
- "
- ";
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ name => $subfield_data{id},
+ value => $value,
+ size => 67,
+ maxlength => $subfield_data{maxlength},
+ readonly => 0,
+ };
+
}
}
$subfield_data{'index_subfield'} = $index_subfield;
@@ -530,12 +505,15 @@ sub build_tabs {
my @loop_data = ();
my $tag;
- my $authorised_values_sth = $dbh->prepare(
- "select authorised_value,lib
- from authorised_values
- where category=? order by lib"
- );
-
+ my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
+ my $query = "SELECT authorised_value, lib
+ FROM authorised_values";
+ $query .= qq{ LEFT JOIN authorised_values_branches ON ( id = av_id )} if $branch_limit;
+ $query .= " WHERE category = ?";
+ $query .= " AND ( branchcode = ? OR branchcode IS NULL )" if $branch_limit;
+ $query .= " GROUP BY lib ORDER BY lib, lib_opac";
+ my $authorised_values_sth = $dbh->prepare( $query );
+
# in this array, we will push all the 10 tabs
# to avoid having 10 tabs in the template : they will all be in the same BIG_LOOP
my @BIG_LOOP;
@@ -675,8 +653,8 @@ sub build_tabs {
foreach my $subfield ( sort( keys %{ $tagslib->{$tag} } ) ) {
next if ( length $subfield != 1 );
next
- if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -5 )
- or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 4 ) )
+ if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -4 )
+ or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 5 ) )
and not ( $subfield eq "9" and
exists($tagslib->{$tag}->{'a'}->{authtypecode}) and
defined($tagslib->{$tag}->{'a'}->{authtypecode}) and
@@ -720,123 +698,44 @@ sub build_tabs {
};
}
}
+ $authorised_values_sth->finish;
$template->param( BIG_LOOP => \@BIG_LOOP );
}
-#
-# sub that tries to find authorities linked to the biblio
-# the sub :
-# - search in the authority DB for the same authid (in $9 of the biblio)
-# - search in the authority DB for the same 001 (in $3 of the biblio in UNIMARC)
-# - search in the authority DB for the same values (exactly) (in all subfields of the biblio)
-# if the authority is found, the biblio is modified accordingly to be connected to the authority.
-# if the authority is not found, it's added, and the biblio is then modified to be connected to the authority.
-#
-
-sub BiblioAddAuthorities{
- my ( $record, $frameworkcode ) = @_;
- my $dbh=C4::Context->dbh;
- my $query=$dbh->prepare(qq|
-SELECT authtypecode,tagfield
-FROM marc_subfield_structure
-WHERE frameworkcode=?
-AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|);
-# SELECT authtypecode,tagfield
-# FROM marc_subfield_structure
-# WHERE frameworkcode=?
-# AND (authtypecode IS NOT NULL OR authtypecode<>\"\")|);
- $query->execute($frameworkcode);
- my ($countcreated,$countlinked);
- while (my $data=$query->fetchrow_hashref){
- foreach my $field ($record->field($data->{tagfield})){
- next if ($field->subfield('3') || $field->subfield('9'));
- # No authorities id in the tag.
- # Search if there is any authorities to link to.
- my $query='at='.$data->{authtypecode}.' ';
- map {$query.= ' and he,ext="'.$_->[1].'"' if ($_->[0]=~/[A-z]/)} $field->subfields();
- my ($error, $results, $total_hits)=SimpleSearch( $query, undef, undef, [ "authorityserver" ] );
- # there is only 1 result
- if ( $error ) {
- warn "BIBLIOADDSAUTHORITIES: $error";
- return (0,0) ;
- }
- if ( @{$results} == 1) {
- my $marcrecord = MARC::File::USMARC::decode($results->[0]);
- $field->add_subfields('9'=>$marcrecord->field('001')->data);
- $countlinked++;
- } elsif (@{$results} > 1) {
- #More than One result
- #This can comes out of a lack of a subfield.
-# my $marcrecord = MARC::File::USMARC::decode($results->[0]);
-# $record->field($data->{tagfield})->add_subfields('9'=>$marcrecord->field('001')->data);
- $countlinked++;
- } else {
- #There are no results, build authority record, add it to Authorities, get authid and add it to 9
- ###NOTICE : This is only valid if a subfield is linked to one and only one authtypecode
- ###NOTICE : This can be a problem. We should also look into other types and rejected forms.
- my $authtypedata=GetAuthType($data->{authtypecode});
- next unless $authtypedata;
- my $marcrecordauth=MARC::Record->new();
- if (C4::Context->preference('marcflavour') eq 'MARC21') {
- $marcrecordauth->leader(' nz a22 o 4500');
- SetMarcUnicodeFlag($marcrecordauth, 'MARC21');
- }
- my $authfield=MARC::Field->new($authtypedata->{auth_tag_to_report},'','',"a"=>"".$field->subfield('a'));
- map { $authfield->add_subfields($_->[0]=>$_->[1]) if ($_->[0]=~/[A-z]/ && $_->[0] ne "a" )} $field->subfields();
- $marcrecordauth->insert_fields_ordered($authfield);
-
- # bug 2317: ensure new authority knows it's using UTF-8; currently
- # only need to do this for MARC21, as MARC::Record->as_xml_record() handles
- # automatically for UNIMARC (by not transcoding)
- # FIXME: AddAuthority() instead should simply explicitly require that the MARC::Record
- # use UTF-8, but as of 2008-08-05, did not want to introduce that kind
- # of change to a core API just before the 3.0 release.
-
- if (C4::Context->preference('marcflavour') eq 'MARC21') {
- $marcrecordauth->insert_fields_ordered(MARC::Field->new('667','','','a'=>"Machine generated authority record."));
- my $cite = $record->author() . ", " . $record->title_proper() . ", " . $record->publication_date() . " ";
- $cite =~ s/^[\s\,]*//;
- $cite =~ s/[\s\,]*$//;
- $cite = "Work cat.: (" . C4::Context->preference('MARCOrgCode') . ")". $record->subfield('999','c') . ": " . $cite;
- $marcrecordauth->insert_fields_ordered(MARC::Field->new('670','','','a'=>$cite));
- }
-
-# warn "AUTH RECORD ADDED : ".$marcrecordauth->as_formatted;
-
- my $authid=AddAuthority($marcrecordauth,'',$data->{authtypecode});
- $countcreated++;
- $field->add_subfields('9'=>$authid);
- }
- }
- }
- return ($countlinked,$countcreated);
-}
-
# ========================
# MAIN
#=========================
my $input = new CGI;
my $error = $input->param('error');
my $biblionumber = $input->param('biblionumber'); # if biblionumber exists, it's a modif, not a new biblio.
+my $parentbiblio = $input->param('parentbiblionumber');
my $breedingid = $input->param('breedingid');
my $z3950 = $input->param('z3950');
my $op = $input->param('op');
my $mode = $input->param('mode');
my $frameworkcode = $input->param('frameworkcode');
my $redirect = $input->param('redirect');
+my $searchid = $input->param('searchid');
my $dbh = C4::Context->dbh;
my $hostbiblionumber = $input->param('hostbiblionumber');
my $hostitemnumber = $input->param('hostitemnumber');
+# fast cataloguing datas in transit
+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 $userflags = 'edit_catalogue';
-if ($frameworkcode eq 'FA'){
- $userflags = 'fast_cataloging';
-}
+my $changed_framework = $input->param('changed_framework');
$frameworkcode = &GetFrameworkCode($biblionumber)
if ( $biblionumber and not($frameworkcode) and $op ne 'addbiblio' );
+if ($frameworkcode eq 'FA'){
+ $userflags = 'fast_cataloging';
+}
+
$frameworkcode = '' if ( $frameworkcode eq 'Default' );
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
@@ -850,11 +749,13 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
if ($frameworkcode eq 'FA'){
# We need to grab and set some variables in the template for use on the additems screen
- $template->{VARS}->{'circborrowernumber'} = $input->param('borrowernumber');
- $template->{VARS}->{'barcode'} = $input->param('barcode');
- $template->{VARS}->{'branch'} = $input->param('branch');
- $template->{VARS}->{'stickyduedate'} = $input->param('stickyduedate');
- $template->{VARS}->{'duedatespec'} = $input->param('duedatespec');
+ $template->param(
+ 'circborrowernumber' => $fa_circborrowernumber,
+ 'barcode' => $fa_barcode,
+ 'branch' => $fa_branch,
+ 'stickyduedate' => $fa_stickyduedate,
+ 'duedatespec' => $fa_duedatespec,
+ );
}
# Getting the list of all frameworks
@@ -897,20 +798,34 @@ if (($biblionumber) && !($breedingid)){
if ($breedingid) {
( $record, $encoding ) = MARCfindbreeding( $breedingid ) ;
}
+
#populate hostfield if hostbiblionumber is available
-if ($hostbiblionumber){
- my $marcflavour = C4::Context->preference("marcflavour");
- $record=MARC::Record->new();
- $record->leader('');
- my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber,$marcflavour);
- $record->append_fields($field);
+if ($hostbiblionumber) {
+ my $marcflavour = C4::Context->preference("marcflavour");
+ $record = MARC::Record->new();
+ $record->leader('');
+ my $field =
+ PrepHostMarcField( $hostbiblionumber, $hostitemnumber, $marcflavour );
+ $record->append_fields($field);
+}
+
+# This is a child record
+if ($parentbiblio) {
+ my $marcflavour = C4::Context->preference('marcflavour');
+ $record = MARC::Record->new();
+ SetMarcUnicodeFlag($record, $marcflavour);
+ my $hostfield = prepare_host_field($parentbiblio,$marcflavour);
+ if ($hostfield) {
+ $record->append_fields($hostfield);
+ }
}
$is_a_modif = 0;
if ($biblionumber) {
$is_a_modif = 1;
- $template->param( title => $record->title(), );
+ my $title = C4::Context->preference('marcflavour') eq "UNIMARC" ? $record->subfield('200', 'a') : $record->title;
+ $template->param( title => $title );
# if it's a modif, retrieve bibli and biblioitem numbers for the future modification of old-DB.
( $biblionumbertagfield, $biblionumbertagsubfield ) =
@@ -944,7 +859,7 @@ if ( $op eq "addbiblio" ) {
my $oldbibnum;
my $oldbibitemnum;
if (C4::Context->preference("BiblioAddsAuthorities")){
- my ($countlinked,$countcreated)=BiblioAddAuthorities($record,$frameworkcode);
+ BiblioAutoLink( $record, $frameworkcode );
}
if ( $is_a_modif ) {
ModBiblioframework( $biblionumber, $frameworkcode );
@@ -953,48 +868,56 @@ if ( $op eq "addbiblio" ) {
else {
( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
}
- if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){
+ if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
if ($frameworkcode eq 'FA'){
- my $borrowernumber = $input->param('circborrowernumber');
- my $barcode = $input->param('barcode');
- my $branch = $input->param('branch');
- my $stickyduedate = $input->param('stickyduedate');
- my $duedatespec = $input->param('duedatespec');
print $input->redirect(
- "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&borrowernumber=$borrowernumber&branch=$branch&barcode=$barcode&stickyduedate=$stickyduedate&duedatespec=$duedatespec"
+ '/cgi-bin/koha/cataloguing/additem.pl?'
+ .'biblionumber='.$biblionumber
+ .'&frameworkcode='.$frameworkcode
+ .'&circborrowernumber='.$fa_circborrowernumber
+ .'&branch='.$fa_branch
+ .'&barcode='.uri_escape_utf8($fa_barcode)
+ .'&stickyduedate='.$fa_stickyduedate
+ .'&duedatespec='.$fa_duedatespec
);
exit;
}
else {
print $input->redirect(
- "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"
+ "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&searchid=$searchid"
);
exit;
}
}
- elsif($is_a_modif || $redirect eq "view"){
+ elsif(($is_a_modif || $redirect eq "view") && $redirect ne "just_save"){
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&frameworkcode=$frameworkcode");
+ print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&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;
- }
- else {
+ }
+ elsif ($redirect eq "just_save"){
+ my $tab = $input->param('current_tab');
+ print $input->redirect("/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=$biblionumber&framework=$frameworkcode&tab=$tab&searchid=$searchid");
+ }
+ else {
$template->param(
biblionumber => $biblionumber,
done =>1,
popup =>1
);
- $template->param( title => $record->subfield('200',"a") ) if ($record ne "-1" && C4::Context->preference('marcflavour') =~/unimarc/i);
- $template->param( title => $record->title() ) if ($record ne "-1" && C4::Context->preference('marcflavour') eq "usmarc");
+ if ( $record ne '-1' ) {
+ my $title = C4::Context->preference('marcflavour') eq "UNIMARC" ? $record->subfield('200', 'a') : $record->title;
+ $template->param( title => $title );
+ }
$template->param(
popup => $mode,
itemtype => $frameworkcode,
@@ -1038,7 +961,10 @@ elsif ( $op eq "delete" ) {
$biblionumber = "";
}
- if ( $record ne -1 ) {
+ if($changed_framework eq "changed"){
+ $record = TransformHtmlToMarc( $input );
+ }
+ elsif( $record ne -1 ) {
#FIXME: it's kind of silly to go from MARC::Record to MARC::File::XML and then back again just to fix the encoding
eval {
my $uxml = $record->as_xml;
@@ -1061,13 +987,17 @@ elsif ( $op eq "delete" ) {
);
}
-$template->param( title => $record->title() ) if ( $record ne "-1" );
+if ( $record ne '-1' ) {
+ my $title = C4::Context->preference('marcflavour') eq "UNIMARC" ? $record->subfield('200', 'a') : $record->title;
+ $template->param( title => $title );
+}
$template->param(
popup => $mode,
frameworkcode => $frameworkcode,
itemtype => $frameworkcode,
- borrowernumber => $loggedinuser,
- marcflavour => C4::Context->preference("marcflavour"),
+ borrowernumber => $loggedinuser,
+ tab => $input->param('tab')
);
+$template->{'VARS'}->{'searchid'} = $searchid;
output_html_with_http_headers $input, $cookie, $template->output;