[open-ils-commits] r17651 - in branches/rel_2_0/Open-ILS: src/perlmods/OpenILS/WWW xsl (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-09-14 11:31:19 -0400 (Tue, 14 Sep 2010)
New Revision: 17651

Modified:
   branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
   branches/rel_2_0/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
Log:
Backport from trunk: slimpac cleanup

Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm	2010-09-14 15:30:17 UTC (rev 17650)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm	2010-09-14 15:31:19 UTC (rev 17651)
@@ -1334,7 +1334,6 @@
 	my $lib = uc(shift()) || '-';
 	my $depth = shift;
 	my $flesh = shift;
-	$flesh = 1 if (!defined($flesh));
 
 	my $paging = shift;
 
@@ -1348,7 +1347,7 @@
 
     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;
 

Modified: branches/rel_2_0/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
===================================================================
--- branches/rel_2_0/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl	2010-09-14 15:30:17 UTC (rev 17650)
+++ branches/rel_2_0/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl	2010-09-14 15:31:19 UTC (rev 17651)
@@ -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>