diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 778fd1cbda..bb86999852 100755
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -52,6 +52,7 @@ BEGIN {
# to get something
push @EXPORT, qw(
+ &Get
&GetBiblio
&GetBiblioData
&GetBiblioItemData
@@ -59,6 +60,10 @@ BEGIN {
&GetBiblioItemByBiblioNumber
&GetBiblioFromItemNumber
+ GetFieldMapping
+ SetFieldMapping
+ DeleteFieldMapping
+
&GetISBDView
&GetMarcNotes
@@ -466,6 +471,115 @@ sub LinkBibHeadingsToAuthorities {
return $num_headings_changed;
}
+=head2 Get
+
+=over 4
+
+my $values = Get($field, $record, $frameworkcode);
+
+=back
+
+Get MARC fields from a keyword defined in fieldmapping table.
+
+=cut
+
+sub Get {
+ my ($field, $record, $frameworkcode) = @_;
+ my $dbh = C4::Context->dbh;
+
+ my $sth = $dbh->prepare('SELECT fieldcode, subfieldcode FROM fieldmapping WHERE frameworkcode = ? AND field = ?');
+ $sth->execute($frameworkcode, $field);
+
+ my @result = ();
+
+ while(my $row = $sth->fetchrow_hashref){
+ foreach my $field ($record->field($row->{fieldcode})){
+ if( ($row->{subfieldcode} ne "" && $field->subfield($row->{subfieldcode}))){
+ foreach my $subfield ($field->subfield($row->{subfieldcode})){
+ push @result, { 'subfield' => $subfield };
+ }
+
+ }elsif($row->{subfieldcode} eq "") {
+ push @result, {'subfield' => $field->as_string()};
+ }
+ }
+ }
+
+ return @result;
+}
+
+=head2 SetFieldMapping
+
+=over 4
+
+SetFieldMapping($framework, $field, $fieldcode, $subfieldcode);
+
+=back
+
+Set a Field to MARC mapping value, if it already exists we don't add a new one.
+
+=cut
+
+sub SetFieldMapping {
+ my ($framework, $field, $fieldcode, $subfieldcode) = @_;
+ my $dbh = C4::Context->dbh;
+
+ my $sth = $dbh->prepare('SELECT * FROM fieldmapping WHERE fieldcode = ? AND subfieldcode = ? AND frameworkcode = ? AND field = ?');
+ $sth->execute($fieldcode, $subfieldcode, $framework, $field);
+ if(not $sth->fetchrow_hashref){
+ my @args;
+ $sth = $dbh->prepare('INSERT INTO fieldmapping (fieldcode, subfieldcode, frameworkcode, field) VALUES(?,?,?,?)');
+
+ $sth->execute($fieldcode, $subfieldcode, $framework, $field);
+ }
+}
+
+=head2 DeleteFieldMapping
+
+=over 4
+
+DeleteFieldMapping($id);
+
+=back
+
+Delete a field mapping from an $id.
+
+=cut
+
+sub DeleteFieldMapping{
+ my ($id) = @_;
+ my $dbh = C4::Context->dbh;
+
+ my $sth = $dbh->prepare('DELETE FROM fieldmapping WHERE id = ?');
+ $sth->execute($id);
+}
+
+=head2 GetFieldMapping
+
+=over 4
+
+GetFieldMapping($frameworkcode);
+
+=back
+
+Get all field mappings for a specified frameworkcode
+
+=cut
+
+sub GetFieldMapping {
+ my ($framework) = @_;
+ my $dbh = C4::Context->dbh;
+
+ my $sth = $dbh->prepare('SELECT * FROM fieldmapping where frameworkcode = ?');
+ $sth->execute($framework);
+
+ my @return;
+ while(my $row = $sth->fetchrow_hashref){
+ push @return, $row;
+ }
+ return \@return;
+}
+
=head2 GetBiblioData
=over 4
diff --git a/admin/fieldmapping.pl b/admin/fieldmapping.pl
new file mode 100755
index 0000000000..bd3ca1bf3c
--- /dev/null
+++ b/admin/fieldmapping.pl
@@ -0,0 +1,77 @@
+#!/usr/bin/perl
+# Copyright 2009 SARL BibLibre
+#
+# 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 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., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+use strict;
+use warnings;
+use CGI;
+use C4::Auth;
+use C4::Biblio;
+use C4::Koha;
+use C4::Output;
+
+my $query = new CGI;
+
+my $framework = $query->param('framework') || "";
+
+my $field = $query->param('fieldname');
+my $fieldcode = $query->param('marcfield');
+my $subfieldcode = $query->param('marcsubfield');
+my $op = $query->param('op');
+my $id = $query->param('id');
+
+my ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "admin/fieldmapping.tmpl",
+ query => $query,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => {parameters => 1},
+ debug => 1,
+ });
+
+# get framework list
+my $frameworks = getframeworks();
+my @frameworkloop;
+foreach my $thisframeworkcode (keys %$frameworks) {
+ my $selected = 1 if $thisframeworkcode eq $framework;
+ 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);
+ exit;
+}
+
+# insert operation
+if($field and $fieldcode){
+ SetFieldMapping($framework, $field, $fieldcode, $subfieldcode);
+}
+
+my $fieldloop = GetFieldMapping($framework);
+warn Data::Dumper::Dumper($fieldloop->[1]);
+
+$template->param( frameworkloop => \@frameworkloop,
+ framework => $framework,
+ fields => $fieldloop,
+ );
+
+output_html_with_http_headers $query, $cookie, $template->output;
\ No newline at end of file
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index c4c1bbaee6..11cfbc9c53 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2301,6 +2301,21 @@ CREATE TABLE `borrower_message_transport_preferences` (
CONSTRAINT `borrower_message_transport_preferences_ibfk_2` FOREIGN KEY (`message_transport_type`) REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+--
+-- Table structure for table `fieldmapping`
+--
+
+DROP TABLE IF EXISTS `fieldmapping`;
+CREATE TABLE `fieldmapping` (
+ `id` int(11) NOT NULL auto_increment,
+ `field` varchar(255) NOT NULL,
+ `frameworkcode` char(4) NOT NULL default '',
+ `fieldcode` char(3) NOT NULL,
+ `subfieldcode` char(1) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
diff --git a/installer/data/mysql/updatedatabase30.pl b/installer/data/mysql/updatedatabase30.pl
index eba131bbbc..0e0ea3aa5d 100644
--- a/installer/data/mysql/updatedatabase30.pl
+++ b/installer/data/mysql/updatedatabase30.pl
@@ -552,6 +552,22 @@ ENDOFRENEWAL
SetVersion ($DBversion);
}
+#$DBversion = "3.01.00.040";
+$DBversion = "3.00.04.016";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("
+ CREATE TABLE `fieldmapping` (
+ `id` int(11) NOT NULL auto_increment,
+ `field` varchar(255) NOT NULL,
+ `frameworkcode` char(4) NOT NULL default '',
+ `fieldcode` char(3) NOT NULL,
+ `subfieldcode` char(1) NOT NULL,
+ PRIMARY KEY (`id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ ");
+ SetVersion ($DBversion);
+}
+
=item DropAllForeignKeys($table)
Drop all foreign keys of the table $table
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
index f804591ba1..034db42ed2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
@@ -64,6 +64,8 @@
Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.
Koha to MARC mapping
Define the mapping between the Koha transactional database (SQL) and the MARC Bibliographic records. Note that the mapping can be defined through MARC Bibliographic Framework. This tool is just a shortcut to speed up linkage.
+ Keywords to MARC mapping
+ Define the mapping between keywords and MARC fields, those keywords are used to find some datas independently of the framework.
MARC Bibliographic framework test
Checks the MARC structure. If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.
Authority types
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl
new file mode 100644
index 0000000000..fc9b2e3b18
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl
@@ -0,0 +1,77 @@
+
+Koha › Administration › Keyword to MARC Mapping
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Keyword to MARC Mapping
+
+
+
+
+
+
+
+
+
+
+
+
+