[Koha-patches] [PATCH 2/2] [SIGNED-OFF] BUG: 5079

Nicole C. Engard nengard at bywatersolutions.com
Thu Jun 30 22:41:22 CEST 2011


From: Elliott Davis <tdavis at uttyler.edu>


Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 installer/data/mysql/en/mandatory/sysprefs.sql     |    2 +-
 .../prog/en/modules/admin/preferences/opac.pref    |    2 +-
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        | 2167 ++++++++++----------
 3 files changed, 1130 insertions(+), 1041 deletions(-)

diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index 7419908..e027fc5 100755
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -92,7 +92,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserjs','','Define custom javascript for inclusion in OPAC','70|10','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserlogin',1,'Enable or disable display of user login features',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',1,'Show the shelving location of items in the opac',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',0,'Show the shelving location of items in the opac',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('patronimages',0,'Enable patron images for the Staff Client',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('printcirculationslips',1,'If ON, enable printing circulation receipts','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RequestOnOpac',1,'If ON, globally enables patron holds on OPAC',NULL,'YesNo');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 88aa7ca..c14fa7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -196,7 +196,7 @@ OPAC:
               choices:
                   yes: Show
                   no: "Don't Show"
-            - Show the shelving location of items in opac results.
+            - the shelving location of items in opac results.
         -
             - pref: OpacPasswordChange
               choices:
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 5805aea..5b3706f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -2,23 +2,24 @@
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
 <xsl:stylesheet version="1.0"
-  xmlns:marc="http://www.loc.gov/MARC21/slim"
-  xmlns:items="http://www.koha-community.org/items"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="marc items">
-    <xsl:import href="MARC21slimUtils.xsl"/>
-    <xsl:output method = "xml" indent="yes" omit-xml-declaration = "yes" />
-    <xsl:key name="item-by-status" match="items:item" use="items:status"/>
-    <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
-
-    <xsl:template match="/">
-            <xsl:apply-templates/>
-    </xsl:template>
-    <xsl:template match="marc:record">
-
-        <!-- Option: Display Alternate Graphic Representation (MARC 880)  -->
-        <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
-
+		xmlns:marc="http://www.loc.gov/MARC21/slim"
+		xmlns:items="http://www.koha-community.org/items"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		exclude-result-prefixes="marc items">
+  <xsl:import href="MARC21slimUtils.xsl"/>
+  <xsl:output method = "xml" indent="yes" omit-xml-declaration = "yes" />
+  <xsl:key name="item-by-status" match="items:item" use="items:status"/>
+  <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
+  <xsl:key name="item-by-status-and-location" match="items:item" use="concat(items:status, ' ', items:location)"/>
+  
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="marc:record">
+    
+    <!-- Option: Display Alternate Graphic Representation (MARC 880)  -->
+    <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
+    
     <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
     <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
     <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>
@@ -27,840 +28,840 @@
     <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>
     <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
     <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
