-/* $Id: zebrasrv.c,v 1.12 2007-03-14 11:48:32 adam Exp $
+/* $Id: zebrasrv.c,v 1.19 2007-08-27 17:22:22 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
struct statserv_options_block *sob;
char *user = NULL;
char *passwd = NULL;
+ char version_str[16];
r->errcode = 0;
r->errstring = 0;
q->bend_fetch = bend_fetch;
q->bend_scan = bend_scan;
+ zebra_get_version(version_str, 0);
+
q->implementation_name = "Zebra Information Server";
- q->implementation_version = "Zebra " ZEBRAVER;
+ q->implementation_version = odr_strdup(q->stream, version_str);
yaz_log (YLOG_DEBUG, "bend_init");
return r;
}
r->handle = zh;
+
+ q->query_charset = odr_strdup(q->stream, zebra_get_encoding(zh));
if (q->auth)
{
if (q->auth->which == Z_IdAuthentication_open)
r->errstring = user;
return r;
}
- if (q->charneg_request) /* characater set and langauge negotiation? */
+ if (q->charneg_request) /* characater set and language negotiation? */
{
char **charsets = 0;
int num_charsets;
int i;
NMEM nmem = nmem_create();
- yaz_log (YLOG_LOG, "character set and language negotiation");
-
- yaz_get_proposal_charneg (nmem, q->charneg_request,
- &charsets, &num_charsets,
- &langs, &num_langs, &selected);
+ yaz_get_proposal_charneg(nmem, q->charneg_request,
+ &charsets, &num_charsets,
+ &langs, &num_langs, &selected);
for (i = 0; i < num_charsets; i++)
{
} else {
right_name = charsets[i];
}
- if (odr_set_charset (q->decode, "UTF-8", right_name) == 0)
+ if (odr_set_charset(q->decode, "UTF-8", right_name) == 0)
{
- yaz_log (YLOG_LOG, "charset %d %s (proper name %s): OK", i,
- charsets[i], right_name);
- odr_set_charset (q->stream, right_name, "UTF-8");
+ yaz_log(YLOG_LOG, "charset %d %s (proper name %s): OK", i,
+ charsets[i], right_name);
+ odr_set_charset(q->stream, right_name, "UTF-8");
if (selected)
zebra_record_encoding(zh, right_name);
zebra_octet_term_encoding(zh, right_name);
q->charneg_response =
- yaz_set_response_charneg (q->stream, charsets[i],
- 0, selected);
+ yaz_set_response_charneg(q->stream, charsets[i],
+ 0, selected);
break;
} else {
- yaz_log (YLOG_LOG, "charset %d %s (proper name %s): unsupported", i,
- charsets[i], right_name);
+ yaz_log(YLOG_LOG, "charset %d %s (proper name %s): unsupported", i,
+ charsets[i], right_name);
}
}
nmem_destroy(nmem);
r->search_info->list[0]->which = Z_OtherInfo_externallyDefinedInfo;
ext = odr_malloc (r->stream, sizeof(*ext));
r->search_info->list[0]->information.externallyDefinedInfo = ext;
- ext->direct_reference =
- yaz_oidval_to_z3950oid (r->stream, CLASS_USERINFO, VAL_SEARCHRES1);
+ ext->direct_reference = odr_oiddup(r->stream,
+ yaz_oid_userinfo_searchresult_1);
ext->indirect_reference = 0;
ext->descriptor = 0;
ext->which = Z_External_searchResult1;
}
-int bend_fetch (void *handle, bend_fetch_rr *r)
+int bend_fetch(void *handle, bend_fetch_rr *r)
{
ZebraHandle zh = (ZebraHandle) handle;
ZebraRetrievalRecord retrievalRecord;
r->basename = retrievalRecord.base;
r->record = retrievalRecord.buf;
r->len = retrievalRecord.len;
- r->output_format = retrievalRecord.format;
+ r->output_format = odr_oiddup(r->stream, retrievalRecord.format);
}
return 0;
}
r->errstring = 0;
return 0;
}
- r->entries = (struct scan_entry *)
- odr_malloc (r->stream, sizeof(*r->entries) * r->num_entries);
res = zebra_scan(zh, r->stream, r->term,
r->attributeset,
&r->term_position,
for (i = 0; i < r->num_entries; i++)
{
r->entries[i].term = entries[i].term;
+ r->entries[i].display_term = entries[i].display_term;
r->entries[i].occurrences =
CAST_ZINT_TO_INT(entries[i].occurrences);
}
{
zebra_close ((ZebraHandle) handle);
xmalloc_trav("bend_close");
- nmem_print_list();
}
int bend_sort (void *handle, bend_sort_rr *rr)
for (i = 0; notToKeep && i < notToKeep->num; i++)
{
Z_External *rec = notToKeep->elements[i]->record;
- struct oident *oident = 0;
Odr_oct *opaque_recid = 0;
zint *sysno = 0;
zint sysno_tmp;
}
if (rec->direct_reference)
{
- oident = oid_getentbyoid(rec->direct_reference);
- if (oident)
+ char oid_name_str[OID_STR_MAX];
+ const char *oid_name =
+ yaz_oid_to_string_buf(
+ rec->direct_reference,
+ 0, oid_name_str);
+ if (oid_name)
yaz_log (YLOG_LOG, "record %d type %s", i,
- oident->desc);
+ oid_name);
}
switch (rec->which)
{
rec->u.octet_aligned->len,
rec->u.octet_aligned->buf);
}
- if (oident && oident->value != VAL_TEXT_XML
- && oident->value != VAL_SUTRS)
- {
- rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED;
- rr->errstring = "only XML update supported";
- break;
- }
if (rec->which == Z_External_octet)
{
enum zebra_recctrl_action_t action = action_update;