X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=authorities%2Fauthorities.pl;h=d4f1601b1e9fec758e470a1f9ae756722ee9a4db;hb=306dc79217783ebd7896be64deee12491febc4d3;hp=db5498a35a76ca28857907c2208f17d1dbe9e76a;hpb=81516e16c0ee8ea532a6982ca93973a9ca82402a;p=koha_fer
diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index db5498a35a..d4f1601b1e 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -14,11 +14,12 @@
# 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;
use CGI;
use C4::Auth;
use C4::Output;
@@ -35,44 +36,15 @@ use vars qw( $is_a_modif );
my $itemtype; # created here because it can be used in build_authorized_values_list sub
our($authorised_values_sth,$is_a_modif,$usedTagsLib,$mandatory_z3950);
-=item 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.
-
-=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);
-}
+=head1 FUNCTIONS
+=over
=item build_authorized_values_list
+builds list, depending on authorised value...
+
=cut
sub build_authorized_values_list ($$$$$$$) {
@@ -81,7 +53,6 @@ sub build_authorized_values_list ($$$$$$$) {
my @authorised_values;
my %authorised_lib;
- # builds list, depending on authorised value...
#---- branch
if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
@@ -145,7 +116,9 @@ sub build_authorized_values_list ($$$$$$$) {
=item create_input
+
builds the entry for a subfield.
+
=cut
sub create_input {
@@ -155,9 +128,20 @@ 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
- unless ($value) {
+ if ($value eq '') {
$value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
+ if (!defined $value) {
+ $value = q{};
+ }
# get today date & replace YYYY, MM, DD if provided in the default value
my ( $year, $month, $day ) = Today();
@@ -207,15 +191,14 @@ sub create_input {
elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
$subfield_data{marc_value} =
"
- {$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}')\">...
+ id=\"".$subfield_data{id}."\"
+ name=\"".$subfield_data{id}."\"
+ value=\"$value\"
+ class=\"input_marceditor readonly\"
+ tabindex=\"1\"
+ readonly=\"readonly\" \/>
+ {$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">...
";
# it's a plugin field
}
@@ -229,7 +212,10 @@ sub create_input {
}
my $plugin = $cgidir . "/" . $tagslib->{$tag}->{$subfield}->{'value_builder'};
do $plugin || die "Plugin Failed: ".$plugin;
- my $extended_param = plugin_parameters( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
+ my $extended_param;
+ eval{
+ $extended_param = plugin_parameters( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
+ };
my ( $function_name, $javascript ) = plugin_javascript( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
# my ( $function_name, $javascript,$extended_param );
@@ -238,14 +224,13 @@ sub create_input {
type=\"text\"
id=\"".$subfield_data{id}."\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
name=\"".$subfield_data{id}."\"
value=\"$value\"
class=\"input_marceditor\"
onfocus=\"Focus$function_name($index_tag)\"
onblur=\"Blur$function_name($index_tag); \" \/>
- ...
+ ...
$javascript";
# it's an hidden field
}
@@ -256,7 +241,7 @@ sub create_input {
id=\"".$subfield_data{id}."\"
name=\"".$subfield_data{id}."\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
value=\"$value\" \/>
";
}
@@ -268,7 +253,7 @@ sub create_input {
class=\"input_marceditor\"
tabindex=\"1\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
value=\"$value\"
\/>";
@@ -280,8 +265,8 @@ sub create_input {
or
( C4::Context->preference("marcflavour") eq "UNIMARC" && $tag >= 300
and $tag < 400 && $subfield eq 'a' )
- or ( $tag >= 500
- and $tag < 600
+ or ( $tag >= 600
+ and $tag < 700
&& C4::Context->preference("marcflavour") eq "MARC21" )
)
{
@@ -293,7 +278,7 @@ sub create_input {
class=\"input_marceditor\"
tabindex=\"1\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
>$value
";
}
@@ -305,7 +290,7 @@ sub create_input {
value=\"$value\"
tabindex=\"1\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
class=\"input_marceditor\"
\/>
";
@@ -315,9 +300,24 @@ sub create_input {
return \%subfield_data;
}
+=item format_indicator
+
+Translate indicator value for output form - specifically, map
+indicator = ' ' to ''. This is for the convenience of a cataloger
+using a mouse to select an indicator input.
+
+=cut
+
+sub format_indicator {
+ my $ind_value = shift;
+ return '' if not defined $ind_value;
+ return '' if $ind_value eq ' ';
+ return $ind_value;
+}
+
=item CreateKey
- Create a random value to set it into the input name
+Create a random value to set it into the input name
=cut
@@ -357,12 +357,12 @@ sub build_tabs ($$$$$) {
foreach my $tag (sort @tab_data) {
$i++;
next if ! $tag;
- my $indicator;
+ my ($indicator1, $indicator2);
my $index_tag = CreateKey;
# if MARC::Record is not empty =>use it as master loop, then add missing subfields that should be in the tab.
# if MARC::Record is empty => use tab as master loop.
- if ( $record ne -1 && ( $record->field($tag) || $tag eq '000' ) ) {
+ if ( $record != -1 && ( $record->field($tag) || $tag eq '000' ) ) {
my @fields;
if ( $tag ne '000' ) {
@fields = $record->field($tag);
@@ -439,12 +439,14 @@ sub build_tabs ($$$$$) {
index => $index_tag,
tag_lib => $tagslib->{$tag}->{lib},
repeatable => $tagslib->{$tag}->{repeatable},
+ mandatory => $tagslib->{$tag}->{mandatory},
subfield_loop => \@subfields_data,
fixedfield => ($tag < 10)?(1):(0),
random => CreateKey,
);
- if ($tag >= 010){ # no indicator for theses tag
- $tag_data{indicator} = $field->indicator(1).$field->indicator(2);
+ if ($tag >= 10){ # no indicator for theses tag
+ $tag_data{indicator1} = format_indicator($field->indicator(1)),
+ $tag_data{indicator2} = format_indicator($field->indicator(2)),
}
push( @loop_data, \%tag_data );
}
@@ -474,7 +476,9 @@ sub build_tabs ($$$$$) {
index => $index_tag,
tag_lib => $tagslib->{$tag}->{lib},
repeatable => $tagslib->{$tag}->{repeatable},
- indicator => $indicator,
+ mandatory => $tagslib->{$tag}->{mandatory},
+ indicator1 => $indicator1,
+ indicator2 => $indicator2,
subfield_loop => \@subfields_data,
tagfirstsubfield => $subfields_data[0],
fixedfield => ($tag < 10)?(1):(0)
@@ -522,6 +526,11 @@ sub build_hidden_data () {
}
}
+=back
+
+=cut
+
+
# ========================
# MAIN
#=========================
@@ -536,7 +545,9 @@ my $linkid=$input->param('linkid');
my $authtypecode = $input->param('authtypecode');
my $dbh = C4::Context->dbh;
-$authtypecode = &GetAuthTypeCode($authid) if !$authtypecode;
+if(!$authtypecode) {
+ $authtypecode = $authid? &GetAuthTypeCode($authid): '';
+}
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "authorities/authorities.tmpl",
@@ -559,7 +570,7 @@ if ($authid) {
($oldauthnumtagfield,$oldauthnumtagsubfield) = &GetAuthMARCFromKohaField("auth_header.authid",$authtypecode);
($oldauthtypetagfield,$oldauthtypetagsubfield) = &GetAuthMARCFromKohaField("auth_header.authtypecode",$authtypecode);
}
-
+$op ||= q{};
#------------------------------------------------------------------------------------------------------------------------------
if ($op eq "add") {
#------------------------------------------------------------------------------------------------------------------------------
@@ -584,12 +595,13 @@ if ($op eq "add") {
}
}
- my ($duplicateauthid,$duplicateauthvalue) = FindDuplicateAuthority($record,$authtypecode) if ($op eq "add") && (!$is_a_modif);
+ my ($duplicateauthid,$duplicateauthvalue);
+ ($duplicateauthid,$duplicateauthvalue) = FindDuplicateAuthority($record,$authtypecode) if ($op eq "add") && (!$is_a_modif);
my $confirm_not_duplicate = $input->param('confirm_not_duplicate');
# it is not a duplicate (determined either by Koha itself or by user checking it's not a duplicate)
if (!$duplicateauthid or $confirm_not_duplicate) {
if ($is_a_modif ) {
- ModAuthority($authid,$record,$authtypecode,1);
+ ModAuthority($authid,$record,$authtypecode);
} else {
($authid) = AddAuthority($record,$authid,$authtypecode);
}
@@ -606,7 +618,7 @@ if ($op eq "add") {
}
} elsif ($op eq "delete") {
#------------------------------------------------------------------------------------------------------------------------------
- &AUTHdelauthority($authid);
+ &DelAuthority($authid);
if ($nonav){
print $input->redirect("auth_finder.pl");
}else{
@@ -633,9 +645,8 @@ $template->param(authid => $authid,
my $authtypes = getauthtypes;
my @authtypesloop;
foreach my $thisauthtype (keys %$authtypes) {
- my $selected = 1 if $thisauthtype eq $authtypecode;
my %row =(value => $thisauthtype,
- selected => $selected,
+ selected => $thisauthtype eq $authtypecode,
authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
);
push @authtypesloop, \%row;