Cleaning up XSL to display a few additional MARC21 fields

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 18312da..1f3d44e 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -68,7 +68,9 @@
         </h1>
         </xsl:if>
 
-        <span class="views"><span id="Normalview">Normal View</span> <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}">MARC View</a> <a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}">Card View (ISBD)</a></span>
+        <span class="views"><span id="Normalview">Normal View</span> 
+        <a id="MARCview" href="/cgi-bin/koha/opac-showmarc.pl?id={marc:datafield[@tag=999]/marc:subfield[@code='c']}" title="MARC" rel="gb_page_center[600,500]">MARC View</a>
+        <a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}">Card View (ISBD)</a></span>
         </div> 
 
         <xsl:choose>
@@ -164,6 +166,7 @@
                     <xsl:call-template name="subfieldSelect">
                         <xsl:with-param name="codes">bcg</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>
         </p> 
         </xsl:if>
@@ -171,6 +174,7 @@
         <p><span class="label">ISBN: </span>
         <xsl:for-each select="marc:datafield[@tag=020]">
                 <xsl:value-of select="marc:subfield[@code='a']"/>
+                <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>
         </p>
         </xsl:if>
@@ -179,6 +183,7 @@
         <p><span class="label">ISSN: </span>
         <xsl:for-each select="marc:datafield[@tag=022]">
                 <xsl:value-of select="marc:subfield[@code='a']"/>
+                <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>
         </p>
         </xsl:if>
@@ -200,6 +205,7 @@
                         
                 </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>
         </p>
         </xsl:if>
@@ -252,7 +258,7 @@
         </xsl:if>
 
         <!-- 780 -->
-        <xsl:if test="marc:datafield[@tag=780]/marc:subfield[@code='a']">
+        <xsl:if test="marc:datafield[@tag=780]">
         <xsl:for-each select="marc:datafield[@tag=780]">
         <p><span class="label">
         <xsl:choose>
@@ -282,12 +288,16 @@
         </xsl:when>
         </xsl:choose>
         </span>
-            <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of select="marc:subfield[@code='t']"/></xsl:attribute>
+                <xsl:variable name="f780">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">atxwg</xsl:with-param>
+                        <xsl:with-param name="codes">at</xsl:with-param>
                     </xsl:call-template>
+                </xsl:variable>
+             <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of select="translate($f780, '()', '')"/></xsl:attribute>
+                <xsl:value-of select="translate($f780, '()', '')"/>
             </a>
         </p>
+ 
         <xsl:choose>
         <xsl:when test="@ind1=0">
             <p><xsl:value-of select="marc:subfield[@code='n']"/></p>
@@ -297,6 +307,54 @@
         </xsl:for-each>
         </xsl:if>
 
+        <!-- 785 -->
+        <xsl:if test="marc:datafield[@tag=785]">
+        <xsl:for-each select="marc:datafield[@tag=785]">
+        <p><span class="label">
+        <xsl:choose>
+        <xsl:when test="@ind2=0">
+            Continued by:
+        </xsl:when>
+        <xsl:when test="@ind2=1">
+            Continued in part by:
+        </xsl:when>
+        <xsl:when test="@ind2=2">
+            Superseded by:
+        </xsl:when>
+        <xsl:when test="@ind2=3">
+            Superseded in part by:
+        </xsl:when>
+        <xsl:when test="@ind2=4">
+            Absorbed by:
+        </xsl:when>
+        <xsl:when test="@ind2=5">
+            Absorbed in part by:
+        </xsl:when>
+        <xsl:when test="@ind2=6">
+            Split into .. and ...:
+        </xsl:when>
+        <xsl:when test="@ind2=7">
+            Merged with ... to form ...
+        </xsl:when>
+        <xsl:when test="@ind2=8">
+            Changed back to:
+        </xsl:when>
+
+        </xsl:choose>
+        </span>
+                   <xsl:variable name="f785">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">at</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:variable>
+
+                <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of select="translate($f785, '()', '')"/></xsl:attribute>
+                <xsl:value-of select="translate($f785, '()', '')"/>
+            </a>
+
+        </p>
+        </xsl:for-each>
+        </xsl:if>
         </div>
 
     </xsl:template>

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index a3025c7..16836e3 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -18,7 +18,7 @@
         <xsl:variable name="leader6" select="substring($leader,7,1)"/>
         <xsl:variable name="leader7" select="substring($leader,8,1)"/>
         <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
