From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 29 Apr 2010 08:47:35 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.4.0~6
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=1699b182e7032bc6d30db89395f0764035f86012;hp=98b0d64be6c28d48d81f04da3b221525a1801a97;p=pazpar2-moved-to-github.git

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

diff --git a/configure.ac b/configure.ac
index 536a04f..4345086 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_LANG(C)
 
 AC_C_INLINE
 
-YAZ_INIT([static icu server],[4.0.2])
+YAZ_INIT([static icu],[4.0.4])
 if test -z "$YAZLIB"; then
 	AC_MSG_ERROR([YAZ development libraries missing])
 fi
diff --git a/debian/control b/debian/control
index e734d6b..b88c6dc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pazpar2
 Section: net
 Priority: extra
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
-Build-Depends: debhelper (>= 5), autotools-dev, libyaz4-dev (>= 4.0.2), docbook-xsl
+Build-Depends: debhelper (>= 5), autotools-dev, libyaz4-dev (>= 4.0.4), docbook-xsl
 Standards-Version: 3.7.2
 
 Package: pazpar2
diff --git a/etc/opac.xsl b/etc/opac.xsl
index 617a18b..6fe5ecd 100644
--- a/etc/opac.xsl
+++ b/etc/opac.xsl
@@ -31,6 +31,14 @@
 	  <xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
 	</xsl:choose>
       </pz:metadata>
+      <pz:metadata type="available">
+        <xsl:choose>
+          <xsl:when test="string-length(available)">
+            <xsl:value-of select="available"/>
+          </xsl:when>
+          <xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
+        </xsl:choose>
+      </pz:metadata>
       <pz:metadata type="publicnote">
         <xsl:choose>
 	  <xsl:when test="publicNote">
diff --git a/src/client.h b/src/client.h
index 4d23481..f8d8a55 100644
--- a/src/client.h
+++ b/src/client.h
@@ -73,7 +73,7 @@ void client_disconnect(struct client *cl);
 int client_prep_connection(struct client *cl,
                            int operation_timeout, int session_timeout,
                            iochan_man_t iochan,
-                           const struct timespec *abstime);
+                           const struct timeval *abstime);
 void client_start_search(struct client *cl);
 void client_set_session(struct client *cl, struct session *se);
 int client_is_active(struct client *cl);
diff --git a/src/connection.c b/src/connection.c
index f95beb1..08d1501 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -451,7 +451,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
 int client_prep_connection(struct client *cl,
                            int operation_timeout, int session_timeout,
                            iochan_man_t iochan_man,
-                           const struct timespec *abstime)
+                           const struct timeval *abstime)
 {
     struct connection *co;
     struct host *host = client_get_host(cl);
diff --git a/src/session.c b/src/session.c
index 14b9a2c..290c252 100644
--- a/src/session.c
+++ b/src/session.c
@@ -514,7 +514,6 @@ enum pazpar2_error_code search(struct session *se,
     int no_working = 0;
     int no_failed = 0;
     struct client_list *l;
-    struct timespec abstime;
     struct timeval tval;
 
     yaz_log(YLOG_DEBUG, "Search");
@@ -540,8 +539,7 @@ enum pazpar2_error_code search(struct session *se,
 
     gettimeofday(&tval, 0);
     
-    abstime.tv_sec = tval.tv_sec + 5;
-    abstime.tv_nsec = tval.tv_usec * 1000;
+    tval.tv_sec += 5;
 
     for (l = se->clients; l; l = l->next)
     {
@@ -561,7 +559,7 @@ enum pazpar2_error_code search(struct session *se,
             if (client_prep_connection(cl, se->service->z3950_operation_timeout,
                                        se->service->z3950_session_timeout,
                                        se->service->server->iochan_man,
-                                       &abstime))
+                                       &tval))
                 client_start_search(cl);
         }
     }
@@ -1172,14 +1170,10 @@ int ingest_record(struct client *cl, const char *rec,
         xmlFreeDoc(xdoc);
         return -1;
     }
-    client_unlock(cl);
     session_enter(se);
-    client_lock(cl);
     if (client_get_session(cl) == se)
         ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
-    client_unlock(cl);
     session_leave(se);
-    client_lock(cl);
     
     xmlFreeDoc(xdoc);
     return ret;
diff --git a/www/jsdemo/index.html b/www/jsdemo/index.html
index 286c5f3..1041bf5 100644
--- a/www/jsdemo/index.html
+++ b/www/jsdemo/index.html
@@ -31,7 +31,7 @@
   <div id="heading">
    <table width="100%" border="0" cellpadding="6" cellspacing="0">
     <tr>
-     <td width="250" height="100" align="center"><b>PAZPAR2</b></td>
+     <td width="250" height="100" align="center"><b>Pazpar2</b></td>
      <td>
       <form id="searchForm" name="search">
        <input id="query" type="text" size="50"/>