projects / koha.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug 21704: (QA follow-up) Fix evil tabs
[koha.git] / admin / marctagstructure.pl
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 97f96f1..8b2dada 100755 (executable)
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -18,8 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Koha;
@@ -90,7 +89,7 @@ if ($op eq 'add_form') {
        #---- if primkey exists, it's a modify action, so read values to modify...
        my $data;
        if ($searchfield) {
-               $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where tagfield=? and frameworkcode=?");
+        $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?");
                $sth->execute($searchfield,$frameworkcode);
                $data=$sth->fetchrow_hashref;
        }
@@ -109,7 +108,8 @@ if ($op eq 'add_form') {
             repeatable => $data->{'repeatable'},
             mandatory => $data->{'mandatory'},
             authorised_value => $data->{authorised_value},
-                       frameworkcode => $frameworkcode,
+            ind1_defaultvalue => $data->{'ind1_defaultvalue'},
+            ind2_defaultvalue => $data->{'ind2_defaultvalue'}
     );  # FIXME: move checkboxes to presentation layer
                                                                                                        # END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
@@ -121,69 +121,67 @@ if ($op eq 'add_form') {
        my $repeatable       = $input->param('repeatable') ? 1 : 0;
        my $mandatory        = $input->param('mandatory')  ? 1 : 0;
        my $authorised_value = $input->param('authorised_value');
-    unless (C4::Context->config('demo')) {
-        if ($input->param('modif')) {
-            $sth = $dbh->prepare(
-            "UPDATE marc_tag_structure SET liblibrarian=? ,libopac=? ,repeatable=? ,mandatory=? ,authorised_value=? WHERE frameworkcode=? AND tagfield=?"
-            );
-            $sth->execute(  $liblibrarian,
-                            $libopac,
-                            $repeatable,
-                            $mandatory,
-                            $authorised_value,
-                            $frameworkcode,
-                            $tagfield
-            );
-        } else {
-            $sth = $dbh->prepare(
-            "INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) values (?,?,?,?,?,?,?)"
-            );
-            $sth->execute($tagfield,
-                          $liblibrarian,
-                          $libopac,
-                          $repeatable,
-                          $mandatory,
-                          $authorised_value,
-                          $frameworkcode
-            );
-        }
-        $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
-        $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-        $cache->clear_from_cache("default_value_for_mod_marc-");
-        $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
+    my $ind1_defaultvalue = $input->param('ind1_defaultvalue');
+    my $ind2_defaultvalue = $input->param('ind2_defaultvalue');
+    if ($input->param('modif')) {
+        $sth = $dbh->prepare(
+        "UPDATE marc_tag_structure SET liblibrarian=? ,libopac=? ,repeatable=? ,mandatory=? ,authorised_value=?, ind1_defaultvalue=?, ind2_defaultvalue=? WHERE frameworkcode=? AND tagfield=?"
+        );
+        $sth->execute(  $liblibrarian,
+                        $libopac,
+                        $repeatable,
+                        $mandatory,
+                        $authorised_value,
+                        $ind1_defaultvalue,
+                        $ind2_defaultvalue,
+                        $frameworkcode,
+                        $tagfield
+        );
+    } else {
+        $sth = $dbh->prepare(
+        "INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue,frameworkcode) values (?,?,?,?,?,?,?,?,?)"
+        );
+        $sth->execute($tagfield,
+                      $liblibrarian,
+                      $libopac,
+                      $repeatable,
+                      $mandatory,
+                      $authorised_value,
+                      $ind1_defaultvalue,
+                      $ind2_defaultvalue,
+                      $frameworkcode
+        );
     }
+    $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
+    $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
+    $cache->clear_from_cache("default_value_for_mod_marc-");
+    $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
     print $input->redirect("/cgi-bin/koha/admin/marctagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode");
     exit;
                                                                                                        # END $OP eq ADD_VALIDATE
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
 } elsif ($op eq 'delete_confirm') {
-       $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where tagfield=? and frameworkcode=?");
+    $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?");
     $sth->execute($searchfield, $frameworkcode);
     my $data = $sth->fetchrow_hashref;
        $template->param(
          liblibrarian => $data->{'liblibrarian'},
-          searchfield => $searchfield,
-        frameworkcode => $frameworkcode,
+          searchfield => $searchfield
     );
                                                                                                        # END $OP eq DELETE_CONFIRM
 ################## DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 } elsif ($op eq 'delete_confirmed') {
-       unless (C4::Context->config('demo')) {
-        my $sth1 = $dbh->prepare("DELETE FROM marc_tag_structure      WHERE tagfield=? AND frameworkcode=?");
-        my $sth2 = $dbh->prepare("DELETE FROM marc_subfield_structure WHERE tagfield=? AND frameworkcode=?");
-        $sth1->execute($searchfield, $frameworkcode);
-        $sth2->execute($searchfield, $frameworkcode);
-        $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
-        $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-        $cache->clear_from_cache("default_value_for_mod_marc-");
-        $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
-       }
-       $template->param(
-          searchfield => $searchfield,
-        frameworkcode => $frameworkcode,
-    );
+    my $sth1 = $dbh->prepare("DELETE FROM marc_tag_structure      WHERE tagfield=? AND frameworkcode=?");
+    my $sth2 = $dbh->prepare("DELETE FROM marc_subfield_structure WHERE tagfield=? AND frameworkcode=?");
+    $sth1->execute($searchfield, $frameworkcode);
+    $sth2->execute($searchfield, $frameworkcode);
+    $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
+    $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
+    $cache->clear_from_cache("default_value_for_mod_marc-");
+    $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
+    $template->param( searchfield => $searchfield );
                                                                                                        # END $OP eq DELETE_CONFIRMED
 ################## ITEMTYPE_CREATE ##################################
 # called automatically if an unexisting  frameworkis selected
@@ -199,9 +197,8 @@ if ($op eq 'add_form') {
             };
                }
        }
-       $template->param(existingframeworkloop => \@existingframeworkloop,
-                                       frameworkcode => $frameworkcode,
-                                       );
+    $template->param( existingframeworkloop => \@existingframeworkloop );
+
 ################## DEFAULT ##################################
 } else { # DEFAULT
        # here, $op can be unset or set to "framework_create_confirm".
@@ -220,6 +217,8 @@ if ($op eq 'add_form') {
                              marc_tag_structure.repeatable as mts_repeatable,
                              marc_tag_structure.mandatory as mts_mandatory,
                              marc_tag_structure.authorised_value as mts_authorized_value,
+                  marc_tag_structure.ind1_defaultvalue as mts_ind1_defaultvalue,
+                  marc_tag_structure.ind1_defaultvalue as mts_ind2_defaultvalue,
                              marc_subfield_structure.*
                 FROM marc_tag_structure 
                 LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) WHERE (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 ORDER BY marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield");
@@ -241,9 +240,8 @@ if ($op eq 'add_form') {
                        $row_data{repeatable}       = $results[$i]->{'mts_repeatable'};
                        $row_data{mandatory}        = $results[$i]->{'mts_mandatory'};
                        $row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
-                       $row_data{subfield_link} = "marc_subfields_structure.pl?op=add_form&amp;tagfield=".$results[$i]->{'mts_tagfield'}."&amp;frameworkcode=".$frameworkcode;
-                       $row_data{edit}          = "$script_name?op=add_form&amp;searchfield="            .$results[$i]->{'mts_tagfield'}."&amp;frameworkcode=".$frameworkcode;
-                       $row_data{delete}        = "$script_name?op=delete_confirm&amp;searchfield="      .$results[$i]->{'mts_tagfield'}."&amp;frameworkcode=".$frameworkcode;
+            $row_data{ind1_defaultvalue} = $results[$i]->{'mts_ind1_defaultvalue'};
+            $row_data{ind2_defaultvalue} = $results[$i]->{'mts_ind2_defaultvalue'};
                        $j=$i;
                        my @internal_loop = ();
                        while ( ( $j < $cnt ) and ( $results[$i]->{'tagfield'} == $results[$j]->{'tagfield'} ) ) {
@@ -286,9 +284,8 @@ if ($op eq 'add_form') {
                        $row_data{repeatable}       = $results->[$i]{'repeatable'};
                        $row_data{mandatory}        = $results->[$i]{'mandatory'};
                        $row_data{authorised_value} = $results->[$i]{'authorised_value'};
-                       $row_data{subfield_link}    = "marc_subfields_structure.pl?tagfield="          .$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
-                       $row_data{edit}             = "$script_name?op=add_form&amp;searchfield="      .$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
-                       $row_data{delete}           = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
+            $row_data{ind1_defaultvalue} = $results->[$i]{'ind1_defaultvalue'};
+            $row_data{ind2_defaultvalue} = $results->[$i]{'ind2_defaultvalue'};
                        push(@loop_data, \%row_data);
                }
                $template->param(loop => \@loop_data);
@@ -297,15 +294,13 @@ if ($op eq 'add_form') {
                $template->param(isprevpage => $offset,
                                                prevpage=> $offset-$pagesize,
                                                searchfield => $searchfield,
-                                               script_name => $script_name,
-                                               frameworkcode => $frameworkcode,
+                        script_name => $script_name
                );
        }
        if ($offset+$pagesize<$cnt) {
                $template->param(nextpage =>$offset+$pagesize,
                                                searchfield => $searchfield,
-                                               script_name => $script_name,
-                                               frameworkcode => $frameworkcode,
+                        script_name => $script_name
                );
        }
 } #---- END $OP eq DEFAULT
@@ -318,7 +313,7 @@ output_html_with_http_headers $input, $cookie, $template->output;
 sub StringSearch  {
        my ($searchstring,$frameworkcode)=@_;
        my $sth = C4::Context->dbh->prepare("
-    SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value
+    SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue
      FROM  marc_tag_structure
      WHERE (tagfield >= ? and frameworkcode=?)
     ORDER BY tagfield
@@ -334,8 +329,8 @@ sub StringSearch  {
 sub duplicate_framework {
        my ($newframeworkcode,$oldframeworkcode) = @_;
        my $dbh = C4::Context->dbh;
-    $dbh->do(q|INSERT INTO marc_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, frameworkcode)
-        SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value, ? from marc_tag_structure where frameworkcode=?|, undef, $newframeworkcode, $oldframeworkcode );
+    $dbh->do(q|INSERT INTO marc_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, ind1_defaultvalue, ind2_defaultvalue, frameworkcode)
+        SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value, ind1_defaultvalue, ind2_defaultvalue, ? from marc_tag_structure where frameworkcode=?|, undef, $newframeworkcode, $oldframeworkcode );
 
     $dbh->do(q|INSERT INTO marc_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden)
         SELECT ?,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden from marc_subfield_structure where frameworkcode=?
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git