-        <xsl:variable name="materialTypeCode">
+        <xsl:variable name="typeOf008">
             <xsl:choose>
                 <xsl:when test="$leader6='a'">
                     <xsl:choose>
@@ -50,25 +50,626 @@
                 <xsl:when test="$leader6='c' or $leader6='d' or $leader6='i' or $leader6='j'">Music</xsl:when>
             </xsl:choose>
         </xsl:variable>
+        <xsl:variable name="genre">
+        <xsl:if test="$typeOf008='SE'">
+            <xsl:variable name="controlField008-21" select="substring($controlField008,22,1)"></xsl:variable>
+            <xsl:choose>
+                <xsl:when test="$controlField008-21='d'">
+                    <span class="label">; Genre: </span>database;
+                </xsl:when>
+                <xsl:when test="$controlField008-21='l'">
+                    <span class="label">; Genre: </span>loose-leaf;
+                </xsl:when>
+                <xsl:when test="$controlField008-21='m'">
+                    <span class="label">; Genre: </span>series;
+                </xsl:when>
+                <xsl:when test="$controlField008-21='n'">
+                    <span class="label">; Genre: </span>newspaper;
+                </xsl:when>
+                <xsl:when test="$controlField008-21='p'">
+                    <span class="label">; Genre: </span>periodical;
+                </xsl:when>
+                <xsl:when test="$controlField008-21='w'">
+                    <span class="label">; Genre: </span>web site;
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if>
+        <xsl:if test="$typeOf008='BK' or $typeOf008='SE'">
+            <xsl:variable name="controlField008-24" select="substring($controlField008,25,4)"></xsl:variable>
+            <xsl:choose>
+                <xsl:when test="contains($controlField008-24,'a')">
+                    <span class="label">; Genre: </span>abstract or summary;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'b')">
+                    <span class="label">; Genre: </span>bibliography;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'c')">
+                    <span class="label">; Genre: </span>catalog;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'d')">
+                    <span class="label">; Genre: </span>dictionary;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'e')">
+                    <span class="label">; Genre: </span>encyclopedia;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'f')">
+                    <span class="label">; Genre: </span>handbook;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'g')">
+                    <span class="label">; Genre: </span>legal article;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'i')">
+                    <span class="label">; Genre: </span>index;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'k')">
+                    <span class="label">; Genre: </span>discography;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'l')">
+                    <span class="label">; Genre: </span>legislation;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'m')">
+                    <span class="label">; Genre: </span>theses;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'n')">
+                    <span class="label">; Genre: </span>survey of literature;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'o')">
+                    <span class="label">; Genre: </span>review;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'p')">
+                    <span class="label">; Genre: </span>programmed text;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'q')">
+                    <span class="label">; Genre: </span>filmography;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'r')">
+                    <span class="label">; Genre: </span>directory;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'s')">
+                    <span class="label">; Genre: </span>statistics;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'t')">
+                    <span class="label">; Genre: </span>technical report;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'v')">
+                    <span class="label">; Genre: </span>legal case and case notes;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'w')">
+                    <span class="label">; Genre: </span>law report or digest;
+                </xsl:when>
+                <xsl:when test="contains($controlField008-24,'z')">
+                    <span class="label">; Genre: </span>treaty;
+                </xsl:when>
+            </xsl:choose>
+            <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"></xsl:variable>
+            <xsl:choose>
+                <xsl:when test="$controlField008-29='1'">
+                    <span class="label">; Genre: </span>conference publication;
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if>
+        <xsl:if test="$typeOf008='CF'">
+            <xsl:variable name="controlField008-26" select="substring($controlField008,27,1)"></xsl:variable>
+            <xsl:choose>
+                <xsl:when test="$controlField008-26='a'">
+                    <span class="label">; Genre: </span>numeric data;
+                </xsl:when>
+                <xsl:when test="$controlField008-26='e'">
+                    <span class="label">; Genre: </span>database;
+                </xsl:when>
+                <xsl:when test="$controlField008-26='f'">
+                    <span class="label">; Genre: </span>font;
+                </xsl:when>
+                <xsl:when test="$controlField008-26='g'">
+                    <span class="label">; Genre: </span>game;
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if>
+        <xsl:if test="$typeOf008='BK'">
+            <xsl:if test="substring($controlField008,25,1)='j'">
+                <span class="label">; Genre: </span>patent;
+            </xsl:if>
+            <xsl:if test="substring($controlField008,31,1)='1'">
+                <span class="label">; Genre: </span>festschrift;
+            </xsl:if>
+            <xsl:variable name="controlField008-34" select="substring($controlField008,35,1)"></xsl:variable>
+            <xsl:if test="$controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d'">
+                <span class="label">; Genre: </span>biography;
+            </xsl:if>
+            <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"></xsl:variable>
+            <xsl:choose>
+                <xsl:when test="$controlField008-33='e'">
+                    <span class="label">; Genre: </span>essay;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='d'">
+                    <span class="label">; Genre: </span>drama;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='c'">
+                    <span class="label">; Genre: </span>comic strip;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='l'">
+                    <span class="label">; Genre: </span>fiction;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='h'">
+                    <span class="label">; Genre: </span>humor, satire;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='i'">
+                    <span class="label">; Genre: </span>letter;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='f'">
+                    <span class="label">; Genre: </span>novel;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='j'">
+                    <span class="label">; Genre: </span>short story;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='s'">
+                    <span class="label">; Genre: </span>speech;
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if>
+        <xsl:if test="$typeOf008='MU'">
+            <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"></xsl:variable>
+            <xsl:if test="contains($controlField008-30-31,'b')">
+                <span class="label">; Genre: </span>biography;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'c')">
+                <span class="label">; Genre: </span>conference publication;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'d')">
+                <span class="label">; Genre: </span>drama;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'e')">
+                <span class="label">; Genre: </span>essay;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'f')">
+                <span class="label">; Genre: </span>fiction;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'o')">
+                <span class="label">; Genre: </span>folktale;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'h')">
+                <span class="label">; Genre: </span>history;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'k')">
+                <span class="label">; Genre: </span>humor, satire;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'m')">
+                <span class="label">; Genre: </span>memoir;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'p')">
+                <span class="label">; Genre: </span>poetry;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'r')">
+                <span class="label">; Genre: </span>rehearsal;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'g')">
+                <span class="label">; Genre: </span>reporting;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'s')">
+                <span class="label">; Genre: </span>sound;
+            </xsl:if>
+            <xsl:if test="contains($controlField008-30-31,'l')">
+                <span class="label">; Genre: </span>speech;
+            </xsl:if>
+        </xsl:if>
+        <xsl:if test="$typeOf008='VM'">
+            <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"></xsl:variable>
+            <xsl:choose>
+                <xsl:when test="$controlField008-33='a'">
+                    <span class="label">; Genre: </span>art original;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='b'">
+                    <span class="label">; Genre: </span>kit;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='c'">
+                    <span class="label">; Genre: </span>art reproduction;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='d'">
+                    <span class="label">; Genre: </span>diorama;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='f'">
+                    <span class="label">; Genre: </span>filmstrip;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='g'">
+                    <span class="label">; Genre: </span>legal article;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='i'">
+                    <span class="label">; Genre: </span>picture;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='k'">
+                    <span class="label">; Genre: </span>graphic;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='l'">
+                    <span class="label">; Genre: </span>technical drawing;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='m'">
+                    <span class="label">; Genre: </span>motion picture;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='n'">
+                    <span class="label">; Genre: </span>chart;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='o'">
+                    <span class="label">; Genre: </span>flash card;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='p'">
+                    <span class="label">; Genre: </span>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']">
+                    <span class="label">; Genre: </span>model;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='r'">
+                    <span class="label">; Genre: </span>realia;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='s'">
+                    <span class="label">; Genre: </span>slide;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='t'">
+                    <span class="label">; Genre: </span>transparency;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='v'">
+                    <span class="label">; Genre: </span>videorecording;
+                </xsl:when>
+                <xsl:when test="$controlField008-33='w'">
+                    <span class="label">; Genre: </span>toy;
+                </xsl:when>
+            </xsl:choose>
+        </xsl:if>
+        </xsl:variable>
+<xsl:variable name="physicalDescription">
+            <!--3.2 change tmee 007/11 -->
+            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a']">
+                <digitalOrigin>reformatted digital</digitalOrigin>
+            </xsl:if>
+            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='b']">
+                <digitalOrigin>digitized microfilm</digitalOrigin>
+            </xsl:if>
+            <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='d']">
+                <digitalOrigin>digitized other analog</digitalOrigin>
+            </xsl:if>
+            <xsl:variable name="controlField008-23" select="substring($controlField008,24,1)"></xsl:variable>
+            <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"></xsl:variable>
+            <xsl:variable name="check008-23">
+                <xsl:if test="$typeOf008='BK' or $typeOf008='MU' or $typeOf008='SE' or $typeOf008='MM'">
+                    <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')">
+                    <form authority="marcform">braille</form>
+                </xsl:when>
+                <xsl:when test="($controlField008-23=' ' and ($leader6='c' or $leader6='d')) or (($typeOf008='BK' or $typeOf008='SE') and ($controlField008-23=' ' or $controlField008='r'))">
+                    <form authority="marcform">print</form>
+                </xsl:when>
+<xsl:when test="$leader6 = 'm' or ($check008-23 and $controlField008-23='s') or ($check008-29 and $controlField008-29='s')">
+                    <form authority="marcform">electronic</form>
+                </xsl:when>
+                <xsl:when test="($check008-23 and $controlField008-23='b') or ($check008-29 and $controlField008-29='b')">
+                    <form authority="marcform">microfiche</form>
+                </xsl:when>
+                <xsl:when test="($check008-23 and $controlField008-23='a') or ($check008-29 and $controlField008-29='a')">
+                    <form authority="marcform">microfilm</form>
+                </xsl:when>
+            </xsl:choose>
+            <!-- 1/04 fix -->
+            <xsl:if test="marc:datafield[@tag=130]/marc:subfield[@code='h']">
+                <form authority="gmd">
+                    <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>
+                </form>
+            </xsl:if>
+            <xsl:if test="marc:datafield[@tag=240]/marc:subfield[@code='h']">
+                <form authority="gmd">
+                    <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>
+                </form>
+            </xsl:if>
+            <xsl:if test="marc:datafield[@tag=242]/marc:subfield[@code='h']">
+                <form authority="gmd">
+                    <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>
+                </form>
+            </xsl:if>
+            <xsl:if test="marc:datafield[@tag=245]/marc:subfield[@code='h']">
+                <form authority="gmd">
+                    <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>
+                </form>
+</xsl:if>
+            <xsl:if test="marc:datafield[@tag=246]/marc:subfield[@code='h']">
+                <form authority="gmd">
+                    <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>
+                </form>
+            </xsl:if>
+            <xsl:if test="marc:datafield[@tag=730]/marc:subfield[@code='h']">
+                <form authority="gmd">
+                    <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>
+                </form>
+            </xsl:if>
+            <xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
+                <form>
+                    <xsl:value-of select="."></xsl:value-of>
+                </form>
+            </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'">
+                        <reformattingQuality>access</reformattingQuality>
+                    </xsl:when>
+                    <xsl:when test="substring(text(),14,1)='p'">
+                        <reformattingQuality>preservation</reformattingQuality>
+                    </xsl:when>
+                    <xsl:when test="substring(text(),14,1)='r'">
+                        <reformattingQuality>replacement</reformattingQuality>
+                    </xsl:when>
+                </xsl:choose>
+            </xsl:for-each>
+            <!--3.2 change tmee 007/01 -->
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='b']">
+                <form authority="smd">chip cartridge</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='c']">
+                <form authority="smd">computer optical disc cartridge</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='j']">
+                <form authority="smd">magnetic disc</form>
+            </xsl:if>
+ <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='m']">
+                <form authority="smd">magneto-optical disc</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='o']">
+                <form authority="smd">optical disc</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='r']">
+                <form authority="smd">remote</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='a']">
+                <form authority="smd">tape cartridge</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='f']">
+                <form authority="smd">tape cassette</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='h']">
+                <form authority="smd">tape reel</form>
+            </xsl:if>
 
