From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 19 May 2010 10:54:58 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.4.1~6^2~4
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=858ad41c7c599d44c700c2e8eaab3131ad4011aa;hp=4153b0ad5760dbcc7e0fb1d370f403c133b18e25;p=pazpar2-moved-to-github.git

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

diff --git a/perf/bash/par.sh b/perf/bash/par.sh
index 3df80a3..518d16e 100755
--- a/perf/bash/par.sh
+++ b/perf/bash/par.sh
@@ -23,5 +23,5 @@ while test $r -lt $ROUNDS; do
 done
 wait
 if [ "$SHUTDOWN" == "1" ] ; then 
-    wget -O x "http://localhost:${PORT}/?command=exit"
+    wget -O x "http://localhost:${PORT}/search.pz2?command=exit"
 fi
diff --git a/src/client.c b/src/client.c
index c238f0a..2ebab5e 100644
--- a/src/client.c
+++ b/src/client.c
@@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/session.c b/src/session.c
index f2acbaa..4910ea9 100644
--- a/src/session.c
+++ b/src/session.c
@@ -35,6 +35,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef WIN32
+#include <windows.h>
+#endif
 #include <signal.h>
 #include <ctype.h>
 #include <assert.h>
@@ -52,6 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/querytowrbuf.h>
 #include <yaz/oid_db.h>
 #include <yaz/snprintf.h>
+#include <yaz/gettimeofday.h>
 
 #define USE_TIMING 0
 #if USE_TIMING
@@ -537,7 +541,7 @@ enum pazpar2_error_code search(struct session *se,
     }
     se->reclist = reclist_create(se->nmem);
 
-    gettimeofday(&tval, 0);
+    yaz_gettimeofday(&tval);
     
     tval.tv_sec += 5;
 
diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 05112d7..28e81aa 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -104,8 +104,8 @@ for f in `cat ${srcdir}/${URLS}`; do
     elif echo $f | grep '^[0-9]' >/dev/null; then
 	sleep $f
     else
-	if test -f $f; then
-	    postfile=$f
+	if test -f $srcdir/$f; then
+	    postfile=$srcdir/$f
 	else
 	    echo "File $f does not exist"
 	    code=1
diff --git a/win/makefile b/win/makefile
index 9c0ee85..5f814f2 100644
--- a/win/makefile
+++ b/win/makefile
@@ -59,19 +59,19 @@ pazpar2: $(PAZPAR2_EXE)
 
 YAZBINDIR=$(YAZ_DIR)\bin
 !if $(DEBUG)
-YAZ_LIB="$(YAZ_DIR)\lib\yaz3d.lib"
+YAZ_LIB="$(YAZ_DIR)\lib\yaz4d.lib" "$(YAZ_DIR)\lib\yaz_cond4d.lib" 
 !if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3d.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4d.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4d.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz4d.dll"
 !else
-YAZ_LIB="$(YAZ_DIR)\lib\yaz3.lib"
+YAZ_LIB="$(YAZ_DIR)\lib\yaz4.lib" "$(YAZ_DIR)\lib\yaz_cond4.lib"
 !if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz3.dll"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz4.dll"
 !endif
 
 YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include"
@@ -201,6 +201,7 @@ PAZPAR2_OBJS = \
    "$(OBJDIR)\normalize_record.obj" \
    "$(OBJDIR)\normalize_cache.obj" \
    "$(OBJDIR)\ppmutex.obj" \
+   "$(OBJDIR)\incref.obj" \
    "$(OBJDIR)\connection.obj"