Bug 32351: Fix CourseItems.t

[koha-ffzg.git] / admin / marctagstructure.pl

diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index cc47c60..fbb955d 100755 (executable)
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -20,10 +20,9 @@
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Koha;
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
-use C4::Output;
+use C4::Output qw( output_html_with_http_headers );
 use C4::Context;
 
 use Koha::Caches;
@@ -53,7 +52,6 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                  flagsrequired => { parameters => 'manage_marc_frameworks' },
-                            debug => 1,
                             });
 
 my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
@@ -155,8 +153,8 @@ if ($op eq 'add_form') {
     }
     $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");
+    $cache->clear_from_cache("MarcCodedFields-$frameworkcode");
     print $input->redirect("/cgi-bin/koha/admin/marctagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode");
     exit;
                                                                                                        # END $OP eq ADD_VALIDATE
@@ -180,25 +178,23 @@ if ($op eq 'add_form') {
     $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");
+    $cache->clear_from_cache("MarcCodedFields-$frameworkcode");
     $template->param( searchfield => $searchfield );
                                                                                                        # END $OP eq DELETE_CONFIRMED
 ################## ITEMTYPE_CREATE ##################################
 # called automatically if an unexisting  frameworkis selected
 } elsif ($op eq 'framework_create') {
-       $sth = $dbh->prepare("select count(*),marc_tag_structure.frameworkcode,frameworktext from marc_tag_structure,biblio_framework where biblio_framework.frameworkcode=marc_tag_structure.frameworkcode group by marc_tag_structure.frameworkcode");
-       $sth->execute;
-       my @existingframeworkloop;
-       while (my ($tot,$thisframeworkcode,$frameworktext) = $sth->fetchrow) {
-               if ($tot>0) {
-                       push @existingframeworkloop, {
-                value => $thisframeworkcode,
-                frameworktext => $frameworktext,
-            };
-               }
-       }
-    $template->param( existingframeworkloop => \@existingframeworkloop );
+    my $frameworks = Koha::BiblioFrameworks->search(
+        {
+            'marc_tag_structure.frameworkcode' => { '!=' => undef }
+        },
+        {
+            join => 'marc_tag_structure',
+            distinct => 1
+        }
+    );
+    $template->param( existing_frameworks => $frameworks );
 
 ################## DEFAULT ##################################
 } else { # DEFAULT