Merge branch 'solr_facets' of ssh://git.indexdata.com/home/git/pub/yaz into solr_facets

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index e77e35c..3086afe 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -1454,7 +1454,8 @@ static int send_SRW_searchRequest(const char *arg)
         printf("Only CQL and PQF supported in SRW\n");
         return 0;
     }
-    sr->u.request->maximumRecords = odr_intdup(out, 0);
+    // TODO check. 
+    sr->u.request->maximumRecords = odr_intdup(out, 20);
     sr->u.request->facetList = facet_list;
     if (record_schema)
         sr->u.request->recordSchema = record_schema;
@@ -2280,6 +2281,22 @@ static int only_z3950(void)
     return 0;
 }
 
+static int is_SRW(void)
+{
+    if (!conn)
+    {
+        printf("Not connected yet\n");
+        return 1;
+    }
+    if (protocol == PROTO_HTTP && yaz_matchstr(sru_method, "solr"))
+    {
+        printf("Not supported by SRW\n");
+        return 1;
+    }
+    return 0;
+}
+
+
 static int cmd_update_common(const char *arg, int version);
 
 static int cmd_update(const char *arg)
@@ -2887,6 +2904,8 @@ static int cmd_find(const char *arg)
 
 static int cmd_facets(const char *arg)
 {
+    /* TODO Wrong odr. Loosing memory */
+    ODR odr = odr_createmem(ODR_ENCODE);
     int size = 0;
     if (!*arg)
     {
@@ -2895,15 +2914,10 @@ static int cmd_facets(const char *arg)
         return 0;
     }
     size = strlen(arg);
-/*
-    MOVE to non-usage of it?
     if (only_z3950() && !yaz_matchstr(sru_method, "solr")) {
-        // We are not Z39.50 and not SOLR (I think)
+        /* We are not Z39.50 and not SOLR (I think) */
         printf("WARN: Currently supported for Z39.50 and SOLR.\n");
     }
-º/
-    /* TODO Wrong odr. Loosing memory */
-    ODR odr = odr_createmem(ODR_ENCODE);
     facet_list = yaz_pqf_parse_facet_list(odr, arg);
 
     if (!facet_list)