Bugzilla – Attachment 27869 Details for
Bug 11826
Improving code for XSLT handling
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 11826: Add XSLT handler object to Koha namespace
SIGNED-OFF-Bug-11826-Add-XSLT-handler-object-to-Ko.patch (text/plain), 9.26 KB, created by
Bernardo Gonzalez Kriegel
on 2014-05-01 13:13:48 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 11826: Add XSLT handler object to Koha namespace
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2014-05-01 13:13:48 UTC
Size:
9.26 KB
patch
obsolete
>From b895391b3bf56600889b37d26ee52b652a576530 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Fri, 21 Feb 2014 17:20:29 +0100 >Subject: [PATCH] [SIGNED-OFF] Bug 11826: Add XSLT handler object to Koha > namespace > >In achieving the goals of umbrella report 6536 (Z3950 improvements), this >report adds a XSLT handler object to the Koha namespace. >A follow-up adds unit tests for this module. >This patch does not yet incorporate the new object into Z3950 search. So >it does not change any behavior and is therefore harder to test. > >Test plan: >Run the unit tests of the follow-up patch on report 11826. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >I tested the new module in two additional ways: > >[1] Made a simple script (four lines as below) that ran a larger xml file > with 1500 records through a test XSLT file modifying the title. > > my $eng= Koha::XSLT_Handler->new; > open my $fh1, '<', '_example_file'; > my @xml= <$fh1>; > print $eng->transform( join('', @xml), '_example_xsl_file'); > >[2] Incorporated the object into my local changes of Breeding.pm (based on > older work, not ready for submittal now). > Ran transformation on Z3950 search results. Worked well :) > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Test runs Ok. No koha-qa errors. >--- > Koha/XSLT_Handler.pm | 314 ++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 314 insertions(+) > create mode 100644 Koha/XSLT_Handler.pm > >diff --git a/Koha/XSLT_Handler.pm b/Koha/XSLT_Handler.pm >new file mode 100644 >index 0000000..26f9264 >--- /dev/null >+++ b/Koha/XSLT_Handler.pm >@@ -0,0 +1,314 @@ >+package Koha::XSLT_Handler; >+ >+# Copyright 2014 Rijksmuseum >+# >+# 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 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. >+# >+# 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. >+ >+=head1 NAME >+ >+Koha::XSLT_Handler - Facilitate use of XSLT transformations >+ >+=head1 SYNOPSIS >+ >+ use Koha::XSLT_Handler; >+ my $xslt_engine = Koha::XSLT_Handler->new; >+ my $output = $xslt_engine->transform($xml, $xsltfilename); >+ my $err= $xslt_engine->err; # error number >+ my $errstr= $xslt_engine->errstr; # error message >+ $xslt_engine->refresh($xsltfilename); >+ >+=head1 DESCRIPTION >+ >+ A XSLT handler object on top of LibXML and LibXSLT, allowing you to >+ run XSLT stylesheets repeatedly without loading them again. >+ Errors occurring during loading, parsing or transforming are reported >+ via the err and errstr attributes. >+ Reloading XSLT files can be done with the refresh method. >+ >+=head1 METHODS >+ >+=head2 new >+ >+ Create handler object (via Class::Accessor) >+ >+=head2 transform >+ >+ Run transformation for specific string and stylesheet >+ >+=head2 refresh >+ >+ Allow to reload stylesheets when transforming again >+ >+=head1 PROPERTIES >+ >+=head2 err >+ >+ Error number (see list of ERROR CODES) >+ >+=head2 errstr >+ >+ Error message >+ >+=head2 do_not_return_source >+ >+ If true, transform returns undef on failure. By default, it returns the >+ original string passed. Errors are reported as described. >+ >+=head1 ERROR CODES >+ >+=head2 Error 1 >+ >+ No XSLT file passed >+ >+=head2 Error 2 >+ >+ XSLT file not found >+ >+=head2 Error 3 >+ >+ Error while loading stylesheet xml: [furter information] >+ >+=head2 Error 4 >+ >+ Error while parsing stylesheet: [furter information] >+ >+=head2 Error 5 >+ >+ Error while parsing input: [furter information] >+ >+=head2 Error 6 >+ >+ Error while transforming input: [furter information] >+ >+=head2 Error 7 >+ >+ No string to transform >+ >+=head1 INTERNALS >+ >+ For documentation purposes. You are not encouraged to access them. >+ >+=head2 last_xsltfile >+ >+ Contains the last successfully executed XSLT filename >+ >+=head2 xslt_hash >+ >+ Hash reference to loaded stylesheets >+ >+=head1 ADDITIONAL COMMENTS >+ >+=cut >+ >+use Modern::Perl; >+use XML::LibXML; >+use XML::LibXSLT; >+ >+use base qw(Class::Accessor); >+ >+__PACKAGE__->mk_ro_accessors(qw( err errstr )); >+__PACKAGE__->mk_accessors(qw( do_not_return_source )); >+ >+=head2 transform >+ >+ my $output= $xslt_engine->transform( $xml, $xsltfilename ); >+ if( $xslt_engine->err ) { >+ #decide what to do on failure.. >+ } >+ my $output2= $xslt_engine->transform( $xml2 ); >+ >+ Pass a xml string and a fully qualified path of a XSLT file. >+ If you do not pass a filename, the last file used is assumed. >+ Returns the transformed string. >+ Check the error number in err to know if something went wrong. >+ In that case do_not_return_source did determine the return value. >+ >+=cut >+ >+sub transform { >+ my ( $self, $orgxml, $file ) = @_; >+ >+ #Initialized yet? >+ if( !$self->{xslt_hash} ) { >+ $self->_init; >+ } >+ else { >+ $self->_set_error; #clear error >+ } >+ my $retval= $self->{do_not_return_source}? undef: $orgxml; >+ >+ #check if no string passed >+ if( !defined $orgxml ) { >+ $self->_set_error(7); >+ return; #always undef >+ } >+ >+ #If no file passed, use the last file again >+ if( !$file ) { >+ if( !$self->{last_xsltfile} ) { >+ $self->_set_error(1); >+ return $retval; >+ } >+ $file= $self->{last_xsltfile}; >+ } >+ >+ #load stylesheet >+ my $stsh= $self->{xslt_hash}->{$file} // $self->_load($file); >+ return $retval if $self->{err}; >+ >+ #parse input and transform >+ my $parser = XML::LibXML->new(); >+ my $source= eval { $parser->parse_string($orgxml) }; >+ if( $@ ) { >+ $self->_set_error(5, $@); >+ return $retval; >+ } >+ my $str= eval { >+ my $result= $stsh->transform($source); >+ $stsh->output_as_chars($result); >+ }; >+ if( $@ ) { >+ $self->_set_error(6, $@); >+ return $retval; >+ } >+ $self->{last_xsltfile}= $file; >+ return $str; >+} >+ >+=head2 refresh >+ >+ $xslt_engine->refresh; >+ $xslt_engine->refresh( $xsltfilename ); >+ >+ Pass a file for an individual refresh or no file to refresh all. >+ Refresh returns the number of items affected. >+ What we actually do, is just clear the internal cache for reloading next >+ time when transform is called. >+ The return value is mainly theoretical. Since this is supposed to work >+ always(...), there is no actual need to test it. >+ Note that refresh does also clear the error information. >+ >+=cut >+ >+sub refresh { >+ my ( $self, $file )= @_; >+ $self->_set_error; >+ return if !$self->{xslt_hash}; >+ my $rv; >+ if( $file ) { >+ $rv= delete $self->{xslt_hash}->{$file}? 1: 0; >+ } >+ else { >+ $rv= scalar keys %{ $self->{xslt_hash} }; >+ $self->{xslt_hash}= {}; >+ } >+ return $rv; >+} >+ >+# ************** INTERNAL ROUTINES ******************************************** >+ >+# _init >+# Internal routine for initialization. >+ >+sub _init { >+ my $self= shift; >+ >+ $self->_set_error; >+ $self->{xslt_hash}={}; >+ $self->{do_not_return_source}=0 unless exists $self->{do_not_return_source}; >+ #by default we return source on a failing transformation >+ #but it could be passed at construction time already >+ return; >+} >+ >+# _load >+# Internal routine for loading a new stylesheet. >+ >+sub _load { >+ my ($self, $file)= @_; >+ >+ if( !$file || !-e $file ) { >+ $self->_set_error(2); >+ return; >+ } >+ >+ #load sheet >+ my $parser = XML::LibXML->new; >+ my $style_doc = eval { $parser->load_xml( location => $file ) }; >+ if( $@ ) { >+ $self->_set_error(3, $@); >+ return; >+ } >+ >+ #parse sheet >+ my $xslt = XML::LibXSLT->new; >+ $self->{xslt_hash}->{$file} = eval { $xslt->parse_stylesheet($style_doc) }; >+ if( $@ ) { >+ $self->_set_error(4, $@); >+ delete $self->{xslt_hash}->{$file}; >+ return; >+ } >+ return $self->{xslt_hash}->{$file}; >+} >+ >+# _set_error >+# Internal routine for handling error information. >+ >+sub _set_error { >+ my ($self, $errno, $addmsg)= @_; >+ >+ if(!$errno) { #clear the error >+ $self->{err}= undef; >+ $self->{errstr}= undef; >+ return; >+ } >+ >+ $self->{err}= $errno; >+ if($errno==1) { >+ $self->{errstr}= "No XSLT file passed."; >+ } >+ elsif($errno==2) { >+ $self->{errstr}= "XSLT file not found."; >+ } >+ elsif($errno==3) { >+ $self->{errstr}= "Error while loading stylesheet xml:"; >+ } >+ elsif($errno==4) { >+ $self->{errstr}= "Error while parsing stylesheet:"; >+ } >+ elsif($errno==5) { >+ $self->{errstr}= "Error while parsing input:"; >+ } >+ elsif($errno==6) { >+ $self->{errstr}= "Error while transforming input:"; >+ } >+ elsif($errno==7) { >+ $self->{errstr}= "No string to transform."; >+ } >+ >+ if( $addmsg ) { >+ $self->{errstr}.= " $addmsg"; >+ } >+ return; >+} >+ >+=head1 AUTHOR >+ >+ Marcel de Rooy, Rijksmuseum Netherlands >+ >+=cut >+ >+1; >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11826
:
25573
|
25574
|
27229
|
27230
|
27869
|
27870
|
27871
|
27872
|
28093
|
28094
|
28095
|
28096
|
28174