Revert "Remove unused variable"

This reverts commit 6a6070281460bf841290c92315bd2ce1b358d89c.

diff --git a/debian/changelog b/debian/changelog
index 3fe94af..b6fec63 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,6 @@
-pazpar2 (1.6.32-3indexdata) unstable; urgency=low
+pazpar2 (1.6.32-1indexdata) unstable; urgency=low
 
-  * More logging for HTTP activity.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 12 Jul 2013 11:43:51 +0200
-
-pazpar2 (1.6.32-2indexdata) unstable; urgency=low
-
-  * Log socket ID for HTTP request/response.
+  * Upstream.
 
  -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 14 Jun 2013 10:50:14 +0200
 

diff --git a/etc/default.xml b/etc/default.xml
index 14dea66..66312dd 100644 (file)
--- a/etc/default.xml
+++ b/etc/default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <service  xmlns="http://www.indexdata.com/pazpar2/1.0">
   <timeout session="60" z3950_operation="30" z3950_session="180"/>
-  <settings src="settings/many.xml"/>
+  <settings src="settings/testserver.xml"/>
   
   <icu_chain id="relevance" locale="en">
     <transform rule="[:Control:] Any-Remove"/>

diff --git a/perf/bash/pp2client.sh b/perf/bash/pp2client.sh
index 50e8a67..03b0421 100755 (executable)
--- a/perf/bash/pp2client.sh
+++ b/perf/bash/pp2client.sh
@@ -82,15 +82,20 @@ if [ -n "$SETTINGS" ] ; then
     fi
 fi
 
-/usr/bin/time --format "$OF, search, %e" wget -q -O ${TMP_DIR}$OF.search.xml "$H?command=search&query=$QUERY&session=$S" 2> ${TMP_DIR}$OF.search.time
-
-i=1
-while test $i -lt 20; do
-    sleep 3
-    /usr/bin/time --format "$OF, show, %e" wget -q -O ${TMP_DIR}$OF.show$i.xml "$H?command=show&session=$S&sort=relevance&start=0&num=100&block=1&round=$i" 2> ${TMP_DIR}$OF.show$i.time
-    i=`expr $i + 1`
-done
-wget -q -O exit.xml "$H?command=exit"
+if [ "$TIME" != "" ] ; then
+    /usr/bin/time --format "$OF, search, %e" wget -q -O ${TMP_DIR}$OF.search.xml "$H?command=search&query=$QUERY&session=$S" 2> ${TMP_DIR}$OF.search.time
+else
+    wget -q -O ${TMP_DIR}$OF.search.xml "$H?command=search&query=$QUERY&session=$S"
+fi
+sleep 1
+if [ "$TIME" != "" ] ; then
+    /usr/bin/time --format "$OF, show, %e" wget -q -O ${TMP_DIR}$OF.show.xml "$H?command=show&session=$S&sort=relevance&start=0&num=100&block=1" 2> ${TMP_DIR}$OF.show.time
+else
+    wget -q -O ${TMP_DIR}$OF.show.xml "$H?command=show&session=$S&sort=relevance&start=0&num=100&block=1"
+fi
+wget -q -O ${TMP_DIR}$OF.bytarget.xml "$H?command=bytarget&session=$S"
+wget -q -O ${TMP_DIR}$OF.stat.xml "$H?command=stat&session=$S"
+wget -q -O ${TMP_DIR}$OF.info.xml "$H?command=info"
 exit 0
 
 # Local Variables:

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 1dfb379..fdd4ba8 100644 (file)
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -1126,6 +1126,7 @@ void info_services(struct conf_server *server, WRBUF w)
     struct conf_service *s = server->service;
     int i;
     struct setting *S;
+    struct database *db;
 
     wrbuf_puts(w, " <services>\n");
     for (; s; s = s->next)