Merge remote branch 'kc/new/enh/bug_4449' into kcmaster

[koha_fer] / cataloguing / value_builder / marc21_field_006.pl

diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl
index 506f742..6a4445a 100755 (executable)
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ b/cataloguing/value_builder/marc21_field_006.pl
@@ -13,11 +13,12 @@
 # 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
+# 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.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Auth;
 use CGI;
 use C4::Context;
@@ -25,7 +26,9 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+use XML::LibXML;
+
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
@@ -53,7 +56,7 @@ function Blur$function_name(subfield_managed) {
 
 function Clic$function_name(i) {
        defaultvalue=document.getElementById(\"$field_number\").value;
-       newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=marc21_field_006.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+       newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=marc21_field_006.pl&index=$field_number&result=\"+defaultvalue,\"tag_editor\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 //]]>
@@ -75,52 +78,31 @@ sub plugin {
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
-            flagsrequired   => { editcatalogue => 1 },
+            flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
     );
     $result = "a|||||r|||| 00| 0 " unless $result;
 
-    #  $result = "a     r     00  0 " unless $result;
-    my $f0   = substr($result, 0,  1);
-    my $f014 = substr($result, 1,  4);
-    my $f5   = substr($result, 5,  1);
-    my $f6   = substr($result, 6,  1);
-    my $f710 = substr($result, 7,  4);
-    my $f11  = substr($result, 11, 1);
-    my $f12  = substr($result, 12, 1);
-    my $f13  = substr($result, 13, 1);
-    my $f14  = substr($result, 14, 1);
-    my $f15  = substr($result, 15, 1);
-    my $f16  = substr($result, 16, 1);
-    my $f17  = substr($result, 17, 1);
-
-    $template->param(
-        index       => $index,
-        f0          => $f0,
-        "f0$f0"     => $f0,
-        f014        => $f014,
-        "f014$f014" => $f014,
-        f5          => $f5,
-        "f5$f5"     => $f5,
-        f6          => $f6,
-        "f6$f6"     => $f6,
-        f710        => $f710,
-        "f710$f710" => $f710,
-        f11         => $f11,
-        "f11$f11"   => $f11,
-        f12         => $f12,
-        "f12$f12"   => $f12,
-        f13         => $f13,
-        "f13$f13"   => $f13,
-        f14         => $f14,
-        "f14$f14"   => $f14,
-        f15         => $f15,
-        "f15$f15"   => $f15,
-        f16         => $f16,
-        "f16$f16"   => $f16,
-        f17         => $f17,
-        "f17$f17"   => $f17,
+    my $errorXml = '';
+    # Check if the xml, xsd exists and is validated
+    my $dir = C4::Context->config('intrahtdocs') . '/prog/' . $template->param('lang') . '/modules/cataloguing/value_builder/';
+    if (-r $dir . 'marc21_field_006.xml') {
+        my $doc = XML::LibXML->new->parse_file($dir . 'marc21_field_006.xml');
+        if (-r $dir . 'marc21_field_CF.xsd') {
+            my $xmlschema = XML::LibXML::Schema->new(location => $dir . 'marc21_field_CF.xsd');
+            eval {
+                $xmlschema->validate( $doc );
+            };
+            $errorXml = 'Can\'t validate the xml data from ' . $dir . 'marc21_field_006.xml' if ($@);
+        }
+    } else {
+        $errorXml = 'Can\'t read the xml file ' . $dir . 'marc21_field_006.xml';
+    }
+    $template->param(tagfield => '006',
+            index => $index,
+            result => $result,
+            errorXml => $errorXml,
     );
     output_html_with_http_headers $input, $cookie, $template->output;
 }