-        <xsl:variable name="leader" select="marc:leader"/>
-        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
-        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
-        <xsl:variable name="leader19" select="substring($leader,20,1)"/>
-        <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
-        <xsl:variable name="isbn" select="marc:datafield[@tag=020]/marc:subfield[@code='a']"/>
-        <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
-        <xsl:variable name="typeOf008">
-            <xsl:choose>
-                <xsl:when test="$leader19='a'">ST</xsl:when>
-                <xsl:when test="$leader6='a'">
-                    <xsl:choose>
-                        <xsl:when test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">BK</xsl:when>
-                        <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">CR</xsl:when>
-                    </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$leader6='t'">BK</xsl:when>
-                <xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
-                <xsl:when test="$leader6='m'">CF</xsl:when>
-                <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
-                <xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
-                <xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="controlField008-23" select="substring($controlField008,24,1)"/>
-        <xsl:variable name="controlField008-21" select="substring($controlField008,22,1)"/>
-        <xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"/>
-        <xsl:variable name="controlField008-24" select="substring($controlField008,25,4)"/>
-        <xsl:variable name="controlField008-26" select="substring($controlField008,27,1)"/>
-        <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"/>
-        <xsl:variable name="controlField008-34" select="substring($controlField008,35,1)"/>
-        <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"/>
-        <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"/>
-
-        <xsl:variable name="physicalDescription">
-            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a']">
-                reformatted digital
-            </xsl:if>
-            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='b']">
-                digitized microfilm
-            </xsl:if>
-            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='d']">
-                digitized other analog
-            </xsl:if>
-
-            <xsl:variable name="check008-23">
-                <xsl:if test="$typeOf008='BK' or $typeOf008='MU' or $typeOf008='CR' or $typeOf008='MX'">
-                    <xsl:value-of select="true()"></xsl:value-of>
-                </xsl:if>
-            </xsl:variable>
-            <xsl:variable name="check008-29">
-                <xsl:if test="$typeOf008='MP' or $typeOf008='VM'">
-                    <xsl:value-of select="true()"></xsl:value-of>
-                </xsl:if>
-            </xsl:variable>
-            <xsl:choose>
-                <xsl:when test="($check008-23 and $controlField008-23='f') or ($check008-29 and $controlField008-29='f')">
-                    braille
-                </xsl:when>
-                <xsl:when test="($controlField008-23=' ' and ($leader6='c' or $leader6='d')) or (($typeOf008='BK' or $typeOf008='CR') and ($controlField008-23=' ' or $controlField008='r'))">
-                    print
-                </xsl:when>
-                <xsl:when test="$leader6 = 'm' or ($check008-23 and $controlField008-23='s') or ($check008-29 and $controlField008-29='s')">
-                    electronic
-                </xsl:when>
-                <xsl:when test="($check008-23 and $controlField008-23='b') or ($check008-29 and $controlField008-29='b')">
-                    microfiche
-                </xsl:when>
-                <xsl:when test="($check008-23 and $controlField008-23='a') or ($check008-29 and $controlField008-29='a')">
-                    microfilm
-                </xsl:when>
-            </xsl:choose>
-<!--
-            <xsl:if test="marc:datafield[@tag=130]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=130]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=240]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=240]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=242]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=242]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=245]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=245]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=246]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=246]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="marc:datafield[@tag=730]/marc:subfield[@code='h']">
-                    <xsl:call-template name="chopBrackets">
-                        <xsl:with-param name="chopString">
-                            <xsl:value-of select="marc:datafield[@tag=730]/marc:subfield[@code='h']"></xsl:value-of>
-                        </xsl:with-param>
-                    </xsl:call-template>
-            </xsl:if>
-            <xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
-                    <xsl:value-of select="."></xsl:value-of>
-            </xsl:for-each>
-            <xsl:for-each select="marc:controlfield[@tag=007][substring(text(),1,1)='c']">
-                <xsl:choose>
-                    <xsl:when test="substring(text(),14,1)='a'">
-                        access
-                    </xsl:when>
-                    <xsl:when test="substring(text(),14,1)='p'">
-                        preservation
-                    </xsl:when>
-                    <xsl:when test="substring(text(),14,1)='r'">
-                        replacement
-                    </xsl:when>
-                </xsl:choose>
-            </xsl:for-each>
--->
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='b']">
-                chip cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='c']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="computer optical disc cartridge" title="computer optical disc cartridge" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='j']">
-                magnetic disc
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='m']">
-                magneto-optical disc
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='o']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="optical disc" title="optical disc" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='r']">
-		available online
-                <img src="/opac-tmpl/prog/famfamfam/silk/drive_web.png" alt="remote" title="remote" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='a']">
-                tape cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='f']">
-                tape cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='h']">
-                tape reel
-            </xsl:if>
+    <xsl:variable name="leader" select="marc:leader"/>
+    <xsl:variable name="leader6" select="substring($leader,7,1)"/>
+    <xsl:variable name="leader7" select="substring($leader,8,1)"/>
+    <xsl:variable name="leader19" select="substring($leader,20,1)"/>
+    <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
+    <xsl:variable name="isbn" select="marc:datafield[@tag=020]/marc:subfield[@code='a']"/>
+    <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
+    <xsl:variable name="typeOf008">
+      <xsl:choose>
+	<xsl:when test="$leader19='a'">ST</xsl:when>
+	<xsl:when test="$leader6='a'">
+	  <xsl:choose>
+	    <xsl:when test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">BK</xsl:when>
+	    <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">CR</xsl:when>
+	  </xsl:choose>
+	</xsl:when>
+	<xsl:when test="$leader6='t'">BK</xsl:when>
+	<xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
+	<xsl:when test="$leader6='m'">CF</xsl:when>
+	<xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
+	<xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
+	<xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
+	<xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="controlField008-23" select="substring($controlField008,24,1)"/>
+    <xsl:variable name="controlField008-21" select="substring($controlField008,22,1)"/>
+    <xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"/>
+    <xsl:variable name="controlField008-24" select="substring($controlField008,25,4)"/>
+    <xsl:variable name="controlField008-26" select="substring($controlField008,27,1)"/>
+    <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"/>
+    <xsl:variable name="controlField008-34" select="substring($controlField008,35,1)"/>
+    <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"/>
+    <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"/>
+    
+    <xsl:variable name="physicalDescription">
+      <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a']">
+	reformatted digital
+      </xsl:if>
+      <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='b']">
+	digitized microfilm
+      </xsl:if>
+      <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='d']">
+	digitized other analog
+      </xsl:if>
+      
+      <xsl:variable name="check008-23">
+	<xsl:if test="$typeOf008='BK' or $typeOf008='MU' or $typeOf008='CR' or $typeOf008='MX'">
+	  <xsl:value-of select="true()"></xsl:value-of>
+	</xsl:if>
+      </xsl:variable>
+      <xsl:variable name="check008-29">
+	<xsl:if test="$typeOf008='MP' or $typeOf008='VM'">
+	  <xsl:value-of select="true()"></xsl:value-of>
+	</xsl:if>
+      </xsl:variable>
+      <xsl:choose>
+	<xsl:when test="($check008-23 and $controlField008-23='f') or ($check008-29 and $controlField008-29='f')">
+	  braille
+	</xsl:when>
+	<xsl:when test="($controlField008-23=' ' and ($leader6='c' or $leader6='d')) or (($typeOf008='BK' or $typeOf008='CR') and ($controlField008-23=' ' or $controlField008='r'))">
+	  print
+	</xsl:when>
+	<xsl:when test="$leader6 = 'm' or ($check008-23 and $controlField008-23='s') or ($check008-29 and $controlField008-29='s')">
+	  electronic
+	</xsl:when>
+	<xsl:when test="($check008-23 and $controlField008-23='b') or ($check008-29 and $controlField008-29='b')">
+	  microfiche
+	</xsl:when>
+	<xsl:when test="($check008-23 and $controlField008-23='a') or ($check008-29 and $controlField008-29='a')">
+	  microfilm
+	</xsl:when>
+      </xsl:choose>
+      <!--
+	  <xsl:if test="marc:datafield[@tag=130]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=130]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=240]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=240]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=242]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=242]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=245]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=245]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=246]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=246]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:datafield[@tag=730]/marc:subfield[@code='h']">
+	  <xsl:call-template name="chopBrackets">
+	  <xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:datafield[@tag=730]/marc:subfield[@code='h']"></xsl:value-of>
+	  </xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:if>
+	  <xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
+	  <xsl:value-of select="."></xsl:value-of>
+	  </xsl:for-each>
+	  <xsl:for-each select="marc:controlfield[@tag=007][substring(text(),1,1)='c']">
+	  <xsl:choose>
+	  <xsl:when test="substring(text(),14,1)='a'">
+	  access
+	  </xsl:when>
+	  <xsl:when test="substring(text(),14,1)='p'">
+	  preservation
+	  </xsl:when>
+	  <xsl:when test="substring(text(),14,1)='r'">
+	  replacement
+	  </xsl:when>
+	  </xsl:choose>
+	  </xsl:for-each>
+      -->
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='b']">
+	chip cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='c']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="computer optical disc cartridge" title="computer optical disc cartridge" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='j']">
+	magnetic disc
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='m']">
+	magneto-optical disc
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='o']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="optical disc" title="optical disc" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='r']">
+	available online
+	<img src="/opac-tmpl/prog/famfamfam/silk/drive_web.png" alt="remote" title="remote" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='a']">
+	tape cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='f']">
+	tape cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='h']">
+	tape reel
+      </xsl:if>
+      
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='a']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="celestial globe" title="celestial globe" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='e']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="earth moon globe" title="earth moon globe" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='b']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="planetary or lunar globe" title="planetary or lunar globe" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='c']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="terrestrial globe" title="terrestrial globe" class="format"/>
+      </xsl:if>
+      
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='o'][substring(text(),2,1)='o']">
+	kit
+      </xsl:if>
+      
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
+	atlas
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='g']">
+	diagram
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
+	map
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
+	model
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='k']">
+	profile
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
+	remote-sensing image
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='s']">
+	section
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='y']">
+	view
+      </xsl:if>
+      
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='a']">
+	aperture card
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='e']">
+	microfiche
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='f']">
+	microfiche cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='b']">
+	microfilm cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='c']">
+	microfilm cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='d']">
+	microfilm reel
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='g']">
+	microopaque
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='c']">
+	film cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='f']">
+	film cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='r']">
+	film reel
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='n']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/chart_curve.png" alt="chart" title="chart" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='c']">
+	collage
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='d']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/pencil.png" alt="drawing" title="drawing" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='o']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/note.png" alt="flash card" title="flash card" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='e']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/paintbrush.png" alt="painting" title="painting" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='f']">
+	photomechanical print
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='g']">
+	photonegative
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='h']">
+	photoprint
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='i']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/picture.png" alt="picture" title="picture" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='j']">
+	print
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='l']">
+	technical drawing
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='q'][substring(text(),2,1)='q']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/script.png" alt="notated music" title="notated music" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='d']">
+	filmslip
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='c']">
+	filmstrip cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='o']">
+	filmstrip roll
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='f']">
+	other filmstrip type
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='s']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/pictures.png" alt="slide" title="slide" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='t']">
+	transparency
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='r'][substring(text(),2,1)='r']">
+	remote-sensing image
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='e']">
+	cylinder
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='q']">
+	roll
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='g']">
+	sound cartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='s']">
+	sound cassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='d']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="sound disc" title="sound disc" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='t']">
+	sound-tape reel
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='i']">
+	sound-track film
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='w']">
+	wire recording
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='c']">
+	braille
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='b']">
+	combination
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='a']">
+	moon
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='d']">
+	tactile, with no writing system
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='c']">
+	braille
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='b']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/magnifier.png" alt="large print" title="large print" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='a']">
+	regular print
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='d']">
+	text in looseleaf binder
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='c']">
+	videocartridge
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='f']">
+	videocassette
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='d']">
+	<img src="/opac-tmpl/prog/famfamfam/silk/dvd.png" alt="videodisc" title="videodisc" class="format"/>
+      </xsl:if>
+      <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='r']">
+	videoreel
+      </xsl:if>
+      <!--
+	  <xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q'][string-length(.)>1]">
+	  <xsl:value-of select="."></xsl:value-of>
+	  </xsl:for-each>
+	  <xsl:for-each select="marc:datafield[@tag=300]">
+	  <xsl:call-template name="subfieldSelect">
+	  <xsl:with-param name="codes">abce</xsl:with-param>
+	  </xsl:call-template>
+	  </xsl:for-each>
+      -->
+    </xsl:variable>
 
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='a']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="celestial globe" title="celestial globe" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='e']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="earth moon globe" title="earth moon globe" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='b']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="planetary or lunar globe" title="planetary or lunar globe" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='c']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/world.png" alt="terrestrial globe" title="terrestrial globe" class="format"/>
-            </xsl:if>
-
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='o'][substring(text(),2,1)='o']">
-                kit
-            </xsl:if>
-
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
-                atlas
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='g']">
-                diagram
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
-                map
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
-                model
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='k']">
-                profile
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
-                remote-sensing image
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='s']">
-                section
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='y']">
-                view
-            </xsl:if>
-
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='a']">
-                aperture card
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='e']">
-                microfiche
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='f']">
-                microfiche cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='b']">
-                microfilm cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='c']">
-                microfilm cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='d']">
-                microfilm reel
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='g']">
-                microopaque
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='c']">
-                film cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='f']">
-                film cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='r']">
-                film reel
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='n']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/chart_curve.png" alt="chart" title="chart" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='c']">
-                collage
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='d']">
-                 <img src="/opac-tmpl/prog/famfamfam/silk/pencil.png" alt="drawing" title="drawing" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='o']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/note.png" alt="flash card" title="flash card" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='e']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/paintbrush.png" alt="painting" title="painting" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='f']">
-                photomechanical print
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='g']">
-                photonegative
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='h']">
-                photoprint
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='i']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/picture.png" alt="picture" title="picture" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='j']">
-                print
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='l']">
-                technical drawing
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='q'][substring(text(),2,1)='q']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/script.png" alt="notated music" title="notated music" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='d']">
-                filmslip
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='c']">
-                filmstrip cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='o']">
-                filmstrip roll
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='f']">
-                other filmstrip type
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='s']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/pictures.png" alt="slide" title="slide" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='t']">
-                transparency
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='r'][substring(text(),2,1)='r']">
-                remote-sensing image
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='e']">
-                cylinder
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='q']">
-                roll
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='g']">
-                sound cartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='s']">
-                sound cassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='d']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/cd.png" alt="sound disc" title="sound disc" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='t']">
-                sound-tape reel
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='i']">
-                sound-track film
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='w']">
-                wire recording
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='c']">
-                braille
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='b']">
-                combination
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='a']">
-                moon
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='d']">
-                tactile, with no writing system
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='c']">
-                braille
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='b']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/magnifier.png" alt="large print" title="large print" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='a']">
-                regular print
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='d']">
-                text in looseleaf binder
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='c']">
-                videocartridge
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='f']">
-                videocassette
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='d']">
-                <img src="/opac-tmpl/prog/famfamfam/silk/dvd.png" alt="videodisc" title="videodisc" class="format"/>
-            </xsl:if>
-            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='r']">
-                videoreel
-            </xsl:if>
-<!--
-            <xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q'][string-length(.)>1]">
-                    <xsl:value-of select="."></xsl:value-of>
-            </xsl:for-each>
-            <xsl:for-each select="marc:datafield[@tag=300]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abce</xsl:with-param>
-                    </xsl:call-template>
-            </xsl:for-each>
--->
-        </xsl:variable>
-
-        <!-- Title Statement: Alternate Graphic Representation (MARC 880) -->
-        <xsl:if test="$display880">
-           <xsl:call-template name="m880Select">
-              <xsl:with-param name="basetags">245</xsl:with-param>
-              <xsl:with-param name="codes">abhfgknps</xsl:with-param>
-              <xsl:with-param name="bibno"><xsl:value-of  select="$biblionumber"/></xsl:with-param>
-           </xsl:call-template>
-        </xsl:if>
+    <!-- Title Statement: Alternate Graphic Representation (MARC 880) -->
+    <xsl:if test="$display880">
+      <xsl:call-template name="m880Select">
+	<xsl:with-param name="basetags">245</xsl:with-param>
+	<xsl:with-param name="codes">abhfgknps</xsl:with-param>
+	<xsl:with-param name="bibno"><xsl:value-of  select="$biblionumber"/></xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
 
