From b5ef5a8387fe0e7d76c0f20d5a16799b23a3fbaf Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 14 Sep 2010 15:31:19 +0000
Subject: [PATCH] Backport from trunk: slimpac cleanup

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@17651 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm | 3 +--
 Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm b/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
index dec92eea46..3e81d2fc4a 100644
--- a/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
+++ b/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
@@ -1334,7 +1334,6 @@ sub create_record_feed {
 	my $lib = uc(shift()) || '-';
 	my $depth = shift;
 	my $flesh = shift;
-	$flesh = 1 if (!defined($flesh));
 
 	my $paging = shift;
 
@@ -1348,7 +1347,7 @@ sub create_record_feed {
 
     my $tag_prefix = sprintf("tag:open-ils.org,$year-\%0.2d-\%0.2d", $month, $day);
 
-	my $flesh_feed = parse_feed_type($type);
+	my $flesh_feed = defined($flesh) ? $flesh : parse_feed_type($type);
 
 	$type =~ s/(-full|-uris)$//o;
 
diff --git a/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl b/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
index 2dba62ad7f..0b2c14ac81 100644
--- a/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
+++ b/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
@@ -33,7 +33,7 @@
      <xsl:apply-templates select="xhtml:abbr[@class='unapi-id']"/>
     </div>
     <br/>
-    <xsl:apply-templates select="hold:volumes"/>
+    <xsl:apply-templates select="hold:holdings/hold:volumes"/>
     <br/>
   </xsl:template>
 
-- 
2.11.0