Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
	src/eventl.c

diff --git a/etc/dads-pz2.xsl b/etc/dads-pz2.xsl
index 553ab20..6f151f9 100644 (file)
--- a/etc/dads-pz2.xsl
+++ b/etc/dads-pz2.xsl
@@ -73,6 +73,17 @@
         </pz:metadata>
       </xsl:for-each>
 
+      <!-- IDs for url recipe -->
+      <xsl:for-each select="recordID/DOI"> 
+       <pz:metadata type="doi"><xsl:value-of select="."/></pz:metadata>
+      </xsl:for-each>
+      <xsl:for-each select="recordID/artId"> 
+       <pz:metadata type="artid"><xsl:value-of select="."/></pz:metadata>
+      </xsl:for-each>
+      <xsl:for-each select="recordID/accessNr"> 
+       <pz:metadata type="accessnr"><xsl:value-of select="."/></pz:metadata>
+      </xsl:for-each>
+
       <xsl:for-each select="author/name">
         <pz:metadata type="author">
           <xsl:value-of select="." />

diff --git a/src/client.c b/src/client.c
index 9990dd0..89858d6 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -787,6 +787,7 @@ void client_lock(struct client *c)
 void client_unlock(struct client *c)
 {
     yaz_mutex_leave(c->mutex);
+    sleep(1);
 }
 
 void client_incref(struct client *c)