* Copyright (c) 2000-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.31 2003-04-23 20:38:19 adam Exp $
+ * $Id: zoom-c.c,v 1.36 2003-05-30 10:24:58 adam Exp $
*
* ZOOM layer for C, connections, result sets, queries.
*/
{
ZOOM_Event event = c->m_queue_front;
if (!event)
+ {
+ c->last_event = ZOOM_EVENT_NONE;
return 0;
+ }
assert (c->m_queue_back);
c->m_queue_front = event->prev;
if (c->m_queue_front)
addinfo2 ? addinfo2 : "");
}
+#if HAVE_XML2
static void set_HTTP_error (ZOOM_connection c, int error,
const char *addinfo, const char *addinfo2)
{
set_dset_error(c, error, "HTTP", addinfo, addinfo2);
}
+#endif
static void set_ZOOM_error (ZOOM_connection c, int error,
const char *addinfo)
switch (task->which)
{
case ZOOM_TASK_SEARCH:
+
ZOOM_resultset_destroy (task->u.search.resultset);
break;
case ZOOM_TASK_RETRIEVE:
r->setname = 0;
r->schema = 0;
r->count = 0;
+ r->step = 0;
r->record_cache = 0;
r->r_sort_spec = 0;
r->query = 0;
r->start = ZOOM_options_get_int(r->options, "start", 0);
r->count = ZOOM_options_get_int(r->options, "count", 0);
+ r->step = ZOOM_options_get_int(r->options, "step", 0);
r->piggyback = ZOOM_options_get_bool (r->options, "piggyback", 1);
cp = ZOOM_options_get (r->options, "setname");
if (cp)
ZOOM_record_cache rc;
for (rc = r->record_cache; rc; rc = rc->next)
+ {
if (rc->rec.wrbuf_marc)
wrbuf_free (rc->rec.wrbuf_marc, 1);
+ if (rc->rec.wrbuf_iconv)
+ wrbuf_free (rc->rec.wrbuf_iconv, 1);
+ }
if (r->connection)
{
/* remove ourselves from the resultsets in connection */
return zoom_complete;
}
sr->u.request->startRecord = odr_intdup (c->odr_out, resultset->start + 1);
- sr->u.request->maximumRecords = odr_intdup (c->odr_out, resultset->count);
+ sr->u.request->maximumRecords = odr_intdup (
+ c->odr_out, resultset->step>0 ? resultset->step : resultset->count);
sr->u.request->recordSchema = resultset->schema;
recordPacking = ZOOM_resultset_option_get (resultset, "recordPacking");
/* Regular piggyback - do it unless we're going to do sort */
*search_req->largeSetLowerBound = 2000000000;
*search_req->smallSetUpperBound = 0;
- *search_req->mediumSetPresentNumber = r->count;
+ *search_req->mediumSetPresentNumber = r->step>0 ? r->step : r->count;
smallSetElementSetName = 0;
}
else
nrec = (ZOOM_record) xmalloc (sizeof(*nrec));
nrec->odr = odr_createmem(ODR_DECODE);
nrec->wrbuf_marc = 0;
+ nrec->wrbuf_iconv = 0;
+ nrec->record_charset = 0;
+ if (srec->record_charset)
+ nrec->record_charset = odr_strdup(nrec->odr, srec->record_charset);
odr_setbuf (nrec->odr, buf, size, 0);
z_NamePlusRecord (nrec->odr, &nrec->npr, 0, 0);
ZOOM_API(ZOOM_record)
ZOOM_resultset_record (ZOOM_resultset r, size_t pos)
{
- ZOOM_resultset_retrieve (r, 1, pos, 1);
- return ZOOM_resultset_record_immediate (r, pos);
+ ZOOM_record rec = ZOOM_resultset_record_immediate(r, pos);
+
+ if (!rec)
+ {
+ ZOOM_resultset_retrieve (r, 1, pos, 1);
+ rec = ZOOM_resultset_record_immediate (r, pos);
+ }
+ return rec;
}
ZOOM_API(void)
xfree (rec);
}
+static const char *record_iconv_return(ZOOM_record rec, int *len,
+ const char *buf, int sz)
+{
+ char to[40];
+ char from[40];
+ yaz_iconv_t cd = 0;
+
+ *from = '\0';
+ strcpy(to, "UTF-8");
+ if (rec->record_charset)
+ {
+ /* Use "from,to" or just "from" */
+ const char *cp =strchr(rec->record_charset, ',');
+ int clen = strlen(rec->record_charset);
+ if (cp && cp[1])
+ {
+ strncpy( to, cp+1, sizeof(to)-1);
+ to[sizeof(to)-1] = '\0';
+ clen = cp - rec->record_charset;
+ }
+ if (clen > sizeof(from)-1)
+ clen = sizeof(from)-1;
+
+ if (clen)
+ strncpy(from, rec->record_charset, clen);
+ from[clen] = '\0';
+ }
+
+ if (*from && *to && (cd = yaz_iconv_open("UTF-8", rec->record_charset)))
+ {
+ char outbuf[12];
+ size_t inbytesleft = sz;
+ const char *inp = buf;
+
+ if (!rec->wrbuf_iconv)
+ rec->wrbuf_iconv = wrbuf_alloc();
+
+ wrbuf_rewind(rec->wrbuf_iconv);
+
+ while (inbytesleft)
+ {
+ size_t outbytesleft = sizeof(outbuf);
+ char *outp = outbuf;
+ size_t r = yaz_iconv (cd, (char**) &inp,
+ &inbytesleft,
+ &outp, &outbytesleft);
+ if (r == (size_t) (-1))
+ {
+ int e = yaz_iconv_error(cd);
+ if (e != YAZ_ICONV_E2BIG)
+ break;
+ }
+ wrbuf_write(rec->wrbuf_iconv, outbuf, outp - outbuf);
+ }
+ wrbuf_puts(rec->wrbuf_iconv, "");
+ buf = wrbuf_buf(rec->wrbuf_iconv);
+ sz = wrbuf_len(rec->wrbuf_iconv);
+ yaz_iconv_close(cd);
+ }
+ if (len)
+ *len = sz;
+ return buf;
+}
+
ZOOM_API(const char *)
ZOOM_record_get (ZOOM_record rec, const char *type, int *len)
{
oident *ent = oid_getentbyoid(r->direct_reference);
if (r->which == Z_External_sutrs)
- {
- if (len) *len = r->u.sutrs->len;
- return (const char *) r->u.sutrs->buf;
- }
+ return record_iconv_return(rec, len,
+ r->u.sutrs->buf, r->u.sutrs->len);
else if (r->which == Z_External_octet)
{
yaz_marc_t mt;
r->u.octet_aligned->len,
rec->wrbuf_marc) > 0)
{
- if (len)
- *len = wrbuf_len(rec->wrbuf_marc);
yaz_marc_destroy(mt);
- return wrbuf_buf(rec->wrbuf_marc);
+ return record_iconv_return(rec, len,
+ wrbuf_buf(rec->wrbuf_marc),
+ wrbuf_len(rec->wrbuf_marc));
}
yaz_marc_destroy(mt);
}
- if (len)
- *len = r->u.octet_aligned->len;
- return (const char *) r->u.octet_aligned->buf;
+ return record_iconv_return(rec, len,
+ (const char *) r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
}
else if (r->which == Z_External_grs1)
{
rec->wrbuf_marc = wrbuf_alloc();
wrbuf_rewind (rec->wrbuf_marc);
yaz_display_grs1(rec->wrbuf_marc, r->u.grs1, 0);
- if (len)
- *len = wrbuf_len(rec->wrbuf_marc);
- return wrbuf_buf(rec->wrbuf_marc);
+ return record_iconv_return(rec, len,
+ wrbuf_buf(rec->wrbuf_marc),
+ wrbuf_len(rec->wrbuf_marc));
}
return 0;
}
oident *ent = oid_getentbyoid(r->direct_reference);
if (r->which == Z_External_sutrs)
- {
- if (len) *len = r->u.sutrs->len;
- return (const char *) r->u.sutrs->buf;
- }
+ return record_iconv_return(rec, len,
+ (const char *) r->u.sutrs->buf,
+ r->u.sutrs->len);
else if (r->which == Z_External_octet)
{
yaz_marc_t mt;
r->u.octet_aligned->len,
rec->wrbuf_marc) > 0)
{
- if (len)
- *len = wrbuf_len(rec->wrbuf_marc);
yaz_marc_destroy(mt);
- return wrbuf_buf(rec->wrbuf_marc);
+ return record_iconv_return(rec, len,
+ wrbuf_buf(rec->wrbuf_marc),
+ wrbuf_len(rec->wrbuf_marc));
}
yaz_marc_destroy(mt);
}
- if (len) *len = r->u.octet_aligned->len;
- return (const char *) r->u.octet_aligned->buf;
+ return record_iconv_return(rec, len,
+ (const char *) r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
}
else if (r->which == Z_External_grs1)
{
ZOOM_resultset_option_get (r, "elementSetName");
const char *syntax =
ZOOM_resultset_option_get (r, "preferredRecordSyntax");
+ const char *recordCharset =
+ ZOOM_resultset_option_get (r, "recordCharset");
+ ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD);
+ ZOOM_connection_put_event(r->connection, event);
+
for (rc = r->record_cache; rc; rc = rc->next)
{
if (pos == rc->pos)
continue;
if (strcmp_null(syntax, rc->syntax))
continue;
+ if (strcmp_null(recordCharset, rc->rec.record_charset))
+ continue;
/* not destroying rc->npr (it's handled by nmem )*/
rc->rec.npr = npr;
/* keeping wrbuf_marc too */
rc->rec.npr = npr;
rc->rec.odr = 0;
rc->rec.wrbuf_marc = 0;
+ rc->rec.wrbuf_iconv = 0;
if (elementSetName)
rc->elementSetName = odr_strdup (r->odr, elementSetName);
else
else
rc->schema = 0;
+ rc->rec.record_charset = 0;
+ if (recordCharset)
+ rc->rec.record_charset = odr_strdup(r->odr, recordCharset);
+
rc->pos = pos;
rc->next = r->record_cache;
r->record_cache = rc;
static void handle_search_response (ZOOM_connection c, Z_SearchResponse *sr)
{
ZOOM_resultset resultset;
-
+ ZOOM_Event event;
+
yaz_log (LOG_DEBUG, "got search response");
-
+
if (!c->tasks || c->tasks->which != ZOOM_TASK_SEARCH)
return ;
+
+ event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
+ ZOOM_connection_put_event(c, event);
resultset = c->tasks->u.search.resultset;
resultset->start += i;
resultset->count -= i;
*req->resultSetStartPoint = resultset->start + 1;
- *req->numberOfRecordsRequested = resultset->count;
+ *req->numberOfRecordsRequested = resultset->step>0 ?
+ resultset->step : resultset->count;
assert (*req->numberOfRecordsRequested > 0);
if (syntax && *syntax)
ZOOM_resultset resultset = 0;
int i;
NMEM nmem;
+ ZOOM_Event event;
if (!c->tasks)
return;
else
return ;
+ event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
+ ZOOM_connection_put_event(c, event);
+
resultset->size = 0;
yaz_log(LOG_DEBUG, "got SRW response OK");