Minor (mostly notes to myself)

[pazpar2-moved-to-github.git] / heikki / solr / run.sh

diff --git a/heikki/solr/run.sh b/heikki/solr/run.sh
index ea40894..761fe67 100755 (executable)
--- a/heikki/solr/run.sh
+++ b/heikki/solr/run.sh
@@ -9,18 +9,21 @@ then
   echo "It will be in the title of all plots, together with the query"
   exit 1
 fi
+(cd ../../src; rm -f pazpar2; make; grep '###' relevance.c )
 TITLE="$1"
 OUTFILE=`echo $1.txt | sed 's/ /_/g'`
-echo "$TITLE" > $OUTFILE
+echo "Run $TITLE" > $OUTFILE
 ./test3.sh clean
+rm *.png
 
 function onerun() {
     QRY="$1"
     echo "" >> $OUTFILE
     echo "Query: $QRY" >> $OUTFILE
-    PNG=`echo "solr_$TITLE $QRY.png" | sed 's/ /_/g' `
+    PNG=`echo "$TITLE $QRY.png" | sed 's/ /_/g' `
     echo "Graph: $PNG" >> $OUTFILE
     ./test3.sh "$QRY" "$TITLE"
+    cat stat.line >> $OUTFILE
     grep "plotline" show.out | head -10 >> $OUTFILE
     cp plot.png $PNG
 }
@@ -28,6 +31,8 @@ function onerun() {
 onerun "harry potter"
 onerun "vietnam war"
 onerun "water or fire or ice"
+onerun "zen and motorcycle"
 echo "" >> $OUTFILE
-echo "client#, position, tf/idf, roundrobin, solr # database # title" >> $OUTFILE
+echo "client#, position, tf/idf, roundrobin, solr, normalized # database # title" >> $OUTFILE
 
+rm plot.png