Bug 17196: Move marcxml out of the biblioitems table

[koha.git] / admin / fieldmapping.pl

diff --git a/admin/fieldmapping.pl b/admin/fieldmapping.pl
index 1552010..75fd892 100755 (executable)
--- a/admin/fieldmapping.pl
+++ b/admin/fieldmapping.pl
@@ -3,31 +3,32 @@
 #
 # 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;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Biblio;
 use C4::Koha;
 use C4::Output;
 
-my $query = new CGI;
+use Koha::BiblioFrameworks;
 
-my $framework = $query->param('framework') || "";
+my $query = new CGI;
 
+my $frameworkcode = $query->param('framework') || "";
 my $field         = $query->param('fieldname');
 my $fieldcode     = $query->param('marcfield');
 my $subfieldcode  = $query->param('marcsubfield');
@@ -35,7 +36,7 @@ my $op            = $query->param('op') || q{};
 my $id            = $query->param('id');
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/fieldmapping.tmpl",
+    = get_template_and_user({template_name => "admin/fieldmapping.tt",
                             query => $query,
                             type => "intranet",
                             authnotrequired => 0,
@@ -43,42 +44,25 @@ my ($template, $loggedinuser, $cookie)
                             debug => 1,
                             });
 
-# get framework list
-my $frameworks = getframeworks();
-my @frameworkloop;
-my $selected;
-my $frameworktext;
-foreach my $thisframeworkcode (keys %$frameworks) {
-        if ($thisframeworkcode eq $framework){
-                $selected = 1;
-                $frameworktext = $frameworks->{$thisframeworkcode}->{'frameworktext'};
-     } else {
-               $selected = 0;
-     }
-       my %row =(value => $thisframeworkcode,
-                               selected => $selected,
-                               frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-                       );
-       push @frameworkloop, \%row;
-}
-
 if($op eq "delete" and $id){
     DeleteFieldMapping($id);
-    print $query->redirect("/cgi-bin/koha/admin/fieldmapping.pl?framework=".$framework);
+    print $query->redirect("/cgi-bin/koha/admin/fieldmapping.pl?framework=".$frameworkcode);
     exit;
 }
 
 # insert operation
 if($field and $fieldcode){
-    SetFieldMapping($framework, $field, $fieldcode, $subfieldcode);
+    SetFieldMapping($frameworkcode, $field, $fieldcode, $subfieldcode);
 }
 
-my $fieldloop = GetFieldMapping($framework);
+my $fieldloop = GetFieldMapping($frameworkcode);
 
-$template->param( frameworkloop => \@frameworkloop, 
-                  framework     => $framework,
-                  frameworktext => $frameworktext,
-                  fields        => $fieldloop,
-                );
+my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
+my $framework  = $frameworks->search( { frameworkcode => $frameworkcode } )->next;
+$template->param(
+    frameworks => $frameworks,
+    framework  => $framework,
+    fields     => $fieldloop,
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;