-        <a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute><xsl:attribute name="class">title</xsl:attribute>
+    <a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute><xsl:attribute name="class">title</xsl:attribute>
 
-        <xsl:if test="marc:datafield[@tag=245]">
-        <xsl:for-each select="marc:datafield[@tag=245]">
-            <xsl:variable name="title">
-                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">a</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:if test="marc:subfield[@code='b']">
-                        <xsl:text> </xsl:text>
-                        <xsl:call-template name="subfieldSelect">
-                            <xsl:with-param name="codes">b</xsl:with-param>
-                        </xsl:call-template>
-                    </xsl:if>
-                    <xsl:if test="marc:subfield[@code='h']">
-                        <xsl:text> </xsl:text>
-                        <xsl:call-template name="subfieldSelect">
-                            <xsl:with-param name="codes">h</xsl:with-param>
-                        </xsl:call-template>
-                    </xsl:if>
-                <xsl:text> </xsl:text>
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">fgknps</xsl:with-param>
-                     </xsl:call-template>
-            </xsl:variable>
-            <xsl:variable name="titleChop">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString">
-                        <xsl:value-of select="$title"/>
-                    </xsl:with-param>
-                </xsl:call-template>
-            </xsl:variable>
-            <xsl:value-of select="$titleChop"/>
-        </xsl:for-each>
-        </xsl:if>
+    <xsl:if test="marc:datafield[@tag=245]">
+      <xsl:for-each select="marc:datafield[@tag=245]">
+	<xsl:variable name="title">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">a</xsl:with-param>
+	  </xsl:call-template>
+	  <xsl:if test="marc:subfield[@code='b']">
+	    <xsl:text> </xsl:text>
+	    <xsl:call-template name="subfieldSelect">
+	      <xsl:with-param name="codes">b</xsl:with-param>
+	    </xsl:call-template>
+	  </xsl:if>
+	  <xsl:if test="marc:subfield[@code='h']">
+	    <xsl:text> </xsl:text>
+	    <xsl:call-template name="subfieldSelect">
+	      <xsl:with-param name="codes">h</xsl:with-param>
+	    </xsl:call-template>
+	  </xsl:if>
+	  <xsl:text> </xsl:text>
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">fgknps</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:variable>
+	<xsl:variable name="titleChop">
+	  <xsl:call-template name="chopPunctuation">
+	    <xsl:with-param name="chopString">
+	      <xsl:value-of select="$title"/>
+	    </xsl:with-param>
+	  </xsl:call-template>
+	</xsl:variable>
+	<xsl:value-of select="$titleChop"/>
+      </xsl:for-each>
+    </xsl:if>
     </a>
     <p>
 
-    <!-- Author Statement: Alternate Graphic Representation (MARC 880) -->
-    <xsl:if test="$display880">
-      <xsl:call-template name="m880Select">
-      <xsl:with-param name="basetags">100,110,111,700,710,711</xsl:with-param>
-      <xsl:with-param name="codes">abc</xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
+      <!-- Author Statement: Alternate Graphic Representation (MARC 880) -->
+      <xsl:if test="$display880">
+	<xsl:call-template name="m880Select">
+	  <xsl:with-param name="basetags">100,110,111,700,710,711</xsl:with-param>
+	  <xsl:with-param name="codes">abc</xsl:with-param>
+	</xsl:call-template>
+      </xsl:if>
 
-    <xsl:choose>
-    <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
+      <xsl:choose>
+	<xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
 
-    by <span class="author">
-        <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
+	  by <span class="author">
+	  <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
             <xsl:choose>
-            <xsl:when test="position()=last()">
+	      <xsl:when test="position()=last()">
                 <xsl:call-template name="nameABCDQ"/>.
-            </xsl:when>
-            <xsl:otherwise>
+	      </xsl:when>
+	      <xsl:otherwise>
                 <xsl:call-template name="nameABCDQ"/>;
-            </xsl:otherwise>
+	      </xsl:otherwise>
             </xsl:choose>
-        </xsl:for-each>
+	  </xsl:for-each>
 
-        <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
+	  <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
             <xsl:choose>
-            <xsl:when test="position()=1">
+	      <xsl:when test="position()=1">
 		<xsl:text> -- </xsl:text>
-            </xsl:when>
+	      </xsl:when>
             </xsl:choose>
             <xsl:choose>
-            <xsl:when test="position()=last()">
+	      <xsl:when test="position()=last()">
                 <xsl:call-template name="nameABCDN"/> 
-            </xsl:when>
-            <xsl:otherwise>
+	      </xsl:when>
+	      <xsl:otherwise>
                 <xsl:call-template name="nameABCDN"/>;
-            </xsl:otherwise>
+	      </xsl:otherwise>
             </xsl:choose>
-        </xsl:for-each>
+	  </xsl:for-each>
 
-        <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
+	  <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
             <xsl:choose>
-            <xsl:when test="position()=1">
+	      <xsl:when test="position()=1">
 		<xsl:text> -- </xsl:text>
-            </xsl:when>
+	      </xsl:when>
             </xsl:choose>
             <xsl:choose>
-            <xsl:when test="marc:subfield[@code='n']">
-               <xsl:text> </xsl:text>
-               <xsl:call-template name="subfieldSelect">
+	      <xsl:when test="marc:subfield[@code='n']">
+		<xsl:text> </xsl:text>
+		<xsl:call-template name="subfieldSelect">
                   <xsl:with-param name="codes">n</xsl:with-param> 
-               </xsl:call-template>
-               <xsl:text> </xsl:text>
-            </xsl:when>
+		</xsl:call-template>
+		<xsl:text> </xsl:text>
+	      </xsl:when>
             </xsl:choose>
             <xsl:choose>
-            <xsl:when test="position()=last()">
+	      <xsl:when test="position()=last()">
                 <xsl:call-template name="nameACDEQ"/>.
-            </xsl:when>
-            <xsl:otherwise>
+	      </xsl:when>
+	      <xsl:otherwise>
                 <xsl:call-template name="nameACDEQ"/>;
-            </xsl:otherwise>
+	      </xsl:otherwise>
             </xsl:choose>
-        </xsl:for-each>
-    </span>
-    </xsl:when>
-    </xsl:choose>
+	  </xsl:for-each>
+	</span>
+	</xsl:when>
+      </xsl:choose>
     </p>
 
     <xsl:if test="marc:datafield[@tag=250]">
