Last part of PAZ-996.

[pazpar2-moved-to-github.git] / perf / bash / client_timed.sh

diff --git a/perf/bash/client_timed.sh b/perf/bash/client_timed.sh
index c2a69a3..e9bf828 100755 (executable)
--- a/perf/bash/client_timed.sh
+++ b/perf/bash/client_timed.sh
@@ -15,14 +15,14 @@ if test -z "$SERVICE"; then
 fi
 
 RECORDS=40
-QUERY=100
+QUERY=water
 NUM=20
-H="http://localhost:${PORT}/search.pz2"
+H="http://127.0.0.1:${PORT}/search.pz2"
 
 declare -i MAX_WAIT=2
-/usr/bin/time --format "$OF, init, %e" wget -q -O $OF.init.xml "$H/?command=init&service=${SERVICE}&extra=$OF" 2> $OF.init.time
-S=`xsltproc get_session.xsl $OF.init.xml`
-/usr/bin/time --format "$OF, search, %e" wget -q -O $OF.search.xml "$H?command=search&query=${QUERY}&session=$S" 2> $OF.search.time
+/usr/bin/time --format "$OF, init, %e" wget -q -O ${TMP_DIR}$OF.init.xml "$H/?command=init&service=${SERVICE}&extra=$OF" 2> ${TMP_DIR}$OF.init.time
+S=`xsltproc get_session.xsl ${TMP_DIR}$OF.init.xml`
+/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
 
 let r=0
 DO_DISPLAY=true
@@ -30,8 +30,8 @@ while [ ${DO_DISPLAY} ] ; do
     SLEEP=$[ ($RANDOM % $MAX_WAIT ) ]
     echo "show in $SLEEP"
     sleep $SLEEP
-    /usr/bin/time --format "$OF, show2, %e" wget -q -O $OF.show.$r.xml "$H?command=show&session=$S&start=$r&num=${NUM}&block=1" 2>> $OF.show.time
-    AC=`xsltproc get_activeclients.xsl ${OF}.show.$r.xml`
+    /usr/bin/time --format "$OF, show2, %e" wget -q -O ${TMP_DIR}$OF.show.$r.xml "$H?command=show&session=$S&start=$r&num=${NUM}&block=1" 2>> ${TMP_DIR}$OF.show.time
+    AC=`xsltproc get_activeclients.xsl ${TMP_DIR}${OF}.show.$r.xml`
     if [ "$AC" != "0" ] ; then 
        echo "Active clients: ${AC}" 
 #    else
@@ -44,4 +44,4 @@ while [ ${DO_DISPLAY} ] ; do
        break;
     fi
 done
-/usr/bin/time --format "$OF, termlist, %e" wget -q -O $OF.termlist.$r.xml "$H?command=termlist&session=$S&name=xtargets%2Csubject%2Cauthor" 2>> $OF.termlist.time
+/usr/bin/time --format "$OF, termlist, %e" wget -q -O ${TMP_DIR}$OF.termlist.$r.xml "$H?command=termlist&session=$S&name=xtargets%2Csubject%2Cauthor" 2>> ${TMP_DIR}$OF.termlist.time