X-Git-Url: http://git.rot13.org/?p=koha-bibliografija;a=blobdiff_plain;f=compact.xsl;h=ebbe4f370334e09f16212ccee566e4ac7dd86023;hp=24cf9b1b333151bac1e1c54c205eff0f1f20ff38;hb=18d433ab44358cf0393da0f95754d3f17d669013;hpb=42e2c51ed0e6e3474b54601f7a11a1998b295d80

diff --git a/compact.xsl b/compact.xsl
index 24cf9b1..ebbe4f3 100644
--- a/compact.xsl
+++ b/compact.xsl
@@ -290,22 +290,24 @@
         </xsl:if>
 
 		<br/>
+		<hr/>
         <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>
-		<br/>	
+		<br/>
+		<hr/>
 		<span class="results_summary">
         <xsl:if test="marc:datafield[@tag=245]">
 		<span class="title">
@@ -373,7 +375,6 @@
         <xsl:with-param name="label">Publisher: </xsl:with-param>
       </xsl:call-template>
     </xsl:if>
-
     <xsl:if test="marc:datafield[@tag=250]">
     <span class="results_summary edition">
             <xsl:for-each select="marc:datafield[@tag=250]">
@@ -384,7 +385,6 @@
             <xsl:text> - </xsl:text>
     </span>
     </xsl:if>
-
     <xsl:if test="marc:datafield[@tag=260]">
         <span class="results_summary publisher">
             <xsl:for-each select="marc:datafield[@tag=260]">
@@ -411,7 +411,6 @@
             </xsl:for-each>
         </span>
     </xsl:if>
-
     <xsl:if test="marc:datafield[@tag=300] and marc:datafield[@tag=942]/marc:subfield[@code='c'] ='KNJ'">
     <span class="results_summary description"><span class="label">. - </span>
         <xsl:for-each select="marc:datafield[@tag=300]">
@@ -426,7 +425,6 @@
         </xsl:for-each>
     </span>
    </xsl:if>
-
 <xsl:if test="$DisplayIconsXSLT!='0'">
     <span class="results_summary">
     <xsl:if test="$typeOf008!=''">
@@ -750,7 +748,6 @@
 <xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
 	</span>
 </xsl:if> <!-- DisplayIconsXSLT -->
-
     <xsl:if test="marc:datafield[@tag=020] and marc:datafield[@tag=942]/marc:subfield[@code='c'] ='KNJ'">
     <span class="results_summary isbn"><span class="label"> ISBN: </span>
     <xsl:for-each select="marc:datafield[@tag=020]">
@@ -760,7 +757,6 @@
     </xsl:for-each>
     </span>
     </xsl:if>
-
     <xsl:if test="marc:datafield[@tag=022] and (marc:datafield[@tag=942]/marc:subfield[@code='c'] ='KNJ' or marc:datafield[@tag=942]/marc:subfield[@code='c'] ='PER')">
     <span class="results_summary issn"><span class="label"> ISSN: </span>
     <xsl:for-each select="marc:datafield[@tag=022]">
@@ -804,9 +800,30 @@
             </xsl:if>
         </xsl:for-each>
     </xsl:if>
+    
+    <xsl:if test="marc:datafield[@tag=024]">
+        <xsl:for-each select="marc:datafield[@tag=024]">
+	<a><xsl:attribute name="href">
+            <xsl:if test="marc:subfield[@code='2']">
+	    	<xsl:text>http://dx.doi.org/</xsl:text>
+            </xsl:if>
+            <xsl:if test="marc:subfield[@code='a']">
+            	<xsl:value-of select="marc:subfield[@code='a']"/>
+            </xsl:if>
+	    </xsl:attribute>
+            <xsl:if test="marc:subfield[@code='2']">
+	    	<xsl:text> http://dx.doi.org/</xsl:text>
+            </xsl:if>
+            <xsl:if test="marc:subfield[@code='a']">
+            	<xsl:value-of select="marc:subfield[@code='a']"/>
+            </xsl:if>
+	</a>
+        </xsl:for-each>
+    </xsl:if>
 
 	<xsl:if test="marc:datafield[@tag=856]">
 			<br/>
+			<hr/>
          <span class="results_summary">
                             <xsl:for-each select="marc:datafield[@tag=856]">
                             <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
@@ -840,9 +857,23 @@
 		</span>
 	</xsl:if>
     
+    <xsl:if test="marc:datafield[@tag=962]">
+    	<br/>
+        <xsl:for-each select="marc:datafield[@tag=962]">
+            <xsl:if test="marc:subfield[@code='w']">
+            	<xsl:value-of select="marc:subfield[@code='w']"/>
+            </xsl:if>
+            <xsl:if test="marc:subfield[@code='s']">
+	    	<br/>
+		<xsl:text>Scopus ID:</xsl:text>
+            	<xsl:value-of select="marc:subfield[@code='s']"/>
+            </xsl:if>
+        </xsl:for-each>
+    </xsl:if>
 	<xsl:if test="marc:datafield[@tag=942]">
 		<div class="crosbi">
         <xsl:for-each select="marc:datafield[@tag=942]">
+		<!--
             <xsl:if test="marc:subfield[@code='z']">
 				<xsl:text>Podaci iz CROSBI:</xsl:text>
 				<br/>
@@ -854,6 +885,15 @@
 				<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>
@@ -898,7 +938,7 @@
         </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>
@@ -914,7 +954,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>
@@ -1009,7 +1049,6 @@
         </span>
         </xsl:if>
     </xsl:template>
-    
 	<xsl:template name="showAuthor700">
 	<xsl:param name="authorfield700"/>
 	<xsl:if test="count($authorfield700)&gt;0">
@@ -1021,22 +1060,19 @@
 		  </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>
         </span>
         </xsl:if>
     </xsl:template>
-	
 	<xsl:template name="showAuthor700k">
 	<xsl:param name="authorfield700k"/>
 	<xsl:if test="count($authorfield700k)&gt;0">
@@ -1054,15 +1090,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>