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

diff --git a/etc/dads-pz2.xsl b/etc/dads-pz2.xsl
index 6b7dfaf..1d75811 100644 (file)
--- a/etc/dads-pz2.xsl
+++ b/etc/dads-pz2.xsl
@@ -74,6 +74,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/charsets.c b/src/charsets.c
index 7bbe102..d70c11d 100644 (file)
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -184,8 +184,6 @@ void pp2_relevance_first(pp2_relevance_token_t prt,
         char *pout = firstword;
         char articles[] = "the den der die des an a "; // must end in space
         
-        while (*p && !isalnum(*(unsigned char *)p))
-            p++;
         for (; *p && *p != ' ' && pout - firstword < (sizeof(firstword)-2); p++)
             *pout++ = tolower(*(unsigned char *)p);
         *pout++ = ' ';

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)