X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FXSLT.pm;h=78443303b9e92488851257bda8588bf2c03ac63e;hb=00408e262fbe58f4c6a3fbb722a0cb56d3d22f6c;hp=e67aa54b10ee9e4403f9d2e68e705bdee0546b33;hpb=b86e4e570050343fa60d85dbc34853cc83857154;p=koha.git

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index e67aa54b10..78443303b9 100644
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -27,6 +27,7 @@ use C4::Koha;
 use C4::Biblio;
 use C4::Circulation;
 use C4::Reserves;
+use C4::Output qw//;
 use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
@@ -48,9 +49,9 @@ C4::XSLT - Functions for displaying XSLT-generated content
 
 =head1 FUNCTIONS
 
-=head1 transformMARCXML4XSLT
+=head2 transformMARCXML4XSLT
 
-=head2 replaces codes with authorized values in a MARC::Record object
+Replaces codes with authorized values in a MARC::Record object
 
 =cut
 
@@ -87,9 +88,9 @@ sub transformMARCXML4XSLT {
     return $record;
 }
 
-=head1 getAuthorisedValues4MARCSubfields
+=head2 getAuthorisedValues4MARCSubfields
 
-=head2 returns an ref of hash of ref of hash for tag -> letter controled bu authorised values
+Returns a ref of hash of ref of hash for tag -> letter controled by authorised values
 
 =cut
 
@@ -127,7 +128,7 @@ sub XSLTParse4Display {
     my $itemsxml  = buildKohaItemsNamespace($biblionumber);
     my $xmlrecord = $record->as_xml(C4::Context->preference('marcflavour'));
     my $sysxml = "<sysprefs>\n";
-    foreach my $syspref ( qw/OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText viewISBD/ ) {
+    foreach my $syspref ( qw/OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText viewISBD OPACBaseURL/ ) {
         $sysxml .= "<syspref name=\"$syspref\">" .
                    C4::Context->preference( $syspref ) .
                    "</syspref>\n";
@@ -146,12 +147,16 @@ sub XSLTParse4Display {
         my $xslfile;
         if ($interface eq 'intranet') {
             $xslfile = C4::Context->config('intrahtdocs') . 
-                      "/prog/en/xslt/" .
+                      '/' . C4::Context->preference("template") . 
+                      '/' . C4::Output::_current_language() .
+                      '/xslt/' .
                       C4::Context->preference('marcflavour') .
                       "slim2intranet$xsl_suffix.xsl";
         } else {
             $xslfile = C4::Context->config('opachtdocs') . 
-                      "/prog/en/xslt/" .
+                      '/' . C4::Context->preference("opacthemes") . 
+                      '/' . C4::Output::_current_language() .
+                      '/xslt/' .
                       C4::Context->preference('marcflavour') .
                       "slim2OPAC$xsl_suffix.xsl";
         }
@@ -205,16 +210,15 @@ sub buildKohaItemsNamespace {
         } else {
             $status = "available";
         }
-        my $homebranch = $branches->{$item->{homebranch}}->{'branchname'};
-	 my $itemcallnumber = $item->{itemcallnumber} || '';
-        $itemcallnumber =~ s/\&/\&amp\;/g;
+        my $homebranch = xml_escape($branches->{$item->{homebranch}}->{'branchname'});
+	    my $itemcallnumber = xml_escape($item->{itemcallnumber});
         $xml.= "<item><homebranch>$homebranch</homebranch>".
 		"<status>$status</status>".
 		"<itemcallnumber>".$itemcallnumber."</itemcallnumber>"
         . "</item>";
 
     }
-    $xml = "<items xmlns=\"http://www.koha.org/items\">".$xml."</items>";
+    $xml = "<items xmlns=\"http://www.koha-community.org/items\">".$xml."</items>";
     return $xml;
 }
 
@@ -225,6 +229,8 @@ __END__
 
 =head1 NOTES
 
+=cut
+
 =head1 AUTHOR
 
 Joshua Ferraro <jmf@liblime.com>