Bug 15381: Use Koha::Authority::Types in some other places

[koha.git] / admin / auth_subfields_structure.pl

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 67c7fac..f06ee4f 100755 (executable)
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -4,26 +4,30 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# 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; FIXME - Bug 2505
 use C4::Output;
 use C4::Auth;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
+use C4::Koha;
 
+use Koha::Authority::Types;
+
+use List::MoreUtils qw( uniq );
 
 sub string_search  {
        my ($searchstring,$authtypecode)=@_;
@@ -91,25 +95,14 @@ if ($op eq 'add_form') {
                push @kohafields, "auth_header.".$field;
        }
        
-       # build authorised value list
-       $sth2 = $dbh->prepare("select distinct category from authorised_values");
-       $sth2->execute;
-       my @authorised_values;
-       push @authorised_values,"";
-       while ((my $category) = $sth2->fetchrow_array) {
-               push @authorised_values, $category;
-       }
-       push (@authorised_values,"branches");
-       push (@authorised_values,"itemtypes");
-    
-    # build thesaurus categories list
-    $sth2 = $dbh->prepare("select authtypecode from auth_types");
-    $sth2->execute;
-    my @authtypes;
-    push @authtypes, "";
-    while ( ( my $authtypecode ) = $sth2->fetchrow_array ) {
-        push @authtypes, $authtypecode;
-    }
+        # build authorised value list
+        my $authorised_values = C4::Koha::GetAuthorisedValueCategories;
+        unshift @$authorised_values, '';
+        push @$authorised_values, 'branches';
+        push @$authorised_values, 'itemtypes';
+
+        # build thesaurus categories list
+        my @authtypes = uniq( "", map { $_->authtypecode } Koha::Authority::Types->search );
 
        # build value_builder list
        my @value_builder=('');
@@ -118,14 +111,15 @@ if ($op eq 'add_form') {
        # 2 cases here : on CVS install, $cgidir does not need a /cgi-bin
        # on a standard install, /cgi-bin need to be added. 
        # test one, then the other
-       my $cgidir = C4::Context->intranetdir ."/cgi-bin";
+    my $cgidir = C4::Context->config('intranetdir') ."/cgi-bin";
        unless (opendir(DIR, "$cgidir/cataloguing/value_builder")) {
-               $cgidir = C4::Context->intranetdir;
+        $cgidir = C4::Context->config('intranetdir');
                opendir(DIR, "$cgidir/cataloguing/value_builder") || die "can't opendir $cgidir/value_builder: $!";
        } 
        while (my $line = readdir(DIR)) {
-               if ($line =~ /\.pl$/) {
-                       push (@value_builder,$line);
+        if ( $line =~ /\.pl$/ &&
+             $line !~ /EXAMPLE\.pl$/ ) { # documentation purposes
+            push (@value_builder,$line);
                }
        }
         @value_builder= sort {$a cmp $b} @value_builder;
@@ -160,7 +154,7 @@ if ($op eq 'add_form') {
                     };
         $row_data{authorised_value} = {
                     id      => "authorised_value$i",
-                    values  => \@authorised_values,
+                    values  => $authorised_values,
                     default => $data->{'authorised_value'},
         };
         $row_data{frameworkcode} = {
@@ -239,7 +233,7 @@ if ($op eq 'add_form') {
                     };
         $row_data{authorised_value} = {
                     id      => "authorised_value",
-                    values  => \@authorised_values,
+                    values  => $authorised_values,
                     default => "",
         };
         $row_data{frameworkcode} = {
@@ -282,7 +276,6 @@ if ($op eq 'add_form') {
        my @kohafield           = ''.$input->param('kohafield');
        my @tab                         = $input->param('tab');
        my @seealso             = $input->param('seealso');
-       my @hidden;
        my @ohidden             = $input->param('ohidden');
        #my @ihidden            = $input->param('ihidden');
        #my @ehidden            = $input->param('ehidden');
@@ -358,8 +351,8 @@ if ($op eq 'add_form') {
                        }
                }
        }
-       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
-       exit;
+    print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&amp;authtypecode=$authtypecode");
+    exit;
 
                                                                                                        # END $OP eq ADD_VALIDATE
 ################## DELETE_CONFIRM ##################################
@@ -383,9 +376,8 @@ if ($op eq 'add_form') {
                my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
                $sth->execute($tagfield,$tagsubfield,$authtypecode);
        }
-       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
-       exit;
-       $template->param(tagfield => $tagfield);
+    print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&amp;authtypecode=$authtypecode");
+    exit;
                                                                                                        # END $OP eq DELETE_CONFIRMED
 ################## DEFAULT ##################################
 } else { # DEFAULT