-	<span class="results_summary">
-    <span class="label">Edition: </span>
-            <xsl:for-each select="marc:datafield[@tag=250]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">ab</xsl:with-param>
-                    </xsl:call-template>
-            </xsl:for-each>
-	</span>
+      <span class="results_summary">
+	<span class="label">Edition: </span>
+	<xsl:for-each select="marc:datafield[@tag=250]">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">ab</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:for-each>
+      </span>
     </xsl:if>
 
-<xsl:if test="$DisplayOPACiconsXSLT!='0'">
-    <span class="results_summary">
-    <xsl:if test="$typeOf008!=''">
-        <span class="label">Type: </span>
-            <xsl:choose>
-                <xsl:when test="$leader19='a'"><img src="/opac-tmpl/prog/famfamfam/silk/book_link.png" alt="book" title="book" class="materialtype"/> Set</xsl:when>
-                <xsl:when test="$leader6='a'">
-                    <xsl:choose>
-                        <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
-                        <xsl:when test="$leader7='i' or $leader7='s'"><img src="/opac-tmpl/prog/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing Resource</xsl:when>
-                        <xsl:when test="$leader7='a' or $leader7='b'"><img src="/opac-tmpl/prog/famfamfam/silk/book_open.png" alt="article" title="article" class="materialtype"/> Article</xsl:when>
-                    </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$leader6='t'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
-				<xsl:when test="$leader6='o'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="kit" title="kit" class="materialtype"/> Kit</xsl:when>
-				<xsl:when test="$leader6='p'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed Materials</xsl:when>
-                <xsl:when test="$leader6='m'"><img src="/opac-tmpl/prog/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer File</xsl:when>
-                <xsl:when test="$leader6='e' or $leader6='f'"><img src="/opac-tmpl/prog/famfamfam/silk/map.png" alt="map" title="map" class="materialtype"/> Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/opac-tmpl/prog/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual Material</xsl:when>
-                <xsl:when test="$leader6='c' or $leader6='d'"><img src="/opac-tmpl/prog/famfamfam/silk/music.png" alt="score" title="score" class="materialtype"/> Score</xsl:when>
-                <xsl:when test="$leader6='i'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype"/> Sound</xsl:when>
-                <xsl:when test="$leader6='j'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype"/> Music</xsl:when>
-            </xsl:choose>
-    </xsl:if>
-    <xsl:if test="string-length(normalize-space($physicalDescription))">
-        <span class="label">; Format: </span><xsl:copy-of select="$physicalDescription"></xsl:copy-of>
-    </xsl:if>
+    <xsl:if test="$DisplayOPACiconsXSLT!='0'">
+      <span class="results_summary">
+	<xsl:if test="$typeOf008!=''">
+	  <span class="label">Type: </span>
+	  <xsl:choose>
+	    <xsl:when test="$leader19='a'"><img src="/opac-tmpl/prog/famfamfam/silk/book_link.png" alt="book" title="book" class="materialtype"/> Set</xsl:when>
+	    <xsl:when test="$leader6='a'">
+	      <xsl:choose>
+		<xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
+		<xsl:when test="$leader7='i' or $leader7='s'"><img src="/opac-tmpl/prog/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing Resource</xsl:when>
+		<xsl:when test="$leader7='a' or $leader7='b'"><img src="/opac-tmpl/prog/famfamfam/silk/book_open.png" alt="article" title="article" class="materialtype"/> Article</xsl:when>
+	      </xsl:choose>
+	    </xsl:when>
+	    <xsl:when test="$leader6='t'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
+	    <xsl:when test="$leader6='o'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="kit" title="kit" class="materialtype"/> Kit</xsl:when>
+	    <xsl:when test="$leader6='p'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed Materials</xsl:when>
+	    <xsl:when test="$leader6='m'"><img src="/opac-tmpl/prog/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer File</xsl:when>
+	    <xsl:when test="$leader6='e' or $leader6='f'"><img src="/opac-tmpl/prog/famfamfam/silk/map.png" alt="map" title="map" class="materialtype"/> Map</xsl:when>
+	    <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/opac-tmpl/prog/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual Material</xsl:when>
+	    <xsl:when test="$leader6='c' or $leader6='d'"><img src="/opac-tmpl/prog/famfamfam/silk/music.png" alt="score" title="score" class="materialtype"/> Score</xsl:when>
+	    <xsl:when test="$leader6='i'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype"/> Sound</xsl:when>
+	    <xsl:when test="$leader6='j'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype"/> Music</xsl:when>
+	  </xsl:choose>
+	</xsl:if>
+	<xsl:if test="string-length(normalize-space($physicalDescription))">
+	  <span class="label">; Format: </span><xsl:copy-of select="$physicalDescription"></xsl:copy-of>
+	</xsl:if>
 
         <xsl:if test="$controlField008-21 or $controlField008-22 or $controlField008-24 or $controlField008-26 or $controlField008-29 or $controlField008-34 or $controlField008-33 or $controlField008-30-31 or $controlField008-33">
 
-        <xsl:if test="$typeOf008='CR'">
-        <xsl:if test="$controlField008-21 and $controlField008-21 !='|' and $controlField008-21 !=' '">
-        <span class="label">; Type of continuing resource: </span>
-        </xsl:if>
+	  <xsl:if test="$typeOf008='CR'">
+	    <xsl:if test="$controlField008-21 and $controlField008-21 !='|' and $controlField008-21 !=' '">
+	      <span class="label">; Type of continuing resource: </span>
+	    </xsl:if>
             <xsl:choose>
-                <xsl:when test="$controlField008-21='d'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
-                </xsl:when>
-                <xsl:when test="$controlField008-21='l'">
-                    loose-leaf
-                </xsl:when>
-                <xsl:when test="$controlField008-21='m'">
-                    series
-                </xsl:when>
-                <xsl:when test="$controlField008-21='n'">
-                    newspaper
-                </xsl:when>
-                <xsl:when test="$controlField008-21='p'">
-                    periodical
-                </xsl:when>
-                <xsl:when test="$controlField008-21='w'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/world_link.png" alt="web site" title="web site" class="format"/>
-                </xsl:when>
+	      <xsl:when test="$controlField008-21='d'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='l'">
+		loose-leaf
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='m'">
+		series
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='n'">
+		newspaper
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='p'">
+		periodical
+	      </xsl:when>
+	      <xsl:when test="$controlField008-21='w'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/world_link.png" alt="web site" title="web site" class="format"/>
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if>
-        <xsl:if test="$typeOf008='BK' or $typeOf008='CR'">
-        <xsl:if test="contains($controlField008-24,'abcdefghijklmnopqrstvwxyz')">
-        <span class="label">; Nature of contents: </span>
-        </xsl:if>
+	  </xsl:if>
+	  <xsl:if test="$typeOf008='BK' or $typeOf008='CR'">
+	    <xsl:if test="contains($controlField008-24,'abcdefghijklmnopqrstvwxyz')">
+	      <span class="label">; Nature of contents: </span>
+	    </xsl:if>
             <xsl:choose>
-                <xsl:when test="contains($controlField008-24,'a')">
-                    abstract or summary
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'b')">
-			bibliography
-                     <img src="/opac-tmpl/prog/famfamfam/silk/text_list_bullets.png" alt="bibliography" title="bibliography" class="natureofcontents"/>
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'c')">
-                    catalog
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'d')">
-                    dictionary
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'e')">
-                    encyclopedia
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'f')">
-                    handbook
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'g')">
-                    legal article
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'i')">
-                    index
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'k')">
-                    discography
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'l')">
-                    legislation
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'m')">
-                    theses
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'n')">
-                    survey of literature
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'o')">
-                    review
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'p')">
-                    programmed text
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'q')">
-                    filmography
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'r')">
-                    directory
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'s')">
-                    statistics
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'t')">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/report.png" alt="technical report" title="technical report" class="natureofcontents"/>
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'v')">
-                    legal case and case notes
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'w')">
-                    law report or digest
-                </xsl:when>
-                <xsl:when test="contains($controlField008-24,'z')">
-                    treaty
-                </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'a')">
+		abstract or summary
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'b')">
+		bibliography
+		<img src="/opac-tmpl/prog/famfamfam/silk/text_list_bullets.png" alt="bibliography" title="bibliography" class="natureofcontents"/>
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'c')">
+		catalog
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'d')">
+		dictionary
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'e')">
+		encyclopedia
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'f')">
+		handbook
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'g')">
+		legal article
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'i')">
+		index
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'k')">
+		discography
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'l')">
+		legislation
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'m')">
+		theses
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'n')">
+		survey of literature
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'o')">
+		review
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'p')">
+		programmed text
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'q')">
+		filmography
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'r')">
+		directory
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'s')">
+		statistics
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'t')">
+		<img src="/opac-tmpl/prog/famfamfam/silk/report.png" alt="technical report" title="technical report" class="natureofcontents"/>
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'v')">
+		legal case and case notes
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'w')">
+		law report or digest
+	      </xsl:when>
+	      <xsl:when test="contains($controlField008-24,'z')">
+		treaty
+	      </xsl:when>
             </xsl:choose>
             <xsl:choose>
