X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=compact.xsl;h=c9bf37697104c7aa0802de48cb71c7e8c85305b9;hb=9f4591bc53e007917526485939628710fdd9b590;hp=f9ccd60a508a822c558c40f3ab8a310057e488ed;hpb=e15faefb669eaecd5c0cc572b0eb63a3eedfec96;p=koha-bibliografija

diff --git a/compact.xsl b/compact.xsl
index f9ccd60..c9bf376 100644
--- a/compact.xsl
+++ b/compact.xsl
@@ -291,17 +291,17 @@
 
 		<br/>
         <xsl:call-template name="showAuthor100">
-			<xsl:with-param name="authorfield100" select="marc:datafield[@tag=100 or @tag=110 or @tag=111]"/>
+			<xsl:with-param name="authorfield100" select="marc:datafield[@tag=100]"/>
 		</xsl:call-template>
 		<xsl:choose>
 		<xsl:when test="marc:datafield[@tag=942]/marc:subfield[@code='c'] != 'KNJ' or marc:datafield[@tag=100]/marc:subfield[@code='a']">
 				<xsl:call-template name="showAuthor700">
-					<xsl:with-param name="authorfield700" select="marc:datafield[@tag=700 or @tag=710 or @tag=711]"/>
+					<xsl:with-param name="authorfield700" select="marc:datafield[@tag=700]"/>
 				</xsl:call-template>
 		</xsl:when>
 		<xsl:otherwise>
 				<xsl:call-template name="showAuthor700k">
-					<xsl:with-param name="authorfield700k" select="marc:datafield[@tag=700 or @tag=710 or @tag=711]"/>
+					<xsl:with-param name="authorfield700k" select="marc:datafield[@tag=700]"/>
 				</xsl:call-template>
 		</xsl:otherwise>
 		</xsl:choose>
@@ -854,6 +854,14 @@
 				<xsl:text>Recenzija: </xsl:text>
             	<xsl:value-of select="marc:subfield[@code='v']"/>
             </xsl:if>
+            <xsl:if test="marc:subfield[@code='r']">
+				<br/>
+				<xsl:text>Bibliografske baze: </xsl:text>
+				<xsl:for-each select="marc:subfield[@code='r']">
+	            	<xsl:value-of select="."/>
+					<xsl:text> | </xsl:text>
+				</xsl:for-each>
+            </xsl:if>
         </xsl:for-each>
 		</div>
     </xsl:if>
@@ -863,7 +871,7 @@
             <xsl:call-template name="chopPunctuation">
                 <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abq</xsl:with-param>
+                        <xsl:with-param name="codes">abcq</xsl:with-param>
                     </xsl:call-template>
                 </xsl:with-param>
                 <xsl:with-param name="punctuation">
@@ -898,14 +906,14 @@
         </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">dn</xsl:with-param>
+                    <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">adeq</xsl:with-param>
+                <xsl:with-param name="codes">acdeq</xsl:with-param>
             </xsl:call-template>
     </xsl:template>
 
@@ -914,7 +922,7 @@
             <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:with-param name="codes">b</xsl:with-param>
                     </xsl:call-template>
                 </xsl:with-param>
             </xsl:call-template>
@@ -1021,15 +1029,13 @@
 		  </xsl:when>
 		  <xsl:otherwise><xsl:call-template name="nameABCDQ"/></xsl:otherwise>
     </xsl:choose>
-	<xsl:if test="marc:subfield[@code='4' or @code='e'] != 'aut'">
-      <span class="relatorcode">
+	<xsl:if test="marc:subfield[@code='4'] != 'aut'">
       <xsl:text> [</xsl:text>
-	  <xsl:choose>
-	    <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
-	    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
-	  </xsl:choose>
+		<xsl:for-each select="marc:subfield[@code='4']">
+			<xsl:value-of select="."/>
+            <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:text>]</xsl:text>
-      </span>
 	</xsl:if>
         	<xsl:text> ; </xsl:text>
         </xsl:for-each>
@@ -1054,15 +1060,13 @@
 		  </xsl:otherwise>
     </xsl:choose>
 	</xsl:if>
-	<xsl:if test="marc:subfield[@code='4' or @code='e'] != 'aut'">
-      <span class="relatorcode">
+	<xsl:if test="marc:subfield[@code='4'] != 'aut'">
       <xsl:text> [</xsl:text>
-	  <xsl:choose>
-	    <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
-	    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
-	  </xsl:choose>
+		<xsl:for-each select="marc:subfield[@code='4']">
+			<xsl:value-of select="."/>
+            <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:text>]</xsl:text>
-      </span>
 	</xsl:if>
         </xsl:for-each>
         </span>