X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fkoha2marclinks.pl;h=fc320ad5bb48fd3b1b37ac74fff918279849b9ad;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=aa2e3682ffe01ab837b28f4d7229e707520f9b71;hpb=d579648df109eef4d807e5e29602b9710b8193bf;p=koha.git

diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl
index aa2e3682ff..fc320ad5bb 100755
--- a/admin/koha2marclinks.pl
+++ b/admin/koha2marclinks.pl
@@ -13,11 +13,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 C4::Output;
 use C4::Auth;
 use CGI;
@@ -38,7 +39,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
 );
@@ -54,6 +55,7 @@ else {
         script_name => $script_name,
         else        => 1
     );    # we show only the TMPL_VAR names $op
+    $op = q{};
 }
 
 my $dbh = C4::Context->dbh;
@@ -64,7 +66,7 @@ if ( $op eq 'add_form' ) {
     my $data;
     my $sth =
       $dbh->prepare(
-"select tagfield,tagsubfield,liblibrarian as lib,tab from marc_subfield_structure where kohafield=?"
+"select tagfield,tagsubfield,liblibrarian as lib,tab from marc_subfield_structure where kohafield=? AND frameworkcode=''"
       );
     $sth->execute( $tablename . "." . $kohafield );
     my ( $defaulttagfield, $defaulttagsubfield, $defaultliblibrarian ) =
@@ -73,7 +75,7 @@ if ( $op eq 'add_form' ) {
     for ( my $i = 0 ; $i <= 9 ; $i++ ) {
         my $sth2 =
           $dbh->prepare(
-"select tagfield,tagsubfield,liblibrarian as lib,tab from marc_subfield_structure where tagfield like ?"
+"select tagfield,tagsubfield,liblibrarian as lib,tab from marc_subfield_structure where tagfield like ? AND frameworkcode=''"
           );
         $sth2->execute("$i%");
         my @marcarray;
@@ -84,12 +86,11 @@ if ( $op eq 'add_form' ) {
             push @marcarray, "$field $tagsubfield - $liblibrarian";
         }
         my $marclist = CGI::scrolling_list(
-            -name    => "marc",
-            -values  => \@marcarray,
+            -name   => 'marc',
+            -values => \@marcarray,
             -default =>
               "$defaulttagfield $defaulttagsubfield - $defaultliblibrarian",
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $template->param( "marclist$i" => $marclist );
@@ -125,13 +126,12 @@ elsif ( $op eq 'add_validate' ) {
 else {    # DEFAULT
     my $sth =
       $dbh->prepare(
-"Select tagfield,tagsubfield,liblibrarian,kohafield from marc_subfield_structure"
+q|select tagfield,tagsubfield,liblibrarian,kohafield from marc_subfield_structure where kohafield is not NULL and kohafield != ''|
       );
     $sth->execute;
     my %fields;
     while ( ( my $tagfield, my $tagsubfield, my $liblibrarian, my $kohafield ) =
-        $sth->fetchrow )
-    {
+        $sth->fetchrow ) {
         $fields{$kohafield}->{tagfield}     = $tagfield;
         $fields{$kohafield}->{tagsubfield}  = $tagsubfield;
         $fields{$kohafield}->{liblibrarian} = $liblibrarian;
@@ -141,15 +141,8 @@ else {    # DEFAULT
     my $sth2 = $dbh->prepare("SHOW COLUMNS from $tablename");
     $sth2->execute;
 
-    my $toggle    = 1;
     my @loop_data = ();
     while ( ( my $field ) = $sth2->fetchrow_array ) {
-        if ( $toggle eq 1 ) {
-            $toggle = 0;
-        }
-        else {
-            $toggle = 1;
-        }
         my %row_data;    # get a fresh hash for the row data
         $row_data{tagfield} = $fields{ $tablename . "." . $field }->{tagfield};
         $row_data{tagsubfield} =
@@ -157,9 +150,8 @@ else {    # DEFAULT
         $row_data{liblibrarian} =
           $fields{ $tablename . "." . $field }->{liblibrarian};
         $row_data{kohafield} = $field;
-        $row_data{edit}      =
+        $row_data{edit} =
 "$script_name?op=add_form&amp;tablename=$tablename&amp;kohafield=$field";
-        $row_data{toggle} = $toggle;
         push( @loop_data, \%row_data );
     }
     $template->param(
@@ -173,7 +165,6 @@ else {    # DEFAULT
             ],
             -default  => $tablename,
             -size     => 1,
-            -tabindex => '',
             -multiple => 0
         )
     );