-                <xsl:when test="$controlField008-29='1'">
-                    conference publication
-                </xsl:when>
+	      <xsl:when test="$controlField008-29='1'">
+		conference publication
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if>
-        <xsl:if test="$typeOf008='CF'">
+	  </xsl:if>
+	  <xsl:if test="$typeOf008='CF'">
             <xsl:if test="$controlField008-26='a' or $controlField008-26='e' or $controlField008-26='f' or $controlField008-26='g'">
-            <span class="label">; Type of computer file: </span>
+	      <span class="label">; Type of computer file: </span>
             </xsl:if>
             <xsl:choose>
-                <xsl:when test="$controlField008-26='a'">
-                    numeric data
-                </xsl:when>
-                <xsl:when test="$controlField008-26='e'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
-                </xsl:when>
-                <xsl:when test="$controlField008-26='f'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/font.png" alt="font" title="font" class="format"/> 
-                </xsl:when>
-                <xsl:when test="$controlField008-26='g'">
-                     <img src="/opac-tmpl/prog/famfamfam/silk/controller.png" alt="game" title="game" class="format"/>
-                </xsl:when>
+	      <xsl:when test="$controlField008-26='a'">
+		numeric data
+	      </xsl:when>
+	      <xsl:when test="$controlField008-26='e'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
+	      </xsl:when>
+	      <xsl:when test="$controlField008-26='f'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/font.png" alt="font" title="font" class="format"/> 
+	      </xsl:when>
+	      <xsl:when test="$controlField008-26='g'">
+		<img src="/opac-tmpl/prog/famfamfam/silk/controller.png" alt="game" title="game" class="format"/>
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if>
-        <xsl:if test="$typeOf008='BK'">
+	  </xsl:if>
+	  <xsl:if test="$typeOf008='BK'">
             <xsl:if test="(substring($controlField008,25,1)='j') or (substring($controlField008,25,1)='1') or ($controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d')">
-            <span class="label">; Nature of contents: </span>
+	      <span class="label">; Nature of contents: </span>
             </xsl:if>
             <xsl:if test="substring($controlField008,25,1)='j'">
-                patent
+	      patent
             </xsl:if>
             <xsl:if test="substring($controlField008,31,1)='1'">
-                festschrift
+	      festschrift
             </xsl:if>
             <xsl:if test="$controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d'">
-                 <img src="/opac-tmpl/prog/famfamfam/silk/user.png" alt="biography" title="biography" class="natureofcontents"/>
+	      <img src="/opac-tmpl/prog/famfamfam/silk/user.png" alt="biography" title="biography" class="natureofcontents"/>
             </xsl:if>
 
             <xsl:if test="$controlField008-33 and $controlField008-33!='|' and $controlField008-33!='u' and $controlField008-33!=' '">
-            <span class="label">; Literary form: </span>
+	      <span class="label">; Literary form: </span>
             </xsl:if>
             <xsl:choose>
-                <xsl:when test="$controlField008-33='0'">
-                    not fiction
-                </xsl:when>
-                <xsl:when test="$controlField008-33='1'">
-                    fiction
-                </xsl:when> 
-                <xsl:when test="$controlField008-33='e'">
-                    essay
-                </xsl:when>
-                <xsl:when test="$controlField008-33='d'">
-                    drama
-                </xsl:when>
-                <xsl:when test="$controlField008-33='c'">
-                    comic strip
-                </xsl:when>
-                <xsl:when test="$controlField008-33='l'">
-                    fiction
-                </xsl:when>
-                <xsl:when test="$controlField008-33='h'">
-                    humor, satire
-                </xsl:when>
-                <xsl:when test="$controlField008-33='i'">
-                    letter
-                </xsl:when>
-                <xsl:when test="$controlField008-33='f'">
-                    novel
-                </xsl:when>
-                <xsl:when test="$controlField008-33='j'">
-                    short story
-                </xsl:when>
-                <xsl:when test="$controlField008-33='s'">
-                    speech
-                </xsl:when>
+	      <xsl:when test="$controlField008-33='0'">
+		not fiction
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='1'">
+		fiction
+	      </xsl:when> 
+	      <xsl:when test="$controlField008-33='e'">
+		essay
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='d'">
+		drama
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='c'">
+		comic strip
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='l'">
+		fiction
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='h'">
+		humor, satire
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='i'">
+		letter
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='f'">
+		novel
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='j'">
+		short story
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='s'">
+		speech
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if> 
-        <xsl:if test="$typeOf008='MU' and $controlField008-30-31 and $controlField008-30-31!='||' and $controlField008-30-31!='  '">
+	  </xsl:if> 
+	  <xsl:if test="$typeOf008='MU' and $controlField008-30-31 and $controlField008-30-31!='||' and $controlField008-30-31!='  '">
             <span class="label">; Literary form: </span> <!-- Literary text for sound recordings -->
             <xsl:if test="contains($controlField008-30-31,'b')">
-                biography
+	      biography
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'c')">
-                conference publication
+	      conference publication
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'d')">
-                drama
+	      drama
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'e')">
-                essay
+	      essay
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'f')">
-                fiction
+	      fiction
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'o')">
-                folktale
+	      folktale
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'h')">
-                history
+	      history
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'k')">
-                humor, satire
+	      humor, satire
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'m')">
-                memoir
+	      memoir
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'p')">
-                poetry
+	      poetry
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'r')">
-                rehearsal
+	      rehearsal
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'g')">
-                reporting
+	      reporting
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'s')">
-                sound
+	      sound
             </xsl:if>
             <xsl:if test="contains($controlField008-30-31,'l')">
-                speech
+	      speech
             </xsl:if>
-        </xsl:if>
-        <xsl:if test="$typeOf008='VM'">
+	  </xsl:if>
+	  <xsl:if test="$typeOf008='VM'">
             <span class="label">; Type of visual material: </span>
             <xsl:choose>
-                <xsl:when test="$controlField008-33='a'">
-                    art original
-                </xsl:when>
-                <xsl:when test="$controlField008-33='b'">
-                    kit
-                </xsl:when>
-                <xsl:when test="$controlField008-33='c'">
-                    art reproduction
-                </xsl:when>
-                <xsl:when test="$controlField008-33='d'">
-                    diorama
-                </xsl:when>
-                <xsl:when test="$controlField008-33='f'">
-                    filmstrip
-                </xsl:when>
-                <xsl:when test="$controlField008-33='g'">
-                    legal article
-                </xsl:when>
-                <xsl:when test="$controlField008-33='i'">
-                    picture
-                </xsl:when>
-                <xsl:when test="$controlField008-33='k'">
-                    graphic
-                </xsl:when>
-                <xsl:when test="$controlField008-33='l'">
-                    technical drawing
-                </xsl:when>
-                <xsl:when test="$controlField008-33='m'">
-                    motion picture
-                </xsl:when>
-                <xsl:when test="$controlField008-33='n'">
-                    chart
-                </xsl:when>
-                <xsl:when test="$controlField008-33='o'">
-                    flash card
-                </xsl:when>
-                <xsl:when test="$controlField008-33='p'">
-                    microscope slide
-                </xsl:when>
-                <xsl:when test="$controlField008-33='q' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2
-,1)='q']">
-                    model
-                </xsl:when>
-                <xsl:when test="$controlField008-33='r'">
-                    realia
-                </xsl:when>
-                <xsl:when test="$controlField008-33='s'">
-                    slide
-                </xsl:when>
-                <xsl:when test="$controlField008-33='t'">
-                    transparency
-                </xsl:when>
-                <xsl:when test="$controlField008-33='v'">
-                    videorecording
-                </xsl:when>
-                <xsl:when test="$controlField008-33='w'">
-                    toy
-                </xsl:when>
+	      <xsl:when test="$controlField008-33='a'">
+		art original
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='b'">
+		kit
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='c'">
+		art reproduction
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='d'">
+		diorama
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='f'">
+		filmstrip
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='g'">
+		legal article
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='i'">
+		picture
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='k'">
+		graphic
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='l'">
+		technical drawing
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='m'">
+		motion picture
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='n'">
+		chart
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='o'">
+		flash card
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='p'">
+		microscope slide
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='q' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2
+			      ,1)='q']">
+		model
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='r'">
+		realia
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='s'">
+		slide
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='t'">
+		transparency
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='v'">
+		videorecording
+	      </xsl:when>
+	      <xsl:when test="$controlField008-33='w'">
+		toy
+	      </xsl:when>
             </xsl:choose>