-<style type="text/css">
-    .results_summary {
-        font-size: 80%;
-        color: grey;
-    }
-    .select {
-        border-bottom: 1px solid #ddd; padding: 6px 5px; vertical-align: top;
-    }
-    .holdings_summary {
-        font-size: 90%;
-    }
-</style>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='a']">
+                <form authority="smd">celestial globe</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='e']">
+                <form authority="smd">earth moon globe</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='b']">
+                <form authority="smd">planetary or lunar globe</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='c']">
+                <form authority="smd">terrestrial globe</form>
+            </xsl:if>
 
-    <td class="select">
-<input  type="checkbox" id="bib{marc:datafield[@tag=999]/marc:subfield[@code='c']}" name="biblionumber" value="{marc:datafield[@tag=999]/marc:subfield[@code='c']}" title="Click to add to cart" /> <label for="bib{marc:datafield[@tag=999]/marc:subfield[@code='c']}"></label>
-    </td>
-    <td>
-     <a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/></xsl:attribute>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='o'][substring(text(),2,1)='o']">
+                <form authority="smd">kit</form>
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
+                <form authority="smd">atlas</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='g']">
+                <form authority="smd">diagram</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
+                <form authority="smd">map</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
+                <form authority="smd">model</form>
+ </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='k']">
+                <form authority="smd">profile</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
+                <form authority="smd">remote-sensing image</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='s']">
+                <form authority="smd">section</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='y']">
+                <form authority="smd">view</form>
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='a']">
+                <form authority="smd">aperture card</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='e']">
+                <form authority="smd">microfiche</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='f']">
+                <form authority="smd">microfiche cassette</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='b']">
+                <form authority="smd">microfilm cartridge</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='c']">
+                <form authority="smd">microfilm cassette</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='d']">
+                <form authority="smd">microfilm reel</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='g']">
+                <form authority="smd">microopaque</form>
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='c']">
+                <form authority="smd">film cartridge</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='f']">
+                <form authority="smd">film cassette</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='r']">
+                <form authority="smd">film reel</form>
+            </xsl:if>
+<xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='n']">
+                <form authority="smd">chart</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='c']">
+                <form authority="smd">collage</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='d']">
+                <form authority="smd">drawing</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='o']">
+                <form authority="smd">flash card</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='e']">
+                <form authority="smd">painting</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='f']">
+                <form authority="smd">photomechanical print</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='g']">
+                <form authority="smd">photonegative</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='h']">
+                <form authority="smd">photoprint</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='i']">
+                <form authority="smd">picture</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='j']">
+                <form authority="smd">print</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='l']">
+                <form authority="smd">technical drawing</form>
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='q'][substring(text(),2,1)='q']">
+                <form authority="smd">notated music</form>
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='d']">
+                <form authority="smd">filmslip</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='c']">
+                <form authority="smd">filmstrip cartridge</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='o']">
+                <form authority="smd">filmstrip roll</form>
+            </xsl:if>
+<xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='f']">
+                <form authority="smd">other filmstrip type</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='s']">
+                <form authority="smd">slide</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='t']">
+                <form authority="smd">transparency</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='r'][substring(text(),2,1)='r']">
+                <form authority="smd">remote-sensing image</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='e']">
+                <form authority="smd">cylinder</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='q']">
+                <form authority="smd">roll</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='g']">
+                <form authority="smd">sound cartridge</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='s']">
+                <form authority="smd">sound cassette</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='d']">
+                <form authority="smd">sound disc</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='t']">
+                <form authority="smd">sound-tape reel</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='i']">
+                <form authority="smd">sound-track film</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='w']">
+                <form authority="smd">wire recording</form>
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='c']">
+                <form authority="smd">braille</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='b']">
+                <form authority="smd">combination</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='a']">
+                <form authority="smd">moon</form>
+            </xsl:if>
+ <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='d']">
+                <form authority="smd">tactile, with no writing system</form>
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='c']">
+                <form authority="smd">braille</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='b']">
+                <form authority="smd">large print</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='a']">
+                <form authority="smd">regular print</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='d']">
+                <form authority="smd">text in looseleaf binder</form>
+            </xsl:if>
+
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='c']">
+                <form authority="smd">videocartridge</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='f']">
+                <form authority="smd">videocassette</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='d']">
+                <form authority="smd">videodisc</form>
+            </xsl:if>
+            <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='r']">
+                <form authority="smd">videoreel</form>
+            </xsl:if>
+
+            <xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q'][string-length(.)>1]">
+                <internetMediaType>
+                    <xsl:value-of select="."></xsl:value-of>
+                </internetMediaType>
+            </xsl:for-each>
+            <xsl:for-each select="marc:datafield[@tag=300]">
+                <extent>
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abce</xsl:with-param>
+                    </xsl:call-template>
+                </extent>
+            </xsl:for-each>
+        </xsl:variable>
+        <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']"/>
+    <td style="vertical-align:top;">
+     <a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
 
         <xsl:if test="marc:datafield[@tag=245]">
         <xsl:for-each select="marc:datafield[@tag=245]">
