Bug 6919 - Follow up - call to XSLTParse4Display is now made twice in Search.pm

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signing off on this one with the following note: You have moved the call to XSLTParse4Display from around line 1775 to around 1842, as compared to the situation before the three 6919 patches. I probably would have left it at its original location, but while examining the code between these two spots, I do not see any real problems with this move. Tested it, works okay. Futher QA comments made on the report itself.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

diff --git a/C4/Search.pm b/C4/Search.pm
index 77a2aac..60635a3 100644 (file)
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1783,7 +1783,7 @@ sub searchResults {
        my $interface = $search_context eq 'opac' ? 'OPAC' : '';
        if (!$scan && C4::Context->preference($interface . "XSLTResultsDisplay")) {
             $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, 'Results',
-                                                                $search_context, 1);
+                                                                $search_context, 1, \@hiddenitems);
            # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs
         }
 
@@ -1842,23 +1842,6 @@ sub searchResults {
             $oldbiblio->{'alternateholdings_count'} = $alternateholdingscount;
         }
 
-       # XSLT processing of some stuff
-        if (!$scan && $search_context eq 'opac' && C4::Context->preference("OPACXSLTResultsDisplay")) {
-            SetUTF8Flag($marcrecord);
-            $debug && warn $marcrecord->as_formatted;
-            # FIXME note that XSLTResultsDisplay (use of XSLT to format staff interface bib search results)
-            # is not implemented yet
-            $oldbiblio->{XSLTResultsRecord}
-              = XSLTParse4Display($oldbiblio->{biblionumber},
-                                  $marcrecord,
-                                  'Results',
-                                  $search_context,
-                                  1, # clean up the problematic ampersand entities that Zebra outputs
-                                  \@hiddenitems
-                                );
-
-        }
-
         push( @newresults, $oldbiblio );
     }