-        </xsl:if>
+	  </xsl:if>
         </xsl:if> 
 
-    <xsl:if test="($typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM') and ($controlField008-22='a' or $controlField008-22='b' or $controlField008-22='c' or $controlField008-22='d' or $controlField008-22='e' or $controlField008-22='g' or $controlField008-22='j' or $controlField008-22='f')">
-        <span class="label">; Audience: </span>
-        <xsl:choose>
+	<xsl:if test="($typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM') and ($controlField008-22='a' or $controlField008-22='b' or $controlField008-22='c' or $controlField008-22='d' or $controlField008-22='e' or $controlField008-22='g' or $controlField008-22='j' or $controlField008-22='f')">
+	  <span class="label">; Audience: </span>
+	  <xsl:choose>
             <xsl:when test="$controlField008-22='a'">
-             Preschool;
+	      Preschool;
             </xsl:when>
             <xsl:when test="$controlField008-22='b'">
-             Primary;
+	      Primary;
             </xsl:when>
             <xsl:when test="$controlField008-22='c'">
-             Pre-adolescent;
+	      Pre-adolescent;
             </xsl:when>
             <xsl:when test="$controlField008-22='d'">
-             Adolescent;
+	      Adolescent;
             </xsl:when>
             <xsl:when test="$controlField008-22='e'">
-             Adult;
+	      Adult;
             </xsl:when>
             <xsl:when test="$controlField008-22='g'">
-             General;
+	      General;
             </xsl:when>
             <xsl:when test="$controlField008-22='j'">
-             Juvenile;
+	      Juvenile;
             </xsl:when>
             <xsl:when test="$controlField008-22='f'">
-             Specialized;
+	      Specialized;
             </xsl:when>
-            </xsl:choose>
+	  </xsl:choose>
+	</xsl:if>
+	<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
+      </span>
     </xsl:if>
-<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
-	</span>
-</xsl:if>
 
     <!-- Publisher Statement: Alternate Graphic Representation (MARC 880) -->
     <xsl:if test="$display880">
@@ -871,325 +872,413 @@
         <xsl:with-param name="label">Publisher: </xsl:with-param>
       </xsl:call-template>
     </xsl:if>
-        
+    
     <xsl:if test="marc:datafield[@tag=260]">
-	<span class="results_summary">
-    <span class="label">Publisher: </span> 
-            <xsl:for-each select="marc:datafield[@tag=260]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abcg</xsl:with-param>
-                    </xsl:call-template>
-            </xsl:for-each>
-	</span>
+      <span class="results_summary">
+	<span class="label">Publisher: </span> 
+	<xsl:for-each select="marc:datafield[@tag=260]">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">abcg</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:for-each>
+      </span>
     </xsl:if>
 
     <!-- Other Title  Statement: Alternate Graphic Representation (MARC 880) -->
     <xsl:if test="$display880">
-       <xsl:call-template name="m880Select">
-         <xsl:with-param name="basetags">246</xsl:with-param>
-         <xsl:with-param name="codes">ab</xsl:with-param>
-         <xsl:with-param name="class">results_summary</xsl:with-param>
-         <xsl:with-param name="label">Other Title: </xsl:with-param>
-       </xsl:call-template>
+      <xsl:call-template name="m880Select">
+	<xsl:with-param name="basetags">246</xsl:with-param>
+	<xsl:with-param name="codes">ab</xsl:with-param>
+	<xsl:with-param name="class">results_summary</xsl:with-param>
+	<xsl:with-param name="label">Other Title: </xsl:with-param>
+      </xsl:call-template>
     </xsl:if>
-        
+    
     <xsl:if test="marc:datafield[@tag=246]">
-	<span class="results_summary">
-    <span class="label">Other title: </span>
-            <xsl:for-each select="marc:datafield[@tag=246]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">ab</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-            </xsl:for-each>
-	</span>
+      <span class="results_summary">
+	<span class="label">Other title: </span>
+	<xsl:for-each select="marc:datafield[@tag=246]">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">ab</xsl:with-param>
+	  </xsl:call-template>
+	  <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+	</xsl:for-each>
+      </span>
     </xsl:if>
     <xsl:if test="marc:datafield[@tag=856]">
