# Copyright 2000-2002 Katipo Communications
+# Copyright 2004-2010 BibLibre
#
# This file is part of Koha.
#
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
+#use warnings; FIXME - Bug 2505
use CGI;
use C4::Output;
use C4::Auth;
our($tagslib,$authorised_values_sth,$is_a_modif,$usedTagsLib,$mandatory_z3950);
-=item MARCfindbreeding
+=head1 FUNCTIONS
+
+=head2 MARCfindbreeding
$record = MARCfindbreeding($breedingid);
return -1;
}
-=item build_authorized_values_list
+=head2 build_authorized_values_list
=cut
#Use GetBranches($onlymine)
my $onlymine=C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
- C4::Context->userenv->{flags}!=1 &&
+ C4::Context->userenv->{flags} % 2 == 0 &&
C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
my @branchloop;
"select itemtype,description from itemtypes order by description");
$sth->execute;
push @authorised_values, ""
- unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
+ unless ( $tagslib->{$tag}->{$subfield}->{defaultvalue} and $tagslib->{$tag}->{$subfield}->{mandatory} );
my $itemtype;
);
}
-=item CreateKey
+=head2 CreateKey
Create a random value to set it into the input name
return int(rand(1000000));
}
-=item GetMandatoryFieldZ3950
+=head2 GetMandatoryFieldZ3950
This function return an hashref which containts all mandatory field
to search with z3950 server.
-
+
=cut
sub GetMandatoryFieldZ3950($){
};
}
-=item create_input
+=head2 create_input
builds the <input ...> entry for a subfield.
}
# if there is no value provided but a default value in parameters, get it
- unless ($value) {
+ if ( $value eq '' ) {
$value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
# get today date & replace YYYY, MM, DD if provided in the default value
if(exists $mandatory_z3950->{$tag.$subfield}){
$subfield_data{z3950_mandatory} = $mandatory_z3950->{$tag.$subfield};
}
- # decide if the subfield must be expanded (visible) by default or not
- # if it is mandatory, then expand. If it is hidden explicitly by the hidden flag, hidden anyway
+ # Subfield is hidden depending of hidden and mandatory flag, and is always
+ # shown if it contains anything or if its field is mandatory.
+ my $tdef = $tagslib->{$tag};
$subfield_data{visibility} = "display:none;"
- if ( ($tagslib->{$tag}->{$subfield}->{hidden} % 2 == 1) and $value ne ''
- or ($value eq '' and !$tagslib->{$tag}->{$subfield}->{mandatory})
- );
- # always expand all subfields of a mandatory field
- $subfield_data{visibility} = "" if $tagslib->{$tag}->{mandatory};
+ if $tdef->{$subfield}->{hidden} % 2 == 1 &&
+ $value eq '' &&
+ !$tdef->{$subfield}->{mandatory} &&
+ !$tdef->{mandatory};
# it's an authorised field
if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
$subfield_data{marc_value} =
id=\"".$subfield_data{id}."\"
name=\"".$subfield_data{id}."\"
value=\"$value\"
- class=\"input_marceditor\"
+ class=\"input_marceditor readonly\"
tabindex=\"1\"
size=\"5\"
maxlength=\"$max_length\"
id=\"".$subfield_data{id}."\"
name=\"".$subfield_data{id}."\"
value=\"$value\"
- class=\"input_marceditor\"
+ class=\"input_marceditor readonly\"
tabindex=\"1\"
size=\"67\"
maxlength=\"$max_length\"
id=\"".$subfield_data{id}."\"
name=\"".$subfield_data{id}."\"
value=\"$value\"
- class=\"input_marceditor\"
+ class=\"input_marceditor readonly\"
tabindex=\"1\"
size=\"67\"
maxlength=\"$max_length\"
}
-=item format_indicator
+=head2 format_indicator
Translate indicator value for output form - specifically, map
indicator = ' ' to ''. This is for the convenience of a cataloger
fixedfield => $tag < 10?1:0,
random => CreateKey,
);
- if ($tag >= 010){ # no indicator for theses tag
+ if ($tag >= 10){ # no indicator for 00x tags
$tag_data{indicator1} = format_indicator($field->indicator(1)),
$tag_data{indicator2} = format_indicator($field->indicator(2)),
}
my ($countcreated,$countlinked);
while (my $data=$query->fetchrow_hashref){
foreach my $field ($record->field($data->{tagfield})){
- next if ($field->subfield('3')||$field->subfield('9'));
+ 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}.' ';
warn "BIBLIOADDSAUTHORITIES: $error";
return (0,0) ;
}
- if ($results && scalar(@$results)==1) {
+ if ( @{$results} == 1) {
my $marcrecord = MARC::File::USMARC::decode($results->[0]);
$field->add_subfields('9'=>$marcrecord->field('001')->data);
$countlinked++;
- } elsif (scalar(@$results)>1) {
+ } 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++;
+ $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
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);
# 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.
- #
- # This isn't needed if we set the UTF flag in the leader below
- #if (C4::Context->preference('marcflavour') eq 'MARC21') {
- # SetMarcUnicodeFlag($marcrecordauth, 'MARC21');
- # }
if (C4::Context->preference('marcflavour') eq 'MARC21') {
- $marcrecordauth->leader(' nz a22 o 4500');
$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\,]*//;
my $op = $input->param('op');
my $mode = $input->param('mode');
my $frameworkcode = $input->param('frameworkcode');
+my $redirect = $input->param('redirect');
my $dbh = C4::Context->dbh;
+my $userflags = ($frameworkcode eq 'FA') ? "fast_cataloging" : "edit_catalogue";
+
$frameworkcode = &GetFrameworkCode($biblionumber)
- if ( $biblionumber and not($frameworkcode) );
+ if ( $biblionumber and not($frameworkcode) and $op ne 'addbiblio' );
$frameworkcode = '' if ( $frameworkcode eq 'Default' );
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { editcatalogue => 1 },
+ flagsrequired => { editcatalogue => $userflags },
}
);
else {
( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
}
-
- if ($mode ne "popup"){
+ if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){
print $input->redirect(
"/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"
);
exit;
- } else {
+ }
+ elsif($is_a_modif || $redirect eq "view"){
+ 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");
+ } elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) {
+ print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode");
+ } elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
+ print $input->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber");
+ } else {
+ print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber");
+ }
+ exit;
+
+ }else {
$template->param(
biblionumber => $biblionumber,
done =>1,
}
$template->param( title => $record->title() ) if ( $record ne "-1" );
+if (C4::Context->preference("marcflavour") eq "MARC21"){
+ $template->param(MARC21 => 1);
+}
$template->param(
popup => $mode,
frameworkcode => $frameworkcode,
projects / koha.git / blobdiff