Language corrections: branch -> library. Changing "Libraries, branches, and groups...

[koha_fer] / admin / marc_subfields_structure.pl

diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index ae3d94b..3c15291 100755 (executable)
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -103,13 +103,13 @@ if ( $op eq 'add_form' ) {
     while ( ( my $field ) = $sth2->fetchrow_array ) {
         push @kohafields, "biblio." . $field;
     }
-    my $sth2 = $dbh->prepare("SHOW COLUMNS from biblioitems");
+    $sth2 = $dbh->prepare("SHOW COLUMNS from biblioitems");
     $sth2->execute;
     while ( ( my $field ) = $sth2->fetchrow_array ) {
         if ( $field eq 'notes' ) { $field = 'bnotes'; }
         push @kohafields, "biblioitems." . $field;
     }
-    my $sth2 = $dbh->prepare("SHOW COLUMNS from items");
+    $sth2 = $dbh->prepare("SHOW COLUMNS from items");
     $sth2->execute;
     while ( ( my $field ) = $sth2->fetchrow_array ) {
         push @kohafields, "items." . $field;
@@ -126,6 +126,7 @@ if ( $op eq 'add_form' ) {
     }
     push( @authorised_values, "branches" );
     push( @authorised_values, "itemtypes" );
+    push( @authorised_values, "cn_source" );
 
     # build thesaurus categories list
     $sth2->finish;
@@ -197,7 +198,6 @@ if ( $op eq 'add_form' ) {
             },
             -default  => $data->{'tab'},
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{tagsubfield} =
@@ -205,7 +205,8 @@ if ( $op eq 'add_form' ) {
           . "<input type=\"hidden\" name=\"tagsubfield\" value=\""
           . $data->{'tagsubfield'}
           . "\" id=\"tagsubfield\" />";
-        $row_data{subfieldcode} = $data->{'tagsubfield'};
+        $row_data{subfieldcode} = $data->{'tagsubfield'} eq '@'?'_':$data->{'tagsubfield'};
+        $row_data{urisubfieldcode} = $row_data{subfieldcode} eq '%' ? 'pct' : $row_data{subfieldcode};
         $row_data{liblibrarian} = CGI::escapeHTML( $data->{'liblibrarian'} );
         $row_data{libopac}      = CGI::escapeHTML( $data->{'libopac'} );
         $row_data{seealso}      = CGI::escapeHTML( $data->{'seealso'} );
@@ -215,49 +216,43 @@ if ( $op eq 'add_form' ) {
             -values   => \@kohafields,
             -default  => "$data->{'kohafield'}",
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{authorised_value} = CGI::scrolling_list(
-            -name     => 'authorised_value',
-            -id       => 'authorised_value',
+            -name     => "authorised_value",
+            -id       => "authorised_value$i",
             -values   => \@authorised_values,
             -default  => $data->{'authorised_value'},
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{value_builder} = CGI::scrolling_list(
-            -name     => 'value_builder',
-            -id       => 'value_builder',
+            -name     => "value_builder",
+            -id       => "value_builder$i",
             -values   => \@value_builder,
             -default  => $data->{'value_builder'},
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{authtypes} = CGI::scrolling_list(
-            -name     => 'authtypecode',
-            -id       => 'authtypecode',
+            -name     => "authtypecode",
+            -id       => "authtypecode$i",
             -values   => \@authtypes,
             -default  => $data->{'authtypecode'},
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{repeatable} = CGI::checkbox(
             -name     => "repeatable$i",
             -checked  => $data->{'repeatable'} ? 'checked' : '',
             -value    => 1,
-            -tabindex => '',
             -label    => '',
             -id       => "repeatable$i"
         );
         $row_data{mandatory} = CGI::checkbox(
-            -name     => "mandatory$i",
+            -name     => "mandatory",
             -checked  => $data->{'mandatory'} ? 'checked' : '',
             -value    => 1,
-            -tabindex => '',
             -label    => '',
             -id       => "mandatory$i"
         );
@@ -267,7 +262,6 @@ if ( $op eq 'add_form' ) {
             -id       => "isurl$i",
             -checked  => $data->{'isurl'} ? 'checked' : '',
             -value    => 1,
-            -tabindex => '',
             -label    => ''
         );
         $row_data{row}    = $i;
@@ -280,6 +274,7 @@ if ( $op eq 'add_form' ) {
     # add more_subfields empty lines for add if needed
     for ( my $j = 1 ; $j <= 1 ; $j++ ) {
         my %row_data;    # get a fresh hash for the row data
+        $row_data{'new_subfield'} = 1;
         $row_data{'subfieldcode'} = '';
 
         $row_data{tab} = CGI::scrolling_list(
@@ -303,7 +298,6 @@ if ( $op eq 'add_form' ) {
             },
             -default  => "",
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{tagsubfield} =
@@ -319,7 +313,6 @@ if ( $op eq 'add_form' ) {
             -values   => \@kohafields,
             -default  => "",
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{hidden}     = "";
@@ -328,7 +321,6 @@ if ( $op eq 'add_form' ) {
             -id       => "repeatable$j",
             -checked  => '',
             -value    => 1,
-            -tabindex => '',
             -label    => ''
         );
         $row_data{mandatory} = CGI::checkbox(
@@ -336,7 +328,6 @@ if ( $op eq 'add_form' ) {
             -id       => "mandatory$j",
             -checked  => '',
             -value    => 1,
-            -tabindex => '',
             -label    => ''
         );
         $row_data{isurl} = CGI::checkbox(
@@ -344,32 +335,28 @@ if ( $op eq 'add_form' ) {
             -id       => "isurl$j",
             -checked  => '',
             -value    => 1,
-            -tabindex => '',
             -label    => ''
         );
         $row_data{value_builder} = CGI::scrolling_list(
-            -name     => 'value_builder',
-            -id       => 'value_builder',
+            -name     => "value_builder",
+            -id       => "value_builder$j",
             -values   => \@value_builder,
             -default  => $data->{'value_builder'},
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{authorised_value} = CGI::scrolling_list(
-            -name     => 'authorised_value',
-            -id       => 'authorised_value',
+            -name     => "authorised_value",
+            -id       => "authorised_value$j",
             -values   => \@authorised_values,
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{authtypes} = CGI::scrolling_list(
-            -name     => 'authtypecode',
-            -id       => 'authtypecode',
+            -name     => "authtypecode",
+            -id       => "authtypecode$j",
             -values   => \@authtypes,
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $row_data{link}   = CGI::escapeHTML( $data->{'link'} );
@@ -382,8 +369,7 @@ if ( $op eq 'add_form' ) {
     $template->param( 'heading-edit-subfields-p' => 1 );
     $template->param(
         action   => "Edit subfields",
-        tagfield =>
-"<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />$tagfield",
+        tagfield => $tagfield,
         loop           => \@loop_data,
         more_subfields => $more_subfields,
         more_tag       => $tagfield
@@ -417,6 +403,7 @@ elsif ( $op eq 'add_validate' ) {
         my $tagfield    = $input->param('tagfield');
         my $tagsubfield = $tagsubfield[$i];
         $tagsubfield = "@" unless $tagsubfield ne '';
+        $tagsubfield = "@" if $tagsubfield eq '_';
         my $liblibrarian     = $liblibrarian[$i];
         my $libopac          = $libopac[$i];
         my $repeatable       = $input->param("repeatable$i") ? 1 : 0;
@@ -558,12 +545,12 @@ else {    # DEFAULT
     if ( $offset > 0 ) {
         my $prevpage = $offset - $pagesize;
         $template->param(
-            prev => "<a href=\"$script_name?offset=$prevpage\">" );
+            prev => "<a href=\"$script_name?offset=$prevpage\&tagfield=$tagfield\&frameworkcode=$frameworkcode \">" );
     }
     if ( $offset + $pagesize < $count ) {
         my $nextpage = $offset + $pagesize;
         $template->param(
-            next => "<a href=\"$script_name?offset=$nextpage\">" );
+            next => "<a href=\"$script_name?offset=$nextpage\&tagfield=$tagfield\&frameworkcode=$frameworkcode \">" );
     }
 }    #---- END $OP eq DEFAULT