@@ -106,9 +707,10 @@
                         </xsl:call-template>
                     </xsl:with-param>
                 </xsl:call-template>
-            </xsl:if>
+            </xsl:if><xsl:text> </xsl:text>
             <xsl:call-template name="part"/>
-        </xsl:for-each>.
+            <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:if>
     </a>
     <p>
@@ -149,15 +751,50 @@
             </xsl:otherwise>
             </xsl:choose>
         </xsl:for-each>
-
     </xsl:when>
     </xsl:choose>
     </p>
     <span class="results_summary">
-    <xsl:if test="$materialTypeCode">
-    <span class="label">Type: </span>
-    <img src="/opac-tmpl/prog/famfamfam/{$materialTypeCode}.png"/><xsl:value-of select="$materialTypeLabel"/><br/>
+    <xsl:if test="$typeOf008">
+        <span class="label">Type: </span>
+        <img src="/opac-tmpl/prog/famfamfam/{$typeOf008}.png"/><xsl:value-of select="$materialTypeLabel"/>
+        <xsl:if test="$genre"><xsl:value-of select="$genre"/></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>
+
+    <xsl:if test="$typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM'">
+        <xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"></xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$controlField008-22='a'">
+            <span class="label">; Audience: </span> Preschool;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='b'">
+            <span class="label">; Audience: </span> Primary;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='c'">
+            <span class="label">; Audience: </span> Pre-adolescent;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='d'">
+            <span class="label">; Audience: </span> Adolescent;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='e'">
+            <span class="label">; Audience: </span> Adult;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='g'">
+            <span class="label">; Audience: </span> General;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='j'">
+            <span class="label">; Audience: </span> Juvenile;
+            </xsl:when>
+            <xsl:when test="$controlField008-22='f'">
+            <span class="label">; Audience: </span> Specialized;
+            </xsl:when>
+            </xsl:choose>
+    </xsl:if>
+    <br/> 
     <xsl:if test="marc:datafield[@tag=260]">
     <span class="label">Publisher: </span> 
             <xsl:for-each select="marc:datafield[@tag=260]">
@@ -192,6 +829,7 @@
                </div>
     </td>
     </xsl:template>
+
     <xsl:template name="nameABCDQ">
             <xsl:call-template name="chopPunctuation">
                 <xsl:with-param name="chopString">
@@ -307,12 +945,25 @@
                     <xsl:with-param name="chopString" select="$partNumber"/>
                 </xsl:call-template>
         </xsl:if>
-        <xsl:if test="string-length(normalize-space($partName))">
         <xsl:if test="string-length(normalize-space($partName))">
                 <xsl:call-template name="chopPunctuation">
                     <xsl:with-param name="chopString" select="$partName"/>
                 </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:stylesheet>