From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 8 Mar 2011 16:56:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.5~11
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=024e09f8e12037aafc92917d546c707be5a764a7;hp=86e88749bed15b32d1f4deb4d2460767c807031c;p=pazpar2-moved-to-github.git

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

diff --git a/NEWS b/NEWS
index 822be32..3ac310e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+-- 1.5.4 2011/03/08
+- Experiental support for DTIC DADS target  
+- adds dads-pz2.xsl
+- Support for query_syntax (overrides the default for SRU | Z39.50) 
+- Support for extraArgs (ZOOM "extraArgs" option) for targets
+- New commands: status-server and status-session
+
 -- 1.5.3 2011/02/18
 - Fix for threaded runs: 
 Client now have a copy of the database URL, 
diff --git a/configure.ac b/configure.ac
index edd2fad..1134eb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.5.3],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.5.4],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 
diff --git a/perf/bash/par.config.threaded b/perf/bash/par.config.threaded
new file mode 100644
index 0000000..ede31b6
--- /dev/null
+++ b/perf/bash/par.config.threaded
@@ -0,0 +1,23 @@
+DELAY=0.0001
+WAIT=5
+NUMBER=10
+ROUNDS=100
+PORT=9005
+SERVICE=long
+SHUTDOWN=0
+SETTINGS="use_url_proxy%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=0\
+&pz%3Acclmap%3Asu%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D21+s%3Dal\
+&secondary_request_syntax%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=OPAC\
+&pz%3Arequestsyntax%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=OPAC\
+&pz%3Acclmap%3Adate%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D30+r%3Dr\
+&pz%3Anativesyntax%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=txml\
+&category%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=JA%2Cid_subscription\
+&pz%3Aname%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=Cornell+University+Library\
+&pz%3Aelements%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=F\
+&pz%3Acclmap%3Ati%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D4+s%3Dal\
+&pz%3Acclmap%3Aau%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D1004+s%3Dal\
+&pz%3Axslt%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=opac_turbomarc.xsl\
+&pz%3Acclmap%3Aterm%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D1016+t%3Dl%2Cr+s%3Dal\
+&pz%3Acclmap%3Aisbn%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=1%3D7\
+&pz%3Aqueryencoding%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=UTF-8\
+&url_recipe%5Bcatalog.library.cornell.edu%3A7090%2Fvoyager%5D=http%3A%2F%2Fcatalog.library.cornell.edu%2Fcgi-bin%2FPwebrecon.cgi%3FDB%3Dlocal%26v1%3D1%26BBRecID%3D%24%7Bmd-id%7D"
\ No newline at end of file
diff --git a/src/session.c b/src/session.c
index c46a891..c8d62e9 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1304,8 +1304,7 @@ static int ingest_to_cluster(struct client *cl,
                                                     &se->total_merged);
 
     const char *use_term_factor_str = session_setting_oneval(sdb, PZ_TERMLIST_TERM_FACTOR);
-    // TODO: Work-around to default to use term factor, until other MK2 components supports it
-    int use_term_factor = 1;
+    int use_term_factor = 0;
     int term_factor = 1; 
     if (use_term_factor_str && use_term_factor_str[0] != 0)
        use_term_factor =  atoi(use_term_factor_str);