-         <span class="results_summary">
-			   <span class="label">Online Access: </span>
-                            <xsl:for-each select="marc:datafield[@tag=856]">
-                            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
-                            <xsl:if test="$OPACURLOpenInNewWindow='0'">
-                                   <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
-                                    <xsl:choose>
-                                     <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
-                                        <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
-                                    </xsl:when>
-                                    <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
-                                        <xsl:call-template name="subfieldSelect">                        
-                                        <xsl:with-param name="codes">y3z</xsl:with-param>                    
-                                        </xsl:call-template>
-                                    </xsl:when>
-                                    <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
-					<xsl:choose>
-					<xsl:when test="$URLLinkText!=''">
-						<xsl:value-of select="$URLLinkText"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>Click here to access online</xsl:text>
-					</xsl:otherwise>
-					</xsl:choose>
-                                    </xsl:when>
-                                    </xsl:choose>
-                                    </a>
-                              </xsl:if>
-                            <xsl:if test="$OPACURLOpenInNewWindow='1'">
-                                   <a target='_blank'><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
-                                    <xsl:choose>
-                                    <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and ($SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
-                                        <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
-                                    </xsl:when>
-                                    <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
-                                        <xsl:call-template name="subfieldSelect">                        
-                                        <xsl:with-param name="codes">y3z</xsl:with-param>                    
-                                        </xsl:call-template>
-                                    </xsl:when>
-                                    <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
-					<xsl:choose>
-					<xsl:when test="$URLLinkText!=''">
-						<xsl:value-of select="$URLLinkText"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>Click here to access online</xsl:text>
-					</xsl:otherwise>
-					</xsl:choose>
-                                    </xsl:when>
-                                    </xsl:choose>
-                                    </a>
-                              </xsl:if>
-                                    <xsl:choose>
-                                    <xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when>
-                                    <xsl:otherwise> | </xsl:otherwise>
-                                    </xsl:choose>
-                            </xsl:for-each>
-                            </span>
-                        </xsl:if>
-                        <span class="results_summary" id="availability">
-                        <span class="label">Availability: </span>
-                        <xsl:choose>
-				   <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
-                        <xsl:choose>
-                            <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
-                            <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
-                            <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
-                                <xsl:call-template select="marc:datafield[@tag=$AlternateHoldingsField]" name="subfieldSelect">
-                                    <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
-                                    <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
-                                </xsl:call-template>
-                            </xsl:for-each>
-                            (<xsl:value-of select="$AlternateHoldingsCount"/>)
-                            </xsl:when>
-                            <xsl:otherwise>No copies available </xsl:otherwise>
-                        </xsl:choose>
-				   </xsl:when>
-                   <xsl:when test="count(key('item-by-status', 'available'))>0">
-                   <span class="available">	
-		     <b>
-		       <xsl:value-of select="count(key('item-by-status', 'available'))"/>
-		       <xsl:choose><xsl:when test="count(key('item-by-status', 'available')) = 1"><xsl:text> Copy available for loan at </xsl:text></xsl:when><xsl:otherwise><xsl:text> Copies available for loan at </xsl:text></xsl:otherwise></xsl:choose>
-		     </b>
-		     <xsl:variable name="available_items"
-				   select="key('item-by-status', 'available')"/>
-		     <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-		       <xsl:value-of select="items:homebranch"/>
-		       <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-		     </xsl:for-each>
-                   </span>
-                   </xsl:when>
-				   </xsl:choose>
-
-                   <xsl:choose>
-                   <xsl:when test="count(key('item-by-status', 'reference'))>0">
-                   <span class="available">
-                       <b>
-		       <xsl:value-of select="count(key('item-by-status', 'reference'))"/>
-		       <xsl:choose><xsl:when test="count(key('item-by-status', 'reference')) = 1"><xsl:text> Copy available for reference at </xsl:text></xsl:when><xsl:otherwise><xsl:text> Copies available for reference at </xsl:text></xsl:otherwise></xsl:choose>
-		     </b>
-		     <xsl:variable name="reference_items"
-                           select="key('item-by-status', 'reference')"/>
-                       <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-                           <xsl:value-of select="items:homebranch"/>
-                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-                       </xsl:for-each>
-                   </span>
-                   </xsl:when>
-                   </xsl:choose>
-
-                   <xsl:if test="count(key('item-by-status', 'Checked out'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Checked out (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Checked out'))"/>
-                       <xsl:text>). </xsl:text>
-				   </span>
-                   </xsl:if>
-                   <xsl:if test="count(key('item-by-status', 'Withdrawn'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Withdrawn (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Withdrawn'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-				   </xsl:if>
-                    <xsl:if test="$hidelostitems='0' and count(key('item-by-status', 'Lost'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Lost (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Lost'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-				   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'Damaged'))>0">
-                   <span class="unavailable">
-                       <xsl:text>Damaged (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Damaged'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'On order'))>0">
-                   <span class="unavailable">
-                       <xsl:text>On order (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'On order'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'In transit'))>0">
-                   <span class="unavailable">
-                       <xsl:text>In transit (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'In transit'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-                    <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
-                   <span class="unavailable">
-                       <xsl:text>On hold (</xsl:text>
-                       <xsl:value-of select="count(key('item-by-status', 'Waiting'))"/>
-                       <xsl:text>). </xsl:text>                   </span>
-                   </xsl:if>
-               </span>
-	       <span class="results_summary" id="location"> 
-		 <span class="label">Location(s): </span>
-		 <xsl:variable name="available_items"
-			       select="key('item-by-status', 'available')"/>
-		 <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-		   <xsl:value-of select="concat(items:location,' ')"/>
-		   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
-		   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-		 </xsl:for-each>
-		 <xsl:choose><xsl:when test="count(key('item-by-status', 'available'))>0 and count(key('item-by-status', 'reference'))>0"><xsl:text> | </xsl:text></xsl:when></xsl:choose>		 
-		 <xsl:variable name="reference_items"
-			       select="key('item-by-status', 'reference')"/>
-		 <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
-		   <xsl:value-of select="concat(items:location,' ')"/>
-		   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
-                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
-                       </xsl:for-each>
-
-	       </span>
-
-
-    </xsl:template>
+      <span class="results_summary">
+	<span class="label">Online Access: </span>
+	<xsl:for-each select="marc:datafield[@tag=856]">
+	  <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
+	  <xsl:if test="$OPACURLOpenInNewWindow='0'">
+	    <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+	    <xsl:choose>
+	      <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+		<xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+	      </xsl:when>
+	      <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
+		<xsl:call-template name="subfieldSelect">                        
+		  <xsl:with-param name="codes">y3z</xsl:with-param>                    
+		</xsl:call-template>
+	      </xsl:when>
+	      <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
+		<xsl:choose>
+		  <xsl:when test="$URLLinkText!=''">
+		    <xsl:value-of select="$URLLinkText"/>
+		  </xsl:when>
+		  <xsl:otherwise>
+		    <xsl:text>Click here to access online</xsl:text>
+		  </xsl:otherwise>
+		</xsl:choose>
+	      </xsl:when>
+	    </xsl:choose>
+	    </a>
+	  </xsl:if>
+	  <xsl:if test="$OPACURLOpenInNewWindow='1'">
+	    <a target='_blank'><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+	    <xsl:choose>
+	      <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and ($SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+		<xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+	      </xsl:when>
+	      <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
+		<xsl:call-template name="subfieldSelect">                        
+		  <xsl:with-param name="codes">y3z</xsl:with-param>                    
+		</xsl:call-template>
+	      </xsl:when>
+	      <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
+		<xsl:choose>
+		  <xsl:when test="$URLLinkText!=''">
+		    <xsl:value-of select="$URLLinkText"/>
+		  </xsl:when>
+		  <xsl:otherwise>
+		    <xsl:text>Click here to access online</xsl:text>
+		  </xsl:otherwise>
+		</xsl:choose>
+	      </xsl:when>
+	    </xsl:choose>
+	    </a>
+	  </xsl:if>
+	  <xsl:choose>
+	    <xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when>
+	    <xsl:otherwise> | </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:for-each>
+      </span>
+    </xsl:if>
+    <span class="results_summary" id="availability">
+      <span class="label">Availability: </span>
+      <xsl:choose>
+	<xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
+	  <xsl:choose>
+	    <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
+	      <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
+	      <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
+		<xsl:call-template select="marc:datafield[@tag=$AlternateHoldingsField]" name="subfieldSelect">
+		  <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
+		  <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
+		</xsl:call-template>
+	      </xsl:for-each>
+	      (<xsl:value-of select="$AlternateHoldingsCount"/>)
+	    </xsl:when>
+	    <xsl:otherwise>No copies available </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:when>
+	<xsl:when test="count(key('item-by-status', 'available'))>0">
+	  <span class="available">	
+	    <b>
+	      <xsl:value-of select="count(key('item-by-status', 'available'))"/>
+	      <xsl:choose><xsl:when test="count(key('item-by-status', 'available')) = 1"><xsl:text> copy available for loan at </xsl:text></xsl:when>
+	      <xsl:otherwise><xsl:text> copies available for loan at </xsl:text></xsl:otherwise></xsl:choose>
+	    </b>
+	    <xsl:variable name="available_items"
+			  select="key('item-by-status', 'available')"/>
+	    <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	      <xsl:value-of select="items:homebranch"/>
+	      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	    </xsl:for-each>
+	  </span>
+	</xsl:when>
+      </xsl:choose>
+      
+      <xsl:choose>
+	<xsl:when test="count(key('item-by-status', 'reference'))>0">
+	  <span class="available">
+	    <b>
+	      <xsl:value-of select="count(key('item-by-status', 'reference'))"/>
+	      <xsl:choose><xsl:when test="count(key('item-by-status', 'reference')) = 1"><xsl:text> copy available for reference at </xsl:text></xsl:when>
+	      <xsl:otherwise><xsl:text> copies available for reference at </xsl:text></xsl:otherwise></xsl:choose>
+	    </b>
+	    <xsl:variable name="reference_items"
+			  select="key('item-by-status', 'reference')"/>
+	    <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	      <xsl:value-of select="items:homebranch"/>
+	      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	    </xsl:for-each>
+	  </span>
+	</xsl:when>
+      </xsl:choose>
+      
+      <xsl:if test="count(key('item-by-status', 'Checked out'))>0">
+	<span class="unavailable">
+	  <xsl:text>Checked out (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Checked out'))"/>
+	  <xsl:text>). </xsl:text>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Withdrawn'))>0">
+	<span class="unavailable">
+	  <xsl:text>Withdrawn (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Withdrawn'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="$hidelostitems='0' and count(key('item-by-status', 'Lost'))>0">
+	<span class="unavailable">
+	  <xsl:text>Lost (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Lost'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Damaged'))>0">
+	<span class="unavailable">
+	  <xsl:text>Damaged (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Damaged'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'On order'))>0">
+	<span class="unavailable">
+	  <xsl:text>On order (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'On order'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'In transit'))>0">
+	<span class="unavailable">
+	  <xsl:text>In transit (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'In transit'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
+	<span class="unavailable">
+	  <xsl:text>On hold (</xsl:text>
+	  <xsl:value-of select="count(key('item-by-status', 'Waiting'))"/>
+	<xsl:text>). </xsl:text>                   </span>
+      </xsl:if>
+    </span>
+    
+    <span class="results_summary" id="location"> 
+      <span class="label">Location(s): </span>
+      <xsl:choose>
+	<xsl:when test="count(key('item-by-status', 'available'))>0">
+	  <span class="available">	
+	    <xsl:variable name="available_items"
+			  select="key('item-by-status', 'available')"/>
+	    <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	      <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	    </xsl:for-each>
+	  </span>
+	</xsl:when>
+      </xsl:choose>
+      <xsl:choose>
+	<xsl:when test="count(key('item-by-status', 'reference'))>0">
+	  <span class="available">
+	    <xsl:variable name="reference_items"
+			  select="key('item-by-status', 'reference')"/>
+	    <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	      <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	    </xsl:for-each>
+	  </span>
+	</xsl:when>
+      </xsl:choose>
+      <xsl:if test="count(key('item-by-status', 'Checked out'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="checkedout_items"
+			select="key('item-by-status', 'Checked out')"/>
+	  <xsl:for-each select="$checkedout_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Withdrawn'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="withdrawn_items"
+			select="key('item-by-status', 'Withdrawn')"/>
+	  <xsl:for-each select="$withdrawn_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="$hidelostitems='0' and count(key('item-by-status', 'Lost'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="lost_items"
+			select="key('item-by-status', 'Lost')"/>
+	  <xsl:for-each select="$lost_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Damaged'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="damaged_items"
+			select="key('item-by-status', 'Damaged')"/>
+	  <xsl:for-each select="$damaged_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'On order'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="onorder_items"
+			select="key('item-by-status', 'On order')"/>
+	  <xsl:for-each select="$onorder_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'In transit'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="intransit_items"
+			select="key('item-by-status', 'In transit')"/>	       
+	  <xsl:for-each select="$intransit_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+      <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
+	<span class="unavailable">
+	  <xsl:variable name="waiting_items"
+			select="key('item-by-status', 'Waiting')"/>
+	  <xsl:for-each select="$waiting_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
+	    <b><xsl:value-of select="concat(items:location,' ')"/></b>
+	    <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if>
+	    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
+	  </xsl:for-each>
+	</span>
+      </xsl:if>
+    </span>
+  </xsl:template>
 
-    <xsl:template name="nameABCDQ">
-            <xsl:call-template name="chopPunctuation">
-                <xsl:with-param name="chopString">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">aq</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="punctuation">
-                    <xsl:text>:,;/ </xsl:text>
-                </xsl:with-param>
-            </xsl:call-template>
-        <xsl:call-template name="termsOfAddress"/>
-    </xsl:template>
+  <xsl:template name="nameABCDQ">
+    <xsl:call-template name="chopPunctuation">
+      <xsl:with-param name="chopString">
+	<xsl:call-template name="subfieldSelect">
+	  <xsl:with-param name="codes">aq</xsl:with-param>
+	</xsl:call-template>
+      </xsl:with-param>
+      <xsl:with-param name="punctuation">
+	<xsl:text>:,;/ </xsl:text>
+      </xsl:with-param>
+    </xsl:call-template>
+    <xsl:call-template name="termsOfAddress"/>
+  </xsl:template>
 
-    <xsl:template name="nameABCDN">
-        <xsl:for-each select="marc:subfield[@code='a']">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString" select="."/>
-                </xsl:call-template>
-        </xsl:for-each>
-        <xsl:for-each select="marc:subfield[@code='b']">
-                <xsl:value-of select="."/>
-        </xsl:for-each>
-        <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
-                <xsl:call-template name="subfieldSelect">
-                    <xsl:with-param name="codes">cdn</xsl:with-param>
-                </xsl:call-template>
-        </xsl:if>
-    </xsl:template>
+  <xsl:template name="nameABCDN">
+    <xsl:for-each select="marc:subfield[@code='a']">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString" select="."/>
+      </xsl:call-template>
+    </xsl:for-each>
+    <xsl:for-each select="marc:subfield[@code='b']">
+      <xsl:value-of select="."/>
+    </xsl:for-each>
+    <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
+      <xsl:call-template name="subfieldSelect">
+	<xsl:with-param name="codes">cdn</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
 
-    <xsl:template name="nameACDEQ">
-            <xsl:call-template name="subfieldSelect">
-                <xsl:with-param name="codes">acdeq</xsl:with-param>
-            </xsl:call-template>
-    </xsl:template>
+  <xsl:template name="nameACDEQ">
+    <xsl:call-template name="subfieldSelect">
+      <xsl:with-param name="codes">acdeq</xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
 
-    <xsl:template name="termsOfAddress">
-        <xsl:if test="marc:subfield[@code='b' or @code='c']">
-            <xsl:call-template name="chopPunctuation">
-                <xsl:with-param name="chopString">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">bc</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:with-param>
-            </xsl:call-template>
-        </xsl:if>
-    </xsl:template>
+  <xsl:template name="termsOfAddress">
+    <xsl:if test="marc:subfield[@code='b' or @code='c']">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString">
+	  <xsl:call-template name="subfieldSelect">
+	    <xsl:with-param name="codes">bc</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
 
-    <xsl:template name="nameDate">
-        <xsl:for-each select="marc:subfield[@code='d']">
-            <xsl:call-template name="chopPunctuation">
-                <xsl:with-param name="chopString" select="."/>
-            </xsl:call-template>
-        </xsl:for-each>
-    </xsl:template>
+  <xsl:template name="nameDate">
+    <xsl:for-each select="marc:subfield[@code='d']">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString" select="."/>
+      </xsl:call-template>
+    </xsl:for-each>
+  </xsl:template>
 
-    <xsl:template name="role">
-        <xsl:for-each select="marc:subfield[@code='e']">
-                    <xsl:value-of select="."/>
-        </xsl:for-each>
-        <xsl:for-each select="marc:subfield[@code='4']">
-                    <xsl:value-of select="."/>
-        </xsl:for-each>
-    </xsl:template>
+  <xsl:template name="role">
+    <xsl:for-each select="marc:subfield[@code='e']">
+      <xsl:value-of select="."/>
+    </xsl:for-each>
+    <xsl:for-each select="marc:subfield[@code='4']">
+      <xsl:value-of select="."/>
+    </xsl:for-each>
+  </xsl:template>
 
-    <xsl:template name="specialSubfieldSelect">
-        <xsl:param name="anyCodes"/>
-        <xsl:param name="axis"/>
-        <xsl:param name="beforeCodes"/>
-        <xsl:param name="afterCodes"/>
-        <xsl:variable name="str">
-            <xsl:for-each select="marc:subfield">
-                <xsl:if test="contains($anyCodes, @code) or (contains($beforeCodes, at code) and following-sibling::marc:subfield[@code=$axis]) or (contains($afterCodes, at code) and preceding-sibling::marc:subfield[@code=$axis])">
-                    <xsl:value-of select="text()"/>
-                    <xsl:text> </xsl:text>
-                </xsl:if>
-            </xsl:for-each>
-        </xsl:variable>
-        <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-    </xsl:template>
+  <xsl:template name="specialSubfieldSelect">
+    <xsl:param name="anyCodes"/>
+    <xsl:param name="axis"/>
+    <xsl:param name="beforeCodes"/>
+    <xsl:param name="afterCodes"/>
+    <xsl:variable name="str">
+      <xsl:for-each select="marc:subfield">
+	<xsl:if test="contains($anyCodes, @code) or (contains($beforeCodes, at code) and following-sibling::marc:subfield[@code=$axis]) or (contains($afterCodes, at code) and preceding-sibling::marc:subfield[@code=$axis])">
+	  <xsl:value-of select="text()"/>
+	  <xsl:text> </xsl:text>
+	</xsl:if>
+      </xsl:for-each>
+    </xsl:variable>
+    <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
+  </xsl:template>
 
-    <xsl:template name="subtitle">
-        <xsl:if test="marc:subfield[@code='b']">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString">
-                        <xsl:value-of select="marc:subfield[@code='b']"/>
+  <xsl:template name="subtitle">
+    <xsl:if test="marc:subfield[@code='b']">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString">
+	  <xsl:value-of select="marc:subfield[@code='b']"/>
 
-                        <!--<xsl:call-template name="subfieldSelect">
-                            <xsl:with-param name="codes">b</xsl:with-param>                                 
-                        </xsl:call-template>-->
-                    </xsl:with-param>
-                </xsl:call-template>
-        </xsl:if>
-    </xsl:template>
+	  <!--<xsl:call-template name="subfieldSelect">
+	      <xsl:with-param name="codes">b</xsl:with-param>                                 
+	      </xsl:call-template>-->
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
 
-    <xsl:template name="chopBrackets">
-        <xsl:param name="chopString"></xsl:param>
-        <xsl:variable name="string">
-            <xsl:call-template name="chopPunctuation">
-                <xsl:with-param name="chopString" select="$chopString"></xsl:with-param>
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:if test="substring($string, 1,1)='['">
-            <xsl:value-of select="substring($string,2, string-length($string)-2)"></xsl:value-of>
-        </xsl:if>
-        <xsl:if test="substring($string, 1,1)!='['">
-            <xsl:value-of select="$string"></xsl:value-of>
-        </xsl:if>
-    </xsl:template>
+  <xsl:template name="chopBrackets">
+    <xsl:param name="chopString"></xsl:param>
+    <xsl:variable name="string">
+      <xsl:call-template name="chopPunctuation">
+	<xsl:with-param name="chopString" select="$chopString"></xsl:with-param>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:if test="substring($string, 1,1)='['">
+      <xsl:value-of select="substring($string,2, string-length($string)-2)"></xsl:value-of>
+    </xsl:if>
+    <xsl:if test="substring($string, 1,1)!='['">
+      <xsl:value-of select="$string"></xsl:value-of>
+    </xsl:if>
+  </xsl:template>
 
 </xsl:stylesheet>
-- 
1.7.2.3



More information about the Koha-patches mailing list