Delivered-To: jcamins@cpbibliography.com Received: by 10.43.69.79 with SMTP id yb15cs143959icb; Wed, 16 Mar 2011 06:21:21 -0700 (PDT) Received: by 10.223.6.11 with SMTP id 11mr917689fax.103.1300281672608; Wed, 16 Mar 2011 06:21:12 -0700 (PDT) Return-Path: Received: from eliot.biblibre.com (eliot.biblibre.com [188.165.204.78]) by mx.google.com with ESMTPS id k14si1004846fax.48.2011.03.16.06.21.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Mar 2011 06:21:11 -0700 (PDT) Received-SPF: neutral (google.com: 188.165.204.78 is neither permitted nor denied by best guess record for domain of koha-patches-bounces@lists.koha-community.org) client-ip=188.165.204.78; Authentication-Results: mx.google.com; spf=neutral (google.com: 188.165.204.78 is neither permitted nor denied by best guess record for domain of koha-patches-bounces@lists.koha-community.org) smtp.mail=koha-patches-bounces@lists.koha-community.org Received: from eliot.biblibre.com (localhost.localdomain [127.0.0.1]) by eliot.biblibre.com (Postfix) with ESMTP id 1B51A46EB2; Wed, 16 Mar 2011 14:21:10 +0100 (CET) X-Original-To: koha-patches@lists.koha-community.org Delivered-To: koha-patches_lists.koha-community.org@eliot.biblibre.com Received: from mail-qw0-f44.google.com (mail-qw0-f44.google.com [209.85.216.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by eliot.biblibre.com (Postfix) with ESMTPS id 4CDCE4684B for ; Wed, 16 Mar 2011 14:21:08 +0100 (CET) Received: by qwg5 with SMTP id 5so1724770qwg.17 for ; Wed, 16 Mar 2011 06:21:06 -0700 (PDT) Received: by 10.229.64.84 with SMTP id d20mr605236qci.206.1300281666749; Wed, 16 Mar 2011 06:21:06 -0700 (PDT) Received: from localhost.localdomain (pool-98-114-30-184.phlapa.fios.verizon.net [98.114.30.184]) by mx.google.com with ESMTPS id d21sm693923qck.28.2011.03.16.06.21.04 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Mar 2011 06:21:05 -0700 (PDT) From: "Nicole C. Engard" To: koha-patches@lists.koha-community.org Date: Tue, 15 Mar 2011 10:09:43 -0400 Message-Id: <1300198183-5019-1-git-send-email-nengard@bywatersolutions.com> X-Mailer: git-send-email 1.7.2.3 Cc: Jared Camins-Esakov Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Follow up for Bug 3326: previous fix broke searches when not using -x X-BeenThere: koha-patches@lists.koha-community.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches submitted to Koha List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: koha-patches-bounces@lists.koha-community.org Errors-To: koha-patches-bounces@lists.koha-community.org From: Jared Camins-Esakov This fix ensures that searches will still work when -x is not used when reindexing Zebra. Signed-off-by: Nicole C. Engard --- C4/XSLT.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/XSLT.pm b/C4/XSLT.pm index d602688..2d1facc 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -140,7 +140,7 @@ sub XSLTParse4Display { $sysxml .= "\n"; $xmlrecord =~ s/\<\/record\>/$itemsxml$sysxml\<\/record\>/; if ($fixamps) { # We need to correct the ampersand entities that Zebra outputs - $xmlrecord =~ s/\&/\&/g; + $xmlrecord =~ s/\&amp;/\&/g; } $xmlrecord =~ s/\& /\&\; /; $xmlrecord =~ s/\&\;amp\; /\&\; /; -- 1.7.2.3