Allowed ccl filter override

[pazpar2-moved-to-github.git] / src / pazpar2.c

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 3a696c6..9d10f84 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.44 2007-01-18 18:11:19 quinn Exp $ */
+/* $Id: pazpar2.c,v 1.47 2007-02-04 21:48:21 quinn Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -176,7 +176,7 @@ static void send_search(IOCHAN i)
     for (ndb = 0; db->databases[ndb]; ndb++)
        databaselist[ndb] = db->databases[ndb];
 
-    a->u.presentRequest->preferredRecordSyntax =
+    a->u.searchRequest->preferredRecordSyntax =
             yaz_oidval_to_z3950oid(global_parameters.odr_out,
             CLASS_RECSYN, VAL_USMARC);
     a->u.searchRequest->smallSetUpperBound = &ssub;
@@ -385,8 +385,6 @@ static void add_facet(struct session *s, const char *type, const char *value)
     termlist_insert(s->termlists[i].termlist, value);
 }
 
-int yaz_marc_write_xml();
-
 static xmlDoc *normalize_record(struct client *cl, Z_External *rec)
 {
     struct conf_retrievalprofile *rprofile = cl->database->rprofile;
@@ -1605,7 +1603,8 @@ int main(int argc, char **argv)
 
     start_http_listener();
     start_proxy();
-    global_parameters.ccl_filter = load_cclfile("../etc/default.bib");
+    if (!global_parameters.ccl_filter)
+        global_parameters.ccl_filter = load_cclfile("../etc/default.bib");
     global_parameters.yaz_marc = yaz_marc_create();
     yaz_marc_subfield_str(global_parameters.yaz_marc, "\t");
     global_parameters.odr_in = odr_createmem(ODR_DECODE);