#include <yaz/yaz-ccl.h>
#include <yaz/cql.h>
#include <yaz/log.h>
+#include <yaz/facet.h>
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
static int largeSetLowerBound = 1;
static int mediumSetPresentNumber = 0;
static Z_ElementSetNames *elementSetNames = 0;
+static Z_FacetList *facet_list = 0;
static Odr_int setno = 1; /* current set offset */
static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */
#define RECORDSYNTAX_MAX 20
void add_otherInfos(Z_APDU *a)
{
Z_OtherInformation **oi;
- int i;
+ int i = 0;
yaz_oi_APDU(a, &oi);
- for(i=0; i<maxOtherInfosSupported; ++i)
+ if (facet_list) {
+ yaz_oi_set_facetlist_oid(oi, out, yaz_oid_userinfo_facet_1, 1, facet_list);
+ i++;
+ }
+ for(; i<maxOtherInfosSupported; ++i)
{
if (oid_oidlen(extraOtherInfos[i].oid) > 0)
yaz_oi_set_string_oid(oi, out, extraOtherInfos[i].oid,
strncpy(cur_host, arg, sizeof(cur_host)-1);
cur_host[sizeof(cur_host)-1] = 0;
}
+ /* TODO Make facet definition survive the open command without crashing */
+ /* TODO Fix deallocation */
+ facet_list = 0;
set_base("");
r = session_connect(cur_host);
auth->which = Z_IdAuthentication_anonymous;
auth->u.anonymous = odr_nullval();
printf("Authentication set to Anonymous\n");
- }
+ }
else
{
auth->which = Z_IdAuthentication_open;
yaz_iconv_t cd = 0;
yaz_marc_t mt = yaz_marc_create();
const char *from = 0;
-
+
if (marcCharset && !strcmp(marcCharset, "auto"))
{
if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc))
printf("\n");
}
}
-
+
if (yaz_marc_decode_buf(mt, octet_buf, octet_len,
&result, &rlen)> 0)
{
const char *username = 0;
const char *password = 0;
struct Z_HTTP_Header *h;
+ char *combined_cookies = 0;
+ int combined_cookies_len = 0;
Z_GDU *gdu = get_HTTP_Request_url(out, uri);
gdu->u.HTTP_Request->method = odr_strdup(out, "GET");
z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Accept",
"text/xml");
-
+
for (h = cookie_hres->headers; h; h = h->next)
{
- if (!strcmp(h->name, "Set-Cookie"))
- z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
- "Cookie", h->value);
+ if (!strcmp(h->name, "Set-Cookie")) {
+ char *cp;
+
+ if (!(cp = strchr(h->value, ';')))
+ cp = h->value + strlen(h->value);
+ if (cp - h->value >= 1) {
+ combined_cookies = xrealloc(combined_cookies, combined_cookies_len + cp - h->value + 3);
+ memcpy(combined_cookies+combined_cookies_len, h->value, cp - h->value);
+ combined_cookies[combined_cookies_len + cp - h->value] = '\0';
+ strcat(combined_cookies,"; ");
+ combined_cookies_len = strlen(combined_cookies);
+ }
+ }
+ }
+ if (combined_cookies_len)
+ {
+ z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Cookie", combined_cookies);
+ xfree(combined_cookies);
}
if (auth)
return 2;
}
+static void display_term(Z_Term *term) {
+ switch (term->which)
+ {
+ case Z_Term_general:
+ printf(" %.*s", term->u.general->len, term->u.general->buf);
+ break;
+ case Z_Term_characterString:
+ printf(" %s", term->u.characterString);
+ break;
+ case Z_Term_numeric:
+ printf(" " ODR_INT_PRINTF, *term->u.numeric);
+ break;
+ case Z_Term_null:
+ printf(" null");
+ break;
+ }
+}
+
/* display Query Expression as part of searchResult-1 */
static void display_queryExpression(const char *lead, Z_QueryExpression *qe)
{
if (qe->u.term->queryTerm)
{
Z_Term *term = qe->u.term->queryTerm;
- switch (term->which)
- {
- case Z_Term_general:
- printf("%.*s", term->u.general->len, term->u.general->buf);
- break;
- case Z_Term_characterString:
- printf("%s", term->u.characterString);
- break;
- case Z_Term_numeric:
- printf(ODR_INT_PRINTF, *term->u.numeric);
- break;
- case Z_Term_null:
- printf("null");
- break;
+ display_term(term);
+ }
+ }
+}
+
+static void display_facet(Z_FacetField *facet) {
+ if (facet->attributes) {
+ Z_AttributeList *al = facet->attributes;
+ struct yaz_facet_attr attr_values;
+ attr_values.errcode = 0;
+ attr_values.limit = -1;
+ attr_values.useattr = 0;
+ attr_values.relation = "default";
+
+ yaz_facet_attr_get_z_attributes(al, &attr_values);
+ if (!attr_values.errcode) {
+ int term_index;
+ printf(" %s (%d): \n", attr_values.useattr, /* attr_values.relation, attr_values.limit, */ facet->num_terms);
+ for (term_index = 0 ; term_index < facet->num_terms; term_index++) {
+ Z_FacetTerm *facetTerm = facet->terms[term_index];
+ display_term(facetTerm->term);
+ printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count);
}
}
+
}
}
+static void* display_facets(Z_FacetList *fl)
+{
+ int index;
+ printf("Facets(%d): \n", fl->num);
+
+ for (index = 0; index < fl->num ; index++) {
+ display_facet(fl->elements[index]);
+ }
+ return 0;
+}
+
+void display_searchResult1(Z_SearchInfoReport *sr)
+{
+ int j;
+ printf("SearchResult-1:");
+ for (j = 0; j < sr->num; j++)
+ {
+ if (j)
+ printf(",");
+ if (!sr->elements[j]->subqueryExpression)
+ printf("%d", j);
+ display_queryExpression("term",
+ sr->elements[j]->subqueryExpression);
+ display_queryExpression("interpretation",
+ sr->elements[j]->subqueryInterpretation);
+ display_queryExpression("recommendation",
+ sr->elements[j]->subqueryRecommendation);
+ if (sr->elements[j]->subqueryCount)
+ printf(" cnt=" ODR_INT_PRINTF,
+ *sr->elements[j]->subqueryCount);
+ if (sr->elements[j]->subqueryId)
+ printf(" id=%s ", sr->elements[j]->subqueryId);
+ }
+ printf("\n");
+}
+
+
+
/* see if we can find USR:SearchResult-1 */
static void display_searchResult(Z_OtherInformation *o)
{
Z_External *ext = o->list[i]->information.externallyDefinedInfo;
if (ext->which == Z_External_searchResult1)
- {
- int j;
- Z_SearchInfoReport *sr = ext->u.searchResult1;
- printf("SearchResult-1:");
- for (j = 0; j < sr->num; j++)
- {
- if (j)
- printf(",");
- if (!sr->elements[j]->subqueryExpression)
- printf("%d", j);
- display_queryExpression("term",
- sr->elements[j]->subqueryExpression);
- display_queryExpression("interpretation",
- sr->elements[j]->subqueryInterpretation);
- display_queryExpression("recommendation",
- sr->elements[j]->subqueryRecommendation);
- if (sr->elements[j]->subqueryCount)
- printf(" cnt=" ODR_INT_PRINTF,
- *sr->elements[j]->subqueryCount);
- if (sr->elements[j]->subqueryId)
- printf(" id=%s ", sr->elements[j]->subqueryId);
- }
- printf("\n");
- }
+ display_searchResult1(ext->u.searchResult1);
+ else if (ext->which == Z_External_userFacets)
+ display_facets(ext->u.facetList);
}
}
}
cp0 = cp0+3;
else
cp0 = host;
-
+
cp1 = strchr(cp0, '/');
if (!cp1)
cp1 = cp0 + strlen(cp0);
-
+
if (cp0 && cp1)
{
char *h = (char*) odr_malloc(odr, cp1 - cp0 + 1);
ODR out = odr_createmem(ODR_ENCODE);
ODR in = odr_createmem(ODR_DECODE);
Z_GDU *gdu = get_HTTP_Request_url(out, uri);
-
+
gdu->u.HTTP_Request->method = odr_strdup(out, "GET");
if (username && password)
{
"text/xml");
if (!z_GDU(out, &gdu, 0, 0))
{
- yaz_log(YLOG_WARN, "Can not encode HTTP request URL:%s", uri);
+ yaz_log(YLOG_WARN, "Can not encode HTTP request URL:%s", uri);
}
else
{
{
int len;
char *buf = odr_getbuf(out, &len, 0);
-
+
if (cs_put(conn, buf, len) < 0)
yaz_log(YLOG_WARN, "cs_put failed URL:%s", uri);
else
result = wrbuf_alloc();
if (show_headers)
{
-
+
wrbuf_printf(result, "HTTP %d\n", res->code);
for (h = res->headers; h; h = h->next)
wrbuf_printf(result, "%s: %s\n",
odr_destroy(in);
return result;
}
-
+
static int cmd_url(const char *arg)
{
return 2;
}
+static int cmd_facets(const char *arg)
+{
+ int size = 0;
+ if (!*arg)
+ {
+ facet_list = 0;
+ printf("Facets cleared.\n");
+ return 0;
+ }
+ size = strlen(arg);
+ if (only_z3950())
+ {
+ printf("Currently only supported for Z39.50.\n");
+ return 0;
+ }
+ else
+ {
+ /* TODO Wrong odr. Loosing memory */
+ ODR odr = odr_createmem(ODR_ENCODE);
+ facet_list = yaz_pqf_parse_facet_list(odr, arg);
+
+ if (!facet_list) {
+ printf("Invalid facet list: %s", arg);
+ return 0;
+ }
+ return 1;
+ }
+ return 2;
+}
+
+
static int cmd_delete(const char *arg)
{
if (only_z3950())
{
YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
+
if (!(req->termListAndStartPoint =
yaz_pqf_scan(pqf_parser, out, &req->attributeSet, query)))
{
return 2;
}
-void display_term(Z_TermInfo *t)
+void display_term_info(Z_TermInfo *t)
{
if (t->displayTerm)
printf("%s", t->displayTerm);
if (entries[i]->which == Z_Entry_termInfo)
{
printf("%c ", i + 1 == pos_term ? '*' : ' ');
- display_term(entries[i]->u.termInfo);
+ display_term_info(entries[i]->u.termInfo);
}
else
display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1);
while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0
&& idx < RECORDSYNTAX_MAX)
{
- if (strcmp(form_str, "none") &&
+ if (strcmp(form_str, "none") &&
!yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, form_str, out))
{
printf("Bad format: %s\n", form_str);
xfree(recordsyntax_list[i]);
recordsyntax_list[i] = 0;
}
-
+
cp = arg;
while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0
&& idx < RECORDSYNTAX_MAX)
return -1;
}
- while (fgets(line, sizeof(line), includeFile))
+ while (fgets(line, sizeof(line), includeFile))
{
if (strlen(line) < 2)
continue;
{"open", cmd_open, "('tcp'|'ssl')':<host>[':'<port>][/<db>]",NULL,0,NULL},
{"quit", cmd_quit, "",NULL,0,NULL},
{"find", cmd_find, "<query>",NULL,0,NULL},
+ {"facets", cmd_facets, "<query>",NULL,0,NULL},
{"delete", cmd_delete, "<setname>",NULL,0,NULL},
{"base", cmd_base, "<base-name>",NULL,0,NULL},
{"show", cmd_show, "<rec#>['+'<#recs>['+'<setname>]]",NULL,0,NULL},
projects / yaz-moved-to-github.git / blobdiff