fbade554da1c0f33e05b767e415fc0e340c6e51a
[yaz-moved-to-github.git] / src / zoom-c.c
1 /* This file is part of the YAZ toolkit.
2  * Copyright (C) 1995-2009 Index Data
3  * See the file LICENSE for details.
4  */
5 /**
6  * \file zoom-c.c
7  * \brief Implements ZOOM C interface.
8  */
9
10 #include <assert.h>
11 #include <string.h>
12 #include <errno.h>
13 #include "zoom-p.h"
14
15 #include <yaz/yaz-util.h>
16 #include <yaz/xmalloc.h>
17 #include <yaz/otherinfo.h>
18 #include <yaz/log.h>
19 #include <yaz/pquery.h>
20 #include <yaz/marcdisp.h>
21 #include <yaz/diagbib1.h>
22 #include <yaz/charneg.h>
23 #include <yaz/ill.h>
24 #include <yaz/srw.h>
25 #include <yaz/cql.h>
26 #include <yaz/ccl.h>
27 #include <yaz/query-charset.h>
28 #include <yaz/copy_types.h>
29 #include <yaz/snprintf.h>
30
31 static int log_api = 0;
32 static int log_details = 0;
33
34 typedef enum {
35     zoom_pending,
36     zoom_complete
37 } zoom_ret;
38
39 static void resultset_destroy(ZOOM_resultset r);
40 static zoom_ret ZOOM_connection_send_init(ZOOM_connection c);
41 static zoom_ret do_write_ex(ZOOM_connection c, char *buf_out, int len_out);
42 static char *cql2pqf(ZOOM_connection c, const char *cql);
43
44 ZOOM_API(const char *) ZOOM_get_event_str(int event)
45 {
46     static const char *ar[] = {
47         "NONE",
48         "CONNECT",
49         "SEND_DATA",
50         "RECV_DATA",
51         "TIMEOUT",
52         "UNKNOWN",
53         "SEND_APDU",
54         "RECV_APDU",
55         "RECV_RECORD",
56         "RECV_SEARCH",
57         "END"
58     };
59     return ar[event];
60 }
61
62 /*
63  * This wrapper is just for logging failed lookups.  It would be nicer
64  * if it could cause failure when a lookup fails, but that's hard.
65  */
66 static Odr_oid *zoom_yaz_str_to_z3950oid(ZOOM_connection c,
67                                      oid_class oid_class, const char *str) {
68     Odr_oid *res = yaz_string_to_oid_odr(yaz_oid_std(), oid_class, str,
69                                      c->odr_out);
70     if (res == 0)
71         yaz_log(YLOG_WARN, "%p OID lookup (%d, '%s') failed",
72                 c, (int) oid_class, str);
73     return res;
74 }
75
76
77 static void initlog(void)
78 {
79     static int log_level_initialized = 0;
80     if (!log_level_initialized)
81     {
82         log_api = yaz_log_module_level("zoom");
83         log_details = yaz_log_module_level("zoomdetails");
84         log_level_initialized = 1;
85     }
86 }
87
88 static ZOOM_Event ZOOM_Event_create(int kind)
89 {
90     ZOOM_Event event = (ZOOM_Event) xmalloc(sizeof(*event));
91     event->kind = kind;
92     event->next = 0;
93     event->prev = 0;
94     yaz_log(log_details, "ZOOM_Event_create(kind=%d)", kind);
95     return event;
96 }
97
98 static void ZOOM_Event_destroy(ZOOM_Event event)
99 {
100     xfree(event);
101 }
102
103 static void ZOOM_connection_put_event(ZOOM_connection c, ZOOM_Event event)
104 {
105     if (c->m_queue_back)
106     {
107         c->m_queue_back->prev = event;
108         assert(c->m_queue_front);
109     }
110     else
111     {
112         assert(!c->m_queue_front);
113         c->m_queue_front = event;
114     }
115     event->next = c->m_queue_back;
116     event->prev = 0;
117     c->m_queue_back = event;
118 }
119
120 static ZOOM_Event ZOOM_connection_get_event(ZOOM_connection c)
121 {
122     ZOOM_Event event = c->m_queue_front;
123     if (!event)
124     {
125         c->last_event = ZOOM_EVENT_NONE;
126         return 0;
127     }
128     assert(c->m_queue_back);
129     c->m_queue_front = event->prev;
130     if (c->m_queue_front)
131     {
132         assert(c->m_queue_back);
133         c->m_queue_front->next = 0;
134     }
135     else
136         c->m_queue_back = 0;
137     c->last_event = event->kind;
138     return event;
139 }
140
141 static void ZOOM_connection_remove_events(ZOOM_connection c)
142 {
143     ZOOM_Event event;
144     while ((event = ZOOM_connection_get_event(c)))
145         ZOOM_Event_destroy(event);
146 }
147
148 ZOOM_API(int) ZOOM_connection_peek_event(ZOOM_connection c)
149 {
150     ZOOM_Event event = c->m_queue_front;
151
152     return event ? event->kind : ZOOM_EVENT_NONE;
153 }
154
155 void ZOOM_connection_remove_tasks(ZOOM_connection c);
156
157 static void set_dset_error(ZOOM_connection c, int error,
158                            const char *dset,
159                            const char *addinfo, const char *addinfo2)
160 {
161     char *cp;
162
163     xfree(c->addinfo);
164     c->addinfo = 0;
165     c->error = error;
166     if (!c->diagset || strcmp(dset, c->diagset))
167     {
168         xfree(c->diagset);
169         c->diagset = xstrdup(dset);
170         /* remove integer part from SRW diagset .. */
171         if ((cp = strrchr(c->diagset, '/')))
172             *cp = '\0';
173     }
174     if (addinfo && addinfo2)
175     {
176         c->addinfo = (char*) xmalloc(strlen(addinfo) + strlen(addinfo2) + 2);
177         strcpy(c->addinfo, addinfo);
178         strcat(c->addinfo, addinfo2);
179     }
180     else if (addinfo)
181         c->addinfo = xstrdup(addinfo);
182     if (error != ZOOM_ERROR_NONE)
183     {
184         yaz_log(log_api, "%p set_dset_error %s %s:%d %s %s",
185                 c, c->host_port ? c->host_port : "<>", dset, error,
186                 addinfo ? addinfo : "",
187                 addinfo2 ? addinfo2 : "");
188         ZOOM_connection_remove_tasks(c);
189     }
190 }
191
192 static int uri_to_code(const char *uri)
193 {
194     int code = 0;       
195     const char *cp;
196     if ((cp = strrchr(uri, '/')))
197         code = atoi(cp+1);
198     return code;
199 }
200
201 #if YAZ_HAVE_XML2
202 static void set_HTTP_error(ZOOM_connection c, int error,
203                            const char *addinfo, const char *addinfo2)
204 {
205     set_dset_error(c, error, "HTTP", addinfo, addinfo2);
206 }
207
208 static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d)
209 {
210     const char *uri = d->uri;
211     if (uri)
212         set_dset_error(c, uri_to_code(uri), uri, d->details, 0);
213 }
214
215 #endif
216
217
218 static void set_ZOOM_error(ZOOM_connection c, int error,
219                            const char *addinfo)
220 {
221     set_dset_error(c, error, "ZOOM", addinfo, 0);
222 }
223
224 static void clear_error(ZOOM_connection c)
225 {
226     /*
227      * If an error is tied to an operation then it's ok to clear: for
228      * example, a diagnostic returned from a search is cleared by a
229      * subsequent search.  However, problems such as Connection Lost
230      * or Init Refused are not cleared, because they are not
231      * recoverable: doing another search doesn't help.
232      */
233
234     ZOOM_connection_remove_events(c);
235     switch (c->error)
236     {
237     case ZOOM_ERROR_CONNECT:
238     case ZOOM_ERROR_MEMORY:
239     case ZOOM_ERROR_DECODE:
240     case ZOOM_ERROR_CONNECTION_LOST:
241     case ZOOM_ERROR_INIT:
242     case ZOOM_ERROR_INTERNAL:
243     case ZOOM_ERROR_UNSUPPORTED_PROTOCOL:
244         break;
245     default:
246         set_ZOOM_error(c, ZOOM_ERROR_NONE, 0);
247     }
248 }
249
250 void ZOOM_connection_show_task(ZOOM_task task)
251 {
252     switch(task->which)
253     {
254     case ZOOM_TASK_SEARCH:
255         yaz_log(YLOG_LOG, "search p=%p", task);
256         break;
257     case ZOOM_TASK_RETRIEVE:
258         yaz_log(YLOG_LOG, "retrieve p=%p", task);
259         break;
260     case ZOOM_TASK_CONNECT:
261         yaz_log(YLOG_LOG, "connect p=%p", task);
262         break;
263     case ZOOM_TASK_SCAN:
264         yaz_log(YLOG_LOG, "scan p=%p", task);
265         break;
266     }
267 }
268
269 void ZOOM_connection_show_tasks(ZOOM_connection c)
270 {
271     ZOOM_task task;
272     yaz_log(YLOG_LOG, "connection p=%p tasks", c);
273     for (task = c->tasks; task; task = task->next)
274         ZOOM_connection_show_task(task);
275 }
276
277 ZOOM_task ZOOM_connection_add_task(ZOOM_connection c, int which)
278 {
279     ZOOM_task *taskp = &c->tasks;
280     while (*taskp)
281         taskp = &(*taskp)->next;
282     *taskp = (ZOOM_task) xmalloc(sizeof(**taskp));
283     (*taskp)->running = 0;
284     (*taskp)->which = which;
285     (*taskp)->next = 0;
286     clear_error(c);
287     return *taskp;
288 }
289
290 ZOOM_API(int) ZOOM_connection_is_idle(ZOOM_connection c)
291 {
292     return c->tasks ? 0 : 1;
293 }
294
295 ZOOM_task ZOOM_connection_insert_task(ZOOM_connection c, int which)
296 {
297     ZOOM_task task = (ZOOM_task) xmalloc(sizeof(*task));
298
299     task->next = c->tasks;
300     c->tasks = task;
301
302     task->running = 0;
303     task->which = which;
304     clear_error(c);
305     return task;
306 }
307
308 void ZOOM_connection_remove_task(ZOOM_connection c)
309 {
310     ZOOM_task task = c->tasks;
311
312     if (task)
313     {
314         c->tasks = task->next;
315         switch (task->which)
316         {
317         case ZOOM_TASK_SEARCH:
318             resultset_destroy(task->u.search.resultset);
319             xfree(task->u.search.syntax);
320             xfree(task->u.search.elementSetName);
321             break;
322         case ZOOM_TASK_RETRIEVE:
323             resultset_destroy(task->u.retrieve.resultset);
324             xfree(task->u.retrieve.syntax);
325             xfree(task->u.retrieve.elementSetName);
326             break;
327         case ZOOM_TASK_CONNECT:
328             break;
329         case ZOOM_TASK_SCAN:
330             ZOOM_scanset_destroy(task->u.scan.scan);
331             break;
332         case ZOOM_TASK_PACKAGE:
333             ZOOM_package_destroy(task->u.package);
334             break;
335         case ZOOM_TASK_SORT:
336             resultset_destroy(task->u.sort.resultset);
337             ZOOM_query_destroy(task->u.sort.q);
338             break;
339         default:
340             assert(0);
341         }
342         xfree(task);
343
344         if (!c->tasks)
345         {
346             ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_END);
347             ZOOM_connection_put_event(c, event);
348         }
349     }
350 }
351
352 static int ZOOM_connection_exec_task(ZOOM_connection c);
353
354 void ZOOM_connection_remove_tasks(ZOOM_connection c)
355 {
356     while (c->tasks)
357         ZOOM_connection_remove_task(c);
358 }
359
360 static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos,
361                                        const char *syntax,
362                                        const char *elementSetName);
363
364 ZOOM_API(ZOOM_connection)
365     ZOOM_connection_create(ZOOM_options options)
366 {
367     ZOOM_connection c = (ZOOM_connection) xmalloc(sizeof(*c));
368
369     initlog();
370
371     yaz_log(log_api, "%p ZOOM_connection_create", c);
372
373     c->proto = PROTO_Z3950;
374     c->cs = 0;
375     ZOOM_connection_set_mask(c, 0);
376     c->reconnect_ok = 0;
377     c->state = STATE_IDLE;
378     c->addinfo = 0;
379     c->diagset = 0;
380     set_ZOOM_error(c, ZOOM_ERROR_NONE, 0);
381     c->buf_in = 0;
382     c->len_in = 0;
383     c->buf_out = 0;
384     c->len_out = 0;
385     c->resultsets = 0;
386
387     c->options = ZOOM_options_create_with_parent(options);
388
389     c->host_port = 0;
390     c->path = 0;
391     c->proxy = 0;
392     
393     c->charset = c->lang = 0;
394
395     c->cookie_out = 0;
396     c->cookie_in = 0;
397     c->client_IP = 0;
398     c->tasks = 0;
399
400     c->user = 0;
401     c->group = 0;
402     c->password = 0;
403
404     c->maximum_record_size = 0;
405     c->preferred_message_size = 0;
406
407     c->odr_in = odr_createmem(ODR_DECODE);
408     c->odr_out = odr_createmem(ODR_ENCODE);
409
410     c->async = 0;
411     c->support_named_resultsets = 0;
412     c->last_event = ZOOM_EVENT_NONE;
413
414     c->m_queue_front = 0;
415     c->m_queue_back = 0;
416
417     c->sru_version = 0;
418     return c;
419 }
420
421
422 /* set database names. Take local databases (if set); otherwise
423    take databases given in ZURL (if set); otherwise use Default */
424 static char **set_DatabaseNames(ZOOM_connection con, ZOOM_options options,
425                                 int *num, ODR odr)
426 {
427     char **databaseNames;
428     const char *cp = ZOOM_options_get(options, "databaseName");
429     
430     if ((!cp || !*cp) && con->host_port)
431     {
432         if (strncmp(con->host_port, "unix:", 5) == 0)
433             cp = strchr(con->host_port+5, ':');
434         else
435             cp = strchr(con->host_port, '/');
436         if (cp)
437             cp++;
438     }
439     if (!cp)
440         cp = "Default";
441     nmem_strsplit(odr_getmem(odr), "+", cp,  &databaseNames, num);
442     return databaseNames;
443 }
444
445 ZOOM_API(ZOOM_connection)
446     ZOOM_connection_new(const char *host, int portnum)
447 {
448     ZOOM_connection c = ZOOM_connection_create(0);
449
450     ZOOM_connection_connect(c, host, portnum);
451     return c;
452 }
453
454 static zoom_sru_mode get_sru_mode_from_string(const char *s)
455 {
456     if (!s || !*s)
457         return zoom_sru_soap;
458     if (!yaz_matchstr(s, "soap"))
459         return zoom_sru_soap;
460     else if (!yaz_matchstr(s, "get"))
461         return zoom_sru_get;
462     else if (!yaz_matchstr(s, "post"))
463         return zoom_sru_post;
464     return zoom_sru_error;
465 }
466
467 ZOOM_API(void)
468     ZOOM_connection_connect(ZOOM_connection c,
469                             const char *host, int portnum)
470 {
471     const char *val;
472     ZOOM_task task;
473
474     initlog();
475
476     yaz_log(log_api, "%p ZOOM_connection_connect host=%s portnum=%d",
477             c, host ? host : "null", portnum);
478
479     set_ZOOM_error(c, ZOOM_ERROR_NONE, 0);
480     ZOOM_connection_remove_tasks(c);
481
482     if (ZOOM_options_get_bool(c->options, "apdulog", 0))
483     {
484         c->odr_print = odr_createmem(ODR_PRINT);
485         odr_setprint(c->odr_print, yaz_log_file());
486     }
487     else
488         c->odr_print = 0;
489
490     if (c->cs)
491     {
492         yaz_log(log_details, "%p ZOOM_connection_connect reconnect ok", c);
493         c->reconnect_ok = 1;
494         return;
495     }
496     yaz_log(log_details, "%p ZOOM_connection_connect connect", c);
497     xfree(c->proxy);
498     c->proxy = 0;
499     val = ZOOM_options_get(c->options, "proxy");
500     if (val && *val)
501     {
502         yaz_log(log_details, "%p ZOOM_connection_connect proxy=%s", c, val);
503         c->proxy = xstrdup(val);
504     }
505
506     xfree(c->charset);
507     c->charset = 0;
508     val = ZOOM_options_get(c->options, "charset");
509     if (val && *val)
510     {
511         yaz_log(log_details, "%p ZOOM_connection_connect charset=%s", c, val);
512         c->charset = xstrdup(val);
513     }
514
515     xfree(c->lang);
516     val = ZOOM_options_get(c->options, "lang");
517     if (val && *val)
518     {
519         yaz_log(log_details, "%p ZOOM_connection_connect lang=%s", c, val);
520         c->lang = xstrdup(val);
521     }
522     else
523         c->lang = 0;
524
525     if (host)
526     {
527         xfree(c->host_port);
528         if (portnum)
529         {
530             char hostn[128];
531             sprintf(hostn, "%.80s:%d", host, portnum);
532             c->host_port = xstrdup(hostn);
533         }
534         else
535             c->host_port = xstrdup(host);
536     }        
537
538     {
539         /*
540          * If the "<scheme>:" part of the host string is preceded by one
541          * or more comma-separated <name>=<value> pairs, these are taken
542          * to be options to be set on the connection object.  Among other
543          * applications, this facility can be used to embed authentication
544          * in a host string:
545          *          user=admin,password=secret,tcp:localhost:9999
546          */
547         char *remainder = c->host_port;
548         char *pcolon = strchr(remainder, ':');
549         char *pcomma;
550         char *pequals;
551         while ((pcomma = strchr(remainder, ',')) != 0 &&
552                (pcolon == 0 || pcomma < pcolon)) {
553             *pcomma = '\0';
554             if ((pequals = strchr(remainder, '=')) != 0) {
555                 *pequals = '\0';
556                 /*printf("# setting '%s'='%s'\n", remainder, pequals+1);*/
557                 ZOOM_connection_option_set(c, remainder, pequals+1);
558             }
559             remainder = pcomma+1;
560         }
561
562         if (remainder != c->host_port) {
563             xfree(c->host_port);
564             c->host_port = xstrdup(remainder);
565             /*printf("# reset hp='%s'\n", remainder);*/
566         }
567     }
568
569     val = ZOOM_options_get(c->options, "sru");
570     c->sru_mode = get_sru_mode_from_string(val);
571
572     xfree(c->sru_version);
573     val = ZOOM_options_get(c->options, "sru_version");
574     c->sru_version = xstrdup(val ? val : "1.2");
575
576     ZOOM_options_set(c->options, "host", c->host_port);
577
578     xfree(c->cookie_out);
579     c->cookie_out = 0;
580     val = ZOOM_options_get(c->options, "cookie");
581     if (val && *val)
582     { 
583         yaz_log(log_details, "%p ZOOM_connection_connect cookie=%s", c, val);
584         c->cookie_out = xstrdup(val);
585     }
586
587     xfree(c->client_IP);
588     c->client_IP = 0;
589     val = ZOOM_options_get(c->options, "clientIP");
590     if (val && *val)
591     {
592         yaz_log(log_details, "%p ZOOM_connection_connect clientIP=%s",
593                 c, val);
594         c->client_IP = xstrdup(val);
595     }
596
597     xfree(c->group);
598     c->group = 0;
599     val = ZOOM_options_get(c->options, "group");
600     if (val && *val)
601         c->group = xstrdup(val);
602
603     xfree(c->user);
604     c->user = 0;
605     val = ZOOM_options_get(c->options, "user");
606     if (val && *val)
607         c->user = xstrdup(val);
608
609     xfree(c->password);
610     c->password = 0;
611     val = ZOOM_options_get(c->options, "password");
612     if (!val)
613         val = ZOOM_options_get(c->options, "pass");
614
615     if (val && *val)
616         c->password = xstrdup(val);
617     
618     c->maximum_record_size =
619         ZOOM_options_get_int(c->options, "maximumRecordSize", 1024*1024);
620     c->preferred_message_size =
621         ZOOM_options_get_int(c->options, "preferredMessageSize", 1024*1024);
622
623     c->async = ZOOM_options_get_bool(c->options, "async", 0);
624     yaz_log(log_details, "%p ZOOM_connection_connect async=%d", c, c->async);
625  
626     task = ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT);
627
628     if (!c->async)
629     {
630         while (ZOOM_event(1, &c))
631             ;
632     }
633 }
634
635 ZOOM_API(ZOOM_query)
636     ZOOM_query_create(void)
637 {
638     ZOOM_query s = (ZOOM_query) xmalloc(sizeof(*s));
639
640     yaz_log(log_details, "%p ZOOM_query_create", s);
641     s->refcount = 1;
642     s->z_query = 0;
643     s->sort_spec = 0;
644     s->odr = odr_createmem(ODR_ENCODE);
645     s->query_string = 0;
646
647     return s;
648 }
649
650 ZOOM_API(void)
651     ZOOM_query_destroy(ZOOM_query s)
652 {
653     if (!s)
654         return;
655
656     (s->refcount)--;
657     yaz_log(log_details, "%p ZOOM_query_destroy count=%d", s, s->refcount);
658     if (s->refcount == 0)
659     {
660         odr_destroy(s->odr);
661         xfree(s);
662     }
663 }
664
665 ZOOM_API(int)
666     ZOOM_query_prefix(ZOOM_query s, const char *str)
667 {
668     s->query_string = odr_strdup(s->odr, str);
669     s->z_query = (Z_Query *) odr_malloc(s->odr, sizeof(*s->z_query));
670     s->z_query->which = Z_Query_type_1;
671     s->z_query->u.type_1 =  p_query_rpn(s->odr, str);
672     if (!s->z_query->u.type_1)
673     {
674         yaz_log(log_details, "%p ZOOM_query_prefix str=%s failed", s, str);
675         s->z_query = 0;
676         return -1;
677     }
678     yaz_log(log_details, "%p ZOOM_query_prefix str=%s", s, str);
679     return 0;
680 }
681
682 ZOOM_API(int)
683     ZOOM_query_cql(ZOOM_query s, const char *str)
684 {
685     Z_External *ext;
686
687     s->query_string = odr_strdup(s->odr, str);
688
689     ext = (Z_External *) odr_malloc(s->odr, sizeof(*ext));
690     ext->direct_reference = odr_oiddup(s->odr, yaz_oid_userinfo_cql);
691     ext->indirect_reference = 0;
692     ext->descriptor = 0;
693     ext->which = Z_External_CQL;
694     ext->u.cql = s->query_string;
695     
696     s->z_query = (Z_Query *) odr_malloc(s->odr, sizeof(*s->z_query));
697     s->z_query->which = Z_Query_type_104;
698     s->z_query->u.type_104 =  ext;
699
700     yaz_log(log_details, "%p ZOOM_query_cql str=%s", s, str);
701
702     return 0;
703 }
704
705 /*
706  * Translate the CQL string client-side into RPN which is passed to
707  * the server.  This is useful for server's that don't themselves
708  * support CQL, for which ZOOM_query_cql() is useless.  `conn' is used
709  * only as a place to stash diagnostics if compilation fails; if this
710  * information is not needed, a null pointer may be used.
711  */
712 ZOOM_API(int)
713     ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
714 {
715     char *rpn;
716     int ret;
717     ZOOM_connection freeme = 0;
718
719     yaz_log(log_details, "%p ZOOM_query_cql2rpn str=%s conn=%p", s, str, conn);
720     if (conn == 0)
721         conn = freeme = ZOOM_connection_create(0);
722
723     rpn = cql2pqf(conn, str);
724     if (freeme != 0)
725         ZOOM_connection_destroy(freeme);
726     if (rpn == 0)
727         return -1;
728
729     ret = ZOOM_query_prefix(s, rpn);
730     xfree(rpn);
731     return ret;
732 }
733
734 /*
735  * Analogous in every way to ZOOM_query_cql2rpn(), except that there
736  * is no analogous ZOOM_query_ccl() that just sends uninterpreted CCL
737  * to the server, as the YAZ GFS doesn't know how to handle this.
738  */
739 ZOOM_API(int)
740     ZOOM_query_ccl2rpn(ZOOM_query s, const char *str, const char *config,
741                        int *ccl_error, const char **error_string,
742                        int *error_pos)
743 {
744     int ret;
745     struct ccl_rpn_node *rpn;
746     CCL_bibset bibset = ccl_qual_mk();
747
748     if (config)
749         ccl_qual_buf(bibset, config);
750
751     rpn = ccl_find_str(bibset, str, ccl_error, error_pos);
752     if (!rpn)
753     {
754         *error_string = ccl_err_msg(*ccl_error);
755         ret = -1;
756     }
757     else
758     {
759         WRBUF wr = wrbuf_alloc();
760         ccl_pquery(wr, rpn);
761         ccl_rpn_delete(rpn);
762         ret = ZOOM_query_prefix(s, wrbuf_cstr(wr));
763         wrbuf_destroy(wr);
764     }
765     ccl_qual_rm(&bibset);
766     return ret;
767 }
768
769 ZOOM_API(int)
770     ZOOM_query_sortby(ZOOM_query s, const char *criteria)
771 {
772     s->sort_spec = yaz_sort_spec(s->odr, criteria);
773     if (!s->sort_spec)
774     {
775         yaz_log(log_details, "%p ZOOM_query_sortby criteria=%s failed",
776                 s, criteria);
777         return -1;
778     }
779     yaz_log(log_details, "%p ZOOM_query_sortby criteria=%s", s, criteria);
780     return 0;
781 }
782
783 static zoom_ret do_write(ZOOM_connection c);
784
785 ZOOM_API(void)
786     ZOOM_connection_destroy(ZOOM_connection c)
787 {
788     ZOOM_resultset r;
789     if (!c)
790         return;
791     yaz_log(log_api, "%p ZOOM_connection_destroy", c);
792     if (c->cs)
793         cs_close(c->cs);
794     for (r = c->resultsets; r; r = r->next)
795         r->connection = 0;
796
797     xfree(c->buf_in);
798     xfree(c->addinfo);
799     xfree(c->diagset);
800     odr_destroy(c->odr_in);
801     odr_destroy(c->odr_out);
802     if (c->odr_print)
803     {
804         odr_setprint(c->odr_print, 0); /* prevent destroy from fclose'ing */
805         odr_destroy(c->odr_print);
806     }
807     ZOOM_options_destroy(c->options);
808     ZOOM_connection_remove_tasks(c);
809     ZOOM_connection_remove_events(c);
810     xfree(c->host_port);
811     xfree(c->path);
812     xfree(c->proxy);
813     xfree(c->charset);
814     xfree(c->lang);
815     xfree(c->cookie_out);
816     xfree(c->cookie_in);
817     xfree(c->client_IP);
818     xfree(c->user);
819     xfree(c->group);
820     xfree(c->password);
821     xfree(c->sru_version);
822     xfree(c);
823 }
824
825 void ZOOM_resultset_addref(ZOOM_resultset r)
826 {
827     if (r)
828     {
829         (r->refcount)++;
830         yaz_log(log_details, "%p ZOOM_resultset_addref count=%d",
831                 r, r->refcount);
832     }
833 }
834
835 ZOOM_resultset ZOOM_resultset_create(void)
836 {
837     int i;
838     ZOOM_resultset r = (ZOOM_resultset) xmalloc(sizeof(*r));
839
840     initlog();
841
842     yaz_log(log_details, "%p ZOOM_resultset_create", r);
843     r->refcount = 1;
844     r->size = 0;
845     r->odr = odr_createmem(ODR_ENCODE);
846     r->piggyback = 1;
847     r->setname = 0;
848     r->schema = 0;
849     r->step = 0;
850     for (i = 0; i<RECORD_HASH_SIZE; i++)
851         r->record_hash[i] = 0;
852     r->r_sort_spec = 0;
853     r->query = 0;
854     r->connection = 0;
855     r->next = 0;
856     r->databaseNames = 0;
857     r->num_databaseNames = 0;
858     return r;
859 }
860
861 ZOOM_API(ZOOM_resultset)
862     ZOOM_connection_search_pqf(ZOOM_connection c, const char *q)
863 {
864     ZOOM_resultset r;
865     ZOOM_query s = ZOOM_query_create();
866
867     ZOOM_query_prefix(s, q);
868
869     r = ZOOM_connection_search(c, s);
870     ZOOM_query_destroy(s);
871     return r;
872 }
873
874 ZOOM_API(ZOOM_resultset)
875     ZOOM_connection_search(ZOOM_connection c, ZOOM_query q)
876 {
877     ZOOM_resultset r = ZOOM_resultset_create();
878     ZOOM_task task;
879     const char *cp;
880     int start, count;
881     const char *syntax, *elementSetName;
882
883     yaz_log(log_api, "%p ZOOM_connection_search set %p query %p", c, r, q);
884     r->r_sort_spec = q->sort_spec;
885     r->query = q;
886
887     r->options = ZOOM_options_create_with_parent(c->options);
888     
889     start = ZOOM_options_get_int(r->options, "start", 0);
890     count = ZOOM_options_get_int(r->options, "count", 0);
891     {
892         /* If "presentChunk" is defined use that; otherwise "step" */
893         const char *cp = ZOOM_options_get(r->options, "presentChunk");
894         r->step = ZOOM_options_get_int(r->options,
895                                        (cp != 0 ? "presentChunk": "step"), 0);
896     }
897     r->piggyback = ZOOM_options_get_bool(r->options, "piggyback", 1);
898     cp = ZOOM_options_get(r->options, "setname");
899     if (cp)
900         r->setname = xstrdup(cp);
901     cp = ZOOM_options_get(r->options, "schema");
902     if (cp)
903         r->schema = xstrdup(cp);
904
905     r->databaseNames = set_DatabaseNames(c, c->options, &r->num_databaseNames,
906                                          r->odr);
907     
908     r->connection = c;
909
910     r->next = c->resultsets;
911     c->resultsets = r;
912
913     
914
915     if (c->host_port && c->proto == PROTO_HTTP)
916     {
917         if (!c->cs)
918         {
919             yaz_log(log_details, "ZOOM_connection_search: no comstack");
920             ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT);
921         }
922         else
923         {
924             yaz_log(log_details, "ZOOM_connection_search: reconnect");
925             c->reconnect_ok = 1;
926         }
927     }
928
929     task = ZOOM_connection_add_task(c, ZOOM_TASK_SEARCH);
930     task->u.search.resultset = r;
931     task->u.search.start = start;
932     task->u.search.count = count;
933     task->u.search.recv_search_fired = 0;
934
935     syntax = ZOOM_options_get(r->options, "preferredRecordSyntax"); 
936     task->u.search.syntax = syntax ? xstrdup(syntax) : 0;
937     elementSetName = ZOOM_options_get(r->options, "elementSetName");
938     task->u.search.elementSetName = elementSetName 
939         ? xstrdup(elementSetName) : 0;
940    
941     ZOOM_resultset_addref(r);
942
943     (q->refcount)++;
944
945     if (!c->async)
946     {
947         while (ZOOM_event(1, &c))
948             ;
949     }
950     return r;
951 }
952
953 ZOOM_API(void)
954     ZOOM_resultset_sort(ZOOM_resultset r,
955                          const char *sort_type, const char *sort_spec)
956 {
957     (void) ZOOM_resultset_sort1(r, sort_type, sort_spec);
958 }
959
960 ZOOM_API(int)
961     ZOOM_resultset_sort1(ZOOM_resultset r,
962                          const char *sort_type, const char *sort_spec)
963 {
964     ZOOM_connection c = r->connection;
965     ZOOM_task task;
966     ZOOM_query newq;
967
968     newq = ZOOM_query_create();
969     if (ZOOM_query_sortby(newq, sort_spec) < 0)
970         return -1;
971
972     yaz_log(log_api, "%p ZOOM_resultset_sort r=%p sort_type=%s sort_spec=%s",
973             r, r, sort_type, sort_spec);
974     if (!c)
975         return 0;
976
977     if (c->host_port && c->proto == PROTO_HTTP)
978     {
979         if (!c->cs)
980         {
981             yaz_log(log_details, "%p ZOOM_resultset_sort: no comstack", r);
982             ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT);
983         }
984         else
985         {
986             yaz_log(log_details, "%p ZOOM_resultset_sort: prepare reconnect",
987                     r);
988             c->reconnect_ok = 1;
989         }
990     }
991     
992     ZOOM_resultset_cache_reset(r);
993     task = ZOOM_connection_add_task(c, ZOOM_TASK_SORT);
994     task->u.sort.resultset = r;
995     task->u.sort.q = newq;
996
997     ZOOM_resultset_addref(r);  
998
999     if (!c->async)
1000     {
1001         while (ZOOM_event(1, &c))
1002             ;
1003     }
1004
1005     return 0;
1006 }
1007
1008 ZOOM_API(void)
1009     ZOOM_resultset_cache_reset(ZOOM_resultset r)
1010 {
1011     int i;
1012     for (i = 0; i<RECORD_HASH_SIZE; i++)
1013     {
1014         ZOOM_record_cache rc;
1015         for (rc = r->record_hash[i]; rc; rc = rc->next)
1016         {
1017             if (rc->rec.wrbuf)
1018                 wrbuf_destroy(rc->rec.wrbuf);
1019         }
1020         r->record_hash[i] = 0;
1021     }
1022 }
1023
1024 ZOOM_API(void)
1025     ZOOM_resultset_destroy(ZOOM_resultset r)
1026 {
1027     resultset_destroy(r);
1028 }
1029
1030 static void resultset_destroy(ZOOM_resultset r)
1031 {
1032     if (!r)
1033         return;
1034     (r->refcount)--;
1035     yaz_log(log_details, "%p ZOOM_resultset_destroy r=%p count=%d",
1036             r, r, r->refcount);
1037     if (r->refcount == 0)
1038     {
1039         ZOOM_resultset_cache_reset(r);
1040
1041         if (r->connection)
1042         {
1043             /* remove ourselves from the resultsets in connection */
1044             ZOOM_resultset *rp = &r->connection->resultsets;
1045             while (1)
1046             {
1047                 assert(*rp);   /* we must be in this list!! */
1048                 if (*rp == r)
1049                 {   /* OK, we're here - take us out of it */
1050                     *rp = (*rp)->next;
1051                     break;
1052                 }
1053                 rp = &(*rp)->next;
1054             }
1055         }
1056         ZOOM_query_destroy(r->query);
1057         ZOOM_options_destroy(r->options);
1058         odr_destroy(r->odr);
1059         xfree(r->setname);
1060         xfree(r->schema);
1061         xfree(r);
1062     }
1063 }
1064
1065 ZOOM_API(size_t)
1066     ZOOM_resultset_size(ZOOM_resultset r)
1067 {
1068     yaz_log(log_details, "ZOOM_resultset_size r=%p count=%d",
1069             r, r->size);
1070     return r->size;
1071 }
1072
1073 static void do_close(ZOOM_connection c)
1074 {
1075     if (c->cs)
1076         cs_close(c->cs);
1077     c->cs = 0;
1078     ZOOM_connection_set_mask(c, 0);
1079     c->state = STATE_IDLE;
1080 }
1081
1082 static int ZOOM_test_reconnect(ZOOM_connection c)
1083 {
1084     ZOOM_Event event;
1085
1086     if (!c->reconnect_ok)
1087         return 0;
1088     do_close(c);
1089     c->reconnect_ok = 0;
1090     c->tasks->running = 0;
1091     ZOOM_connection_insert_task(c, ZOOM_TASK_CONNECT);
1092
1093     event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
1094     ZOOM_connection_put_event(c, event);
1095
1096     return 1;
1097 }
1098
1099 static void ZOOM_resultset_retrieve(ZOOM_resultset r,
1100                                     int force_sync, int start, int count)
1101 {
1102     ZOOM_task task;
1103     ZOOM_connection c;
1104     const char *cp;
1105     const char *syntax, *elementSetName;
1106
1107     if (!r)
1108         return;
1109     yaz_log(log_details, "%p ZOOM_resultset_retrieve force_sync=%d start=%d"
1110             " count=%d", r, force_sync, start, count);
1111     c = r->connection;
1112     if (!c)
1113         return;
1114
1115     if (c->host_port && c->proto == PROTO_HTTP)
1116     {
1117         if (!c->cs)
1118         {
1119             yaz_log(log_details, "%p ZOOM_resultset_retrieve: no comstack", r);
1120             ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT);
1121         }
1122         else
1123         {
1124             yaz_log(log_details, "%p ZOOM_resultset_retrieve: prepare "
1125                     "reconnect", r);
1126             c->reconnect_ok = 1;
1127         }
1128     }
1129     task = ZOOM_connection_add_task(c, ZOOM_TASK_RETRIEVE);
1130     task->u.retrieve.resultset = r;
1131     task->u.retrieve.start = start;
1132     task->u.retrieve.count = count;
1133
1134     syntax = ZOOM_options_get(r->options, "preferredRecordSyntax"); 
1135     task->u.retrieve.syntax = syntax ? xstrdup(syntax) : 0;
1136     elementSetName = ZOOM_options_get(r->options, "elementSetName");
1137     task->u.retrieve.elementSetName = elementSetName 
1138         ? xstrdup(elementSetName) : 0;
1139
1140     cp = ZOOM_options_get(r->options, "schema");
1141     if (cp)
1142     {
1143         if (!r->schema || strcmp(r->schema, cp))
1144         {
1145             xfree(r->schema);
1146             r->schema = xstrdup(cp);
1147         }
1148     }
1149
1150     ZOOM_resultset_addref(r);
1151
1152     if (!r->connection->async || force_sync)
1153         while (r->connection && ZOOM_event(1, &r->connection))
1154             ;
1155 }
1156
1157 ZOOM_API(void)
1158     ZOOM_resultset_records(ZOOM_resultset r, ZOOM_record *recs,
1159                            size_t start, size_t count)
1160 {
1161     int force_present = 0;
1162
1163     if (!r)
1164         return ;
1165     yaz_log(log_api, "%p ZOOM_resultset_records r=%p start=%ld count=%ld",
1166             r, r, (long) start, (long) count);
1167     if (count && recs)
1168         force_present = 1;
1169     ZOOM_resultset_retrieve(r, force_present, start, count);
1170     if (force_present)
1171     {
1172         size_t i;
1173         for (i = 0; i< count; i++)
1174             recs[i] = ZOOM_resultset_record_immediate(r, i+start);
1175     }
1176 }
1177
1178 static void get_cert(ZOOM_connection c)
1179 {
1180     char *cert_buf;
1181     int cert_len;
1182     
1183     if (cs_get_peer_certificate_x509(c->cs, &cert_buf, &cert_len))
1184     {
1185         ZOOM_connection_option_setl(c, "sslPeerCert",
1186                                     cert_buf, cert_len);
1187         xfree(cert_buf);
1188     }
1189 }
1190
1191 static zoom_ret do_connect(ZOOM_connection c)
1192 {
1193     void *add;
1194     const char *effective_host;
1195
1196     if (c->proxy)
1197         effective_host = c->proxy;
1198     else
1199         effective_host = c->host_port;
1200
1201     yaz_log(log_details, "%p do_connect effective_host=%s", c, effective_host);
1202
1203     if (c->cs)
1204         cs_close(c->cs);
1205     c->cs = cs_create_host(effective_host, 0, &add);
1206
1207     if (c->cs && c->cs->protocol == PROTO_HTTP)
1208     {
1209 #if YAZ_HAVE_XML2
1210         const char *path = 0;
1211
1212         c->proto = PROTO_HTTP;
1213         cs_get_host_args(c->host_port, &path);
1214         xfree(c->path);
1215         c->path = (char*) xmalloc(strlen(path)+2);
1216         c->path[0] = '/';
1217         strcpy(c->path+1, path);
1218 #else
1219         set_ZOOM_error(c, ZOOM_ERROR_UNSUPPORTED_PROTOCOL, "SRW");
1220         do_close(c);
1221         return zoom_complete;
1222 #endif
1223     }
1224     if (c->cs)
1225     {
1226         int ret = cs_connect(c->cs, add);
1227         if (ret == 0)
1228         {
1229             ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
1230             ZOOM_connection_put_event(c, event);
1231             get_cert(c);
1232             if (c->proto == PROTO_Z3950)
1233                 ZOOM_connection_send_init(c);
1234             else
1235             {
1236                 /* no init request for SRW .. */
1237                 assert(c->tasks->which == ZOOM_TASK_CONNECT);
1238                 ZOOM_connection_remove_task(c);
1239                 ZOOM_connection_set_mask(c, 0);
1240                 ZOOM_connection_exec_task(c);
1241             }
1242             c->state = STATE_ESTABLISHED;
1243             return zoom_pending;
1244         }
1245         else if (ret > 0)
1246         {
1247             int mask = ZOOM_SELECT_EXCEPT;
1248             if (c->cs->io_pending & CS_WANT_WRITE)
1249                 mask += ZOOM_SELECT_WRITE;
1250             if (c->cs->io_pending & CS_WANT_READ)
1251                 mask += ZOOM_SELECT_READ;
1252             ZOOM_connection_set_mask(c, mask);
1253             c->state = STATE_CONNECTING; 
1254             return zoom_pending;
1255         }
1256     }
1257     c->state = STATE_IDLE;
1258     set_ZOOM_error(c, ZOOM_ERROR_CONNECT, c->host_port);
1259     return zoom_complete;
1260 }
1261
1262 static void otherInfo_attach(ZOOM_connection c, Z_APDU *a, ODR out)
1263 {
1264     int i;
1265     for (i = 0; i<200; i++)
1266     {
1267         size_t len;
1268         Odr_oid *oid;
1269         Z_OtherInformation **oi;
1270         char buf[80];
1271         const char *val;
1272         const char *cp;
1273
1274         sprintf(buf, "otherInfo%d", i);
1275         val = ZOOM_options_get(c->options, buf);
1276         if (!val)
1277             break;
1278         cp = strchr(val, ':');
1279         if (!cp)
1280             continue;
1281         len = cp - val;
1282         if (len >= sizeof(buf))
1283             len = sizeof(buf)-1;
1284         memcpy(buf, val, len);
1285         buf[len] = '\0';
1286         
1287         oid = yaz_string_to_oid_odr(yaz_oid_std(), CLASS_USERINFO,
1288                                     buf, out);
1289         if (!oid)
1290             continue;
1291         
1292         yaz_oi_APDU(a, &oi);
1293         yaz_oi_set_string_oid(oi, out, oid, 1, cp+1);
1294     }
1295 }
1296
1297 static int encode_APDU(ZOOM_connection c, Z_APDU *a, ODR out)
1298 {
1299     assert(a);
1300     if (c->cookie_out)
1301     {
1302         Z_OtherInformation **oi;
1303         yaz_oi_APDU(a, &oi);
1304         yaz_oi_set_string_oid(oi, out, yaz_oid_userinfo_cookie, 
1305                               1, c->cookie_out);
1306     }
1307     if (c->client_IP)
1308     {
1309         Z_OtherInformation **oi;
1310         yaz_oi_APDU(a, &oi);
1311         yaz_oi_set_string_oid(oi, out, yaz_oid_userinfo_client_ip, 
1312                               1, c->client_IP);
1313     }
1314     otherInfo_attach(c, a, out);
1315     if (!z_APDU(out, &a, 0, 0))
1316     {
1317         FILE *outf = fopen("/tmp/apdu.txt", "a");
1318         if (a && outf)
1319         {
1320             ODR odr_pr = odr_createmem(ODR_PRINT);
1321             fprintf(outf, "a=%p\n", a);
1322             odr_setprint(odr_pr, outf);
1323             z_APDU(odr_pr, &a, 0, 0);
1324             odr_destroy(odr_pr);
1325         }
1326         yaz_log(log_api, "%p encoding_APDU: encoding failed", c);
1327         set_ZOOM_error(c, ZOOM_ERROR_ENCODE, 0);
1328         odr_reset(out);
1329         return -1;
1330     }
1331     if (c->odr_print)
1332         z_APDU(c->odr_print, &a, 0, 0);
1333     yaz_log(log_details, "%p encoding_APDU encoding OK", c);
1334     return 0;
1335 }
1336
1337 static zoom_ret send_APDU(ZOOM_connection c, Z_APDU *a)
1338 {
1339     ZOOM_Event event;
1340     assert(a);
1341     if (encode_APDU(c, a, c->odr_out))
1342         return zoom_complete;
1343     yaz_log(log_details, "%p send APDU type=%d", c, a->which);
1344     c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0);
1345     event = ZOOM_Event_create(ZOOM_EVENT_SEND_APDU);
1346     ZOOM_connection_put_event(c, event);
1347     odr_reset(c->odr_out);
1348     return do_write(c);
1349 }
1350
1351 /* returns 1 if PDU was sent OK (still pending )
1352    0 if PDU was not sent OK (nothing to wait for) 
1353 */
1354
1355 static zoom_ret ZOOM_connection_send_init(ZOOM_connection c)
1356 {
1357     Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_initRequest);
1358     Z_InitRequest *ireq = apdu->u.initRequest;
1359     Z_IdAuthentication *auth = (Z_IdAuthentication *)
1360         odr_malloc(c->odr_out, sizeof(*auth));
1361
1362     ODR_MASK_SET(ireq->options, Z_Options_search);
1363     ODR_MASK_SET(ireq->options, Z_Options_present);
1364     ODR_MASK_SET(ireq->options, Z_Options_scan);
1365     ODR_MASK_SET(ireq->options, Z_Options_sort);
1366     ODR_MASK_SET(ireq->options, Z_Options_extendedServices);
1367     ODR_MASK_SET(ireq->options, Z_Options_namedResultSets);
1368     
1369     ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_1);
1370     ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_2);
1371     ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_3);
1372     
1373     ireq->implementationId =
1374         odr_prepend(c->odr_out,
1375                     ZOOM_options_get(c->options, "implementationId"),
1376                     ireq->implementationId);
1377     
1378     ireq->implementationName = 
1379         odr_prepend(c->odr_out,
1380                     ZOOM_options_get(c->options, "implementationName"),
1381                     odr_prepend(c->odr_out, "ZOOM-C",
1382                                 ireq->implementationName));
1383     
1384     ireq->implementationVersion = 
1385         odr_prepend(c->odr_out,
1386                     ZOOM_options_get(c->options, "implementationVersion"),
1387                                 ireq->implementationVersion);
1388     
1389     *ireq->maximumRecordSize = c->maximum_record_size;
1390     *ireq->preferredMessageSize = c->preferred_message_size;
1391     
1392     if (c->group || c->password)
1393     {
1394         Z_IdPass *pass = (Z_IdPass *) odr_malloc(c->odr_out, sizeof(*pass));
1395         pass->groupId = odr_strdup_null(c->odr_out, c->group);
1396         pass->userId = odr_strdup_null(c->odr_out, c->user);
1397         pass->password = odr_strdup_null(c->odr_out, c->password);
1398         auth->which = Z_IdAuthentication_idPass;
1399         auth->u.idPass = pass;
1400         ireq->idAuthentication = auth;
1401     }
1402     else if (c->user)
1403     {
1404         auth->which = Z_IdAuthentication_open;
1405         auth->u.open = odr_strdup(c->odr_out, c->user);
1406         ireq->idAuthentication = auth;
1407     }
1408     if (c->proxy)
1409     {
1410         yaz_oi_set_string_oid(&ireq->otherInfo, c->odr_out,
1411                               yaz_oid_userinfo_proxy, 1, c->host_port);
1412     }
1413     if (c->charset || c->lang)
1414     {
1415         Z_OtherInformation **oi;
1416         Z_OtherInformationUnit *oi_unit;
1417         
1418         yaz_oi_APDU(apdu, &oi);
1419         
1420         if ((oi_unit = yaz_oi_update(oi, c->odr_out, NULL, 0, 0)))
1421         {
1422             ODR_MASK_SET(ireq->options, Z_Options_negotiationModel);
1423             oi_unit->which = Z_OtherInfo_externallyDefinedInfo;
1424             oi_unit->information.externallyDefinedInfo =
1425                 yaz_set_proposal_charneg_list(c->odr_out, " ",
1426                                               c->charset, c->lang, 1);
1427         }
1428     }
1429     assert(apdu);
1430     return send_APDU(c, apdu);
1431 }
1432
1433 #if YAZ_HAVE_XML2
1434 static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr)
1435 {
1436     Z_GDU *gdu;
1437     ZOOM_Event event;
1438     const char *database =  ZOOM_options_get(c->options, "databaseName");
1439     char *fdatabase = 0;
1440     
1441     if (database)
1442     {
1443         fdatabase = (char *) odr_malloc(c->odr_out, strlen(database)+2);
1444         strcpy(fdatabase, "/");
1445         strcat(fdatabase, database);
1446     }
1447     gdu = z_get_HTTP_Request_host_path(c->odr_out, c->host_port,
1448                                        fdatabase ? fdatabase : c->path);
1449
1450     if (c->sru_mode == zoom_sru_get)
1451     {
1452         yaz_sru_get_encode(gdu->u.HTTP_Request, sr, c->odr_out, c->charset);
1453     }
1454     else if (c->sru_mode == zoom_sru_post)
1455     {
1456         yaz_sru_post_encode(gdu->u.HTTP_Request, sr, c->odr_out, c->charset);
1457     }
1458     else if (c->sru_mode == zoom_sru_soap)
1459     {
1460         yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, c->odr_out, c->charset);
1461     }
1462     if (!z_GDU(c->odr_out, &gdu, 0, 0))
1463         return zoom_complete;
1464     if (c->odr_print)
1465         z_GDU(c->odr_print, &gdu, 0, 0);
1466     c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0);
1467         
1468     event = ZOOM_Event_create(ZOOM_EVENT_SEND_APDU);
1469     ZOOM_connection_put_event(c, event);
1470     odr_reset(c->odr_out);
1471     return do_write(c);
1472 }
1473 #endif
1474
1475 #if YAZ_HAVE_XML2
1476 static Z_SRW_PDU *ZOOM_srw_get_pdu(ZOOM_connection c, int type)
1477 {
1478     Z_SRW_PDU *sr = yaz_srw_get_pdu(c->odr_out, type, c->sru_version);
1479     sr->username = c->user;
1480     sr->password = c->password;
1481     return sr;
1482 }
1483 #endif
1484
1485 #if YAZ_HAVE_XML2
1486 static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
1487 {
1488     int i;
1489     int *start, *count;
1490     ZOOM_resultset resultset = 0;
1491     Z_SRW_PDU *sr = 0;
1492     const char *option_val = 0;
1493
1494     if (c->error)                  /* don't continue on error */
1495         return zoom_complete;
1496     assert(c->tasks);
1497     switch(c->tasks->which)
1498     {
1499     case ZOOM_TASK_SEARCH:
1500         resultset = c->tasks->u.search.resultset;
1501         if (!resultset->setname)
1502             resultset->setname = xstrdup("default");
1503         ZOOM_options_set(resultset->options, "setname", resultset->setname);
1504         start = &c->tasks->u.search.start;
1505         count = &c->tasks->u.search.count;
1506         break;
1507     case ZOOM_TASK_RETRIEVE:
1508         resultset = c->tasks->u.retrieve.resultset;
1509
1510         start = &c->tasks->u.retrieve.start;
1511         count = &c->tasks->u.retrieve.count;
1512
1513         if (*start >= resultset->size)
1514             return zoom_complete;
1515         if (*start + *count > resultset->size)
1516             *count = resultset->size - *start;
1517
1518         for (i = 0; i < *count; i++)
1519         {
1520             ZOOM_record rec =
1521                 record_cache_lookup(resultset, i + *start,
1522                                     c->tasks->u.retrieve.syntax,
1523                                     c->tasks->u.retrieve.elementSetName);
1524             if (!rec)
1525                 break;
1526             else
1527             {
1528                 ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD);
1529                 ZOOM_connection_put_event(c, event);
1530             }
1531         }
1532         *start += i;
1533         *count -= i;
1534
1535         if (*count == 0)
1536             return zoom_complete;
1537         break;
1538     default:
1539         return zoom_complete;
1540     }
1541     assert(resultset->query);
1542         
1543     sr = ZOOM_srw_get_pdu(c, Z_SRW_searchRetrieve_request);
1544     if (resultset->query->z_query->which == Z_Query_type_104
1545         && resultset->query->z_query->u.type_104->which == Z_External_CQL)
1546     {
1547         sr->u.request->query_type = Z_SRW_query_type_cql;
1548         sr->u.request->query.cql =resultset->query->z_query->u.type_104->u.cql;
1549     }
1550     else if (resultset->query->z_query->which == Z_Query_type_1 &&
1551              resultset->query->z_query->u.type_1)
1552     {
1553         sr->u.request->query_type = Z_SRW_query_type_pqf;
1554         sr->u.request->query.pqf = resultset->query->query_string;
1555     }
1556     else
1557     {
1558         set_ZOOM_error(c, ZOOM_ERROR_UNSUPPORTED_QUERY, 0);
1559         return zoom_complete;
1560     }
1561     sr->u.request->startRecord = odr_intdup(c->odr_out, *start + 1);
1562     sr->u.request->maximumRecords = odr_intdup(
1563         c->odr_out, (resultset->step > 0 && resultset->step < *count) ? 
1564         resultset->step : *count);
1565     sr->u.request->recordSchema = resultset->schema;
1566     
1567     option_val = ZOOM_resultset_option_get(resultset, "recordPacking");
1568     if (option_val)
1569         sr->u.request->recordPacking = odr_strdup(c->odr_out, option_val);
1570
1571     option_val = ZOOM_resultset_option_get(resultset, "extraArgs");
1572     yaz_encode_sru_extra(sr, c->odr_out, option_val);
1573     return send_srw(c, sr);
1574 }
1575 #else
1576 static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
1577 {
1578     return zoom_complete;
1579 }
1580 #endif
1581
1582 static zoom_ret ZOOM_connection_send_search(ZOOM_connection c)
1583 {
1584     ZOOM_resultset r;
1585     int lslb, ssub, mspn;
1586     const char *syntax;
1587     Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_searchRequest);
1588     Z_SearchRequest *search_req = apdu->u.searchRequest;
1589     const char *elementSetName;
1590     const char *smallSetElementSetName;
1591     const char *mediumSetElementSetName;
1592
1593     assert(c->tasks);
1594     assert(c->tasks->which == ZOOM_TASK_SEARCH);
1595
1596     r = c->tasks->u.search.resultset;
1597
1598     yaz_log(log_details, "%p ZOOM_connection_send_search set=%p", c, r);
1599
1600     elementSetName =
1601         ZOOM_options_get(r->options, "elementSetName");
1602     smallSetElementSetName  =
1603         ZOOM_options_get(r->options, "smallSetElementSetName");
1604     mediumSetElementSetName =
1605         ZOOM_options_get(r->options, "mediumSetElementSetName");
1606
1607     if (!smallSetElementSetName)
1608         smallSetElementSetName = elementSetName;
1609
1610     if (!mediumSetElementSetName)
1611         mediumSetElementSetName = elementSetName;
1612
1613     assert(r);
1614     assert(r->query);
1615
1616     /* prepare query for the search request */
1617     search_req->query = r->query->z_query;
1618     if (!search_req->query)
1619     {
1620         set_ZOOM_error(c, ZOOM_ERROR_INVALID_QUERY, 0);
1621         return zoom_complete;
1622     }
1623     if (r->query->z_query->which == Z_Query_type_1 || 
1624         r->query->z_query->which == Z_Query_type_101)
1625     {
1626         const char *cp = ZOOM_options_get(r->options, "rpnCharset");
1627         if (cp)
1628         {
1629             yaz_iconv_t cd = yaz_iconv_open(cp, "UTF-8");
1630             if (cd)
1631             {
1632                 search_req->query = yaz_copy_Z_Query(search_req->query,
1633                                                      c->odr_out);
1634                 
1635                 yaz_query_charset_convert_rpnquery(search_req->query->u.type_1,
1636                                                    c->odr_out, cd);
1637                 yaz_iconv_close(cd);
1638             }
1639         }
1640     }
1641     search_req->databaseNames = r->databaseNames;
1642     search_req->num_databaseNames = r->num_databaseNames;
1643
1644     /* get syntax (no need to provide unless piggyback is in effect) */
1645     syntax = c->tasks->u.search.syntax;
1646
1647     lslb = ZOOM_options_get_int(r->options, "largeSetLowerBound", -1);
1648     ssub = ZOOM_options_get_int(r->options, "smallSetUpperBound", -1);
1649     mspn = ZOOM_options_get_int(r->options, "mediumSetPresentNumber", -1);
1650     if (lslb != -1 && ssub != -1 && mspn != -1)
1651     {
1652         /* So're a Z39.50 expert? Let's hope you don't do sort */
1653         *search_req->largeSetLowerBound = lslb;
1654         *search_req->smallSetUpperBound = ssub;
1655         *search_req->mediumSetPresentNumber = mspn;
1656     }
1657     else if (c->tasks->u.search.start == 0 && c->tasks->u.search.count > 0
1658              && r->piggyback && !r->r_sort_spec && !r->schema)
1659     {
1660         /* Regular piggyback - do it unless we're going to do sort */
1661         *search_req->largeSetLowerBound = 2000000000;
1662         *search_req->smallSetUpperBound = 1;
1663         *search_req->mediumSetPresentNumber = 
1664             r->step>0 ? r->step : c->tasks->u.search.count;
1665     }
1666     else
1667     {
1668         /* non-piggyback. Need not provide elementsets or syntaxes .. */
1669         smallSetElementSetName = 0;
1670         mediumSetElementSetName = 0;
1671         syntax = 0;
1672     }
1673     if (smallSetElementSetName && *smallSetElementSetName)
1674     {
1675         Z_ElementSetNames *esn = (Z_ElementSetNames *)
1676             odr_malloc(c->odr_out, sizeof(*esn));
1677         
1678         esn->which = Z_ElementSetNames_generic;
1679         esn->u.generic = odr_strdup(c->odr_out, smallSetElementSetName);
1680         search_req->smallSetElementSetNames = esn;
1681     }
1682     if (mediumSetElementSetName && *mediumSetElementSetName)
1683     {
1684         Z_ElementSetNames *esn =(Z_ElementSetNames *)
1685             odr_malloc(c->odr_out, sizeof(*esn));
1686         
1687         esn->which = Z_ElementSetNames_generic;
1688         esn->u.generic = odr_strdup(c->odr_out, mediumSetElementSetName);
1689         search_req->mediumSetElementSetNames = esn;
1690     }
1691     if (syntax)
1692         search_req->preferredRecordSyntax =
1693             zoom_yaz_str_to_z3950oid(c, CLASS_RECSYN, syntax);
1694     
1695     if (!r->setname)
1696     {
1697         if (c->support_named_resultsets)
1698         {
1699             char setname[14];
1700             int ord;
1701             /* find the lowest unused ordinal so that we re-use
1702                result sets on the server. */
1703             for (ord = 1; ; ord++)
1704             {
1705                 ZOOM_resultset rp;
1706                 sprintf(setname, "%d", ord);
1707                 for (rp = c->resultsets; rp; rp = rp->next)
1708                     if (rp->setname && !strcmp(rp->setname, setname))
1709                         break;
1710                 if (!rp)
1711                     break;
1712             }
1713             r->setname = xstrdup(setname);
1714             yaz_log(log_details, "%p ZOOM_connection_send_search: allocating "
1715                     "set %s", c, r->setname);
1716         }
1717         else
1718         {
1719             yaz_log(log_details, "%p ZOOM_connection_send_search: using "
1720                     "default set", c);
1721             r->setname = xstrdup("default");
1722         }
1723         ZOOM_options_set(r->options, "setname", r->setname);
1724     }
1725     search_req->resultSetName = odr_strdup(c->odr_out, r->setname);
1726     return send_APDU(c, apdu);
1727 }
1728
1729 static void response_default_diag(ZOOM_connection c, Z_DefaultDiagFormat *r)
1730 {
1731     char oid_name_buf[OID_STR_MAX];
1732     const char *oid_name;
1733     char *addinfo = 0;
1734
1735     oid_name = yaz_oid_to_string_buf(r->diagnosticSetId, 0, oid_name_buf);
1736     switch (r->which)
1737     {
1738     case Z_DefaultDiagFormat_v2Addinfo:
1739         addinfo = r->u.v2Addinfo;
1740         break;
1741     case Z_DefaultDiagFormat_v3Addinfo:
1742         addinfo = r->u.v3Addinfo;
1743         break;
1744     }
1745     xfree(c->addinfo);
1746     c->addinfo = 0;
1747     set_dset_error(c, *r->condition, oid_name, addinfo, 0);
1748 }
1749
1750 static void response_diag(ZOOM_connection c, Z_DiagRec *p)
1751 {
1752     if (p->which != Z_DiagRec_defaultFormat)
1753         set_ZOOM_error(c, ZOOM_ERROR_DECODE, 0);
1754     else
1755         response_default_diag(c, p->u.defaultFormat);
1756 }
1757
1758 ZOOM_API(ZOOM_record)
1759     ZOOM_record_clone(ZOOM_record srec)
1760 {
1761     char *buf;
1762     int size;
1763     ODR odr_enc;
1764     ZOOM_record nrec;
1765
1766     odr_enc = odr_createmem(ODR_ENCODE);
1767     if (!z_NamePlusRecord(odr_enc, &srec->npr, 0, 0))
1768         return 0;
1769     buf = odr_getbuf(odr_enc, &size, 0);
1770     
1771     nrec = (ZOOM_record) xmalloc(sizeof(*nrec));
1772     nrec->odr = odr_createmem(ODR_DECODE);
1773     nrec->wrbuf = 0;
1774     odr_setbuf(nrec->odr, buf, size, 0);
1775     z_NamePlusRecord(nrec->odr, &nrec->npr, 0, 0);
1776     
1777     nrec->schema = odr_strdup_null(nrec->odr, srec->schema);
1778     nrec->diag_uri = odr_strdup_null(nrec->odr, srec->diag_uri);
1779     nrec->diag_message = odr_strdup_null(nrec->odr, srec->diag_message);
1780     nrec->diag_details = odr_strdup_null(nrec->odr, srec->diag_details);
1781     nrec->diag_set = odr_strdup_null(nrec->odr, srec->diag_set);
1782     odr_destroy(odr_enc);
1783     return nrec;
1784 }
1785
1786 ZOOM_API(ZOOM_record)
1787     ZOOM_resultset_record_immediate(ZOOM_resultset s,size_t pos)
1788 {
1789     const char *syntax =
1790         ZOOM_options_get(s->options, "preferredRecordSyntax"); 
1791     const char *elementSetName =
1792         ZOOM_options_get(s->options, "elementSetName");
1793
1794     return record_cache_lookup(s, pos, syntax, elementSetName);
1795 }
1796
1797 ZOOM_API(ZOOM_record)
1798     ZOOM_resultset_record(ZOOM_resultset r, size_t pos)
1799 {
1800     ZOOM_record rec = ZOOM_resultset_record_immediate(r, pos);
1801
1802     if (!rec)
1803     {
1804         /*
1805          * MIKE: I think force_sync should always be zero, but I don't
1806          * want to make this change until I get the go-ahead from
1807          * Adam, in case something depends on the old synchronous
1808          * behaviour.
1809          */
1810         int force_sync = 1;
1811         if (getenv("ZOOM_RECORD_NO_FORCE_SYNC")) force_sync = 0;
1812         ZOOM_resultset_retrieve(r, force_sync, pos, 1);
1813         rec = ZOOM_resultset_record_immediate(r, pos);
1814     }
1815     return rec;
1816 }
1817
1818 ZOOM_API(void)
1819     ZOOM_record_destroy(ZOOM_record rec)
1820 {
1821     if (!rec)
1822         return;
1823     if (rec->wrbuf)
1824         wrbuf_destroy(rec->wrbuf);
1825     odr_destroy(rec->odr);
1826     xfree(rec);
1827 }
1828
1829
1830 static yaz_iconv_t iconv_create_charset(const char *record_charset)
1831 {
1832     char to[40];
1833     char from[40];
1834     yaz_iconv_t cd = 0;
1835
1836     *from = '\0';
1837     strcpy(to, "UTF-8");
1838     if (record_charset && *record_charset)
1839     {
1840         /* Use "from,to" or just "from" */
1841         const char *cp = strchr(record_charset, ',');
1842         int clen = strlen(record_charset);
1843         if (cp && cp[1])
1844         {
1845             strncpy( to, cp+1, sizeof(to)-1);
1846             to[sizeof(to)-1] = '\0';
1847             clen = cp - record_charset;
1848         }
1849         if (clen > sizeof(from)-1)
1850             clen = sizeof(from)-1;
1851         
1852         if (clen)
1853             strncpy(from, record_charset, clen);
1854         from[clen] = '\0';
1855     }
1856     if (*from && *to)
1857         cd = yaz_iconv_open(to, from);
1858     return cd;
1859 }
1860
1861 static const char *return_marc_record(ZOOM_record rec, int marc_type,
1862                                       int *len,
1863                                       const char *buf, int sz,
1864                                       const char *record_charset)
1865 {
1866     yaz_iconv_t cd = iconv_create_charset(record_charset);
1867     yaz_marc_t mt = yaz_marc_create();
1868     const char *ret_string = 0;
1869
1870     if (cd)
1871         yaz_marc_iconv(mt, cd);
1872     yaz_marc_xml(mt, marc_type);
1873     if (!rec->wrbuf)
1874         rec->wrbuf = wrbuf_alloc();
1875     wrbuf_rewind(rec->wrbuf);
1876     if (yaz_marc_decode_wrbuf(mt, buf, sz, rec->wrbuf) > 0)
1877     {
1878         if (len)
1879             *len = wrbuf_len(rec->wrbuf);
1880         ret_string = wrbuf_cstr(rec->wrbuf);
1881     }
1882     yaz_marc_destroy(mt);
1883     if (cd)
1884         yaz_iconv_close(cd);
1885     return ret_string;
1886 }
1887
1888 static const char *return_opac_record(ZOOM_record rec, int marc_type,
1889                                       int *len,
1890                                       Z_OPACRecord *opac_rec,
1891                                       const char *record_charset)
1892 {
1893     yaz_iconv_t cd = iconv_create_charset(record_charset);
1894     yaz_marc_t mt = yaz_marc_create();
1895
1896     if (cd)
1897         yaz_marc_iconv(mt, cd);
1898     yaz_marc_xml(mt, marc_type);
1899
1900     if (!rec->wrbuf)
1901         rec->wrbuf = wrbuf_alloc();
1902     wrbuf_rewind(rec->wrbuf);
1903
1904     yaz_opac_decode_wrbuf(mt, opac_rec, rec->wrbuf);
1905     yaz_marc_destroy(mt);
1906
1907     if (cd)
1908         yaz_iconv_close(cd);
1909     if (len)
1910         *len = wrbuf_len(rec->wrbuf);
1911     return wrbuf_cstr(rec->wrbuf);
1912 }
1913
1914 static const char *return_string_record(ZOOM_record rec, int *len,
1915                                         const char *buf, int sz,
1916                                         const char *record_charset)
1917 {
1918     yaz_iconv_t cd = iconv_create_charset(record_charset);
1919
1920     if (cd)
1921     {
1922         if (!rec->wrbuf)
1923             rec->wrbuf = wrbuf_alloc();
1924
1925         wrbuf_rewind(rec->wrbuf);
1926
1927         wrbuf_iconv_write(rec->wrbuf, cd, buf, sz);
1928         wrbuf_iconv_reset(rec->wrbuf, cd);
1929
1930         buf = wrbuf_cstr(rec->wrbuf);
1931         sz = wrbuf_len(rec->wrbuf);
1932         yaz_iconv_close(cd);
1933     }
1934     if (len)
1935         *len = sz;
1936     return buf;
1937 }
1938
1939 static const char *return_record(ZOOM_record rec, int *len,
1940                                  Z_NamePlusRecord *npr,
1941                                  int marctype, const char *charset)
1942 {
1943     Z_External *r = (Z_External *) npr->u.databaseRecord;
1944     const Odr_oid *oid = r->direct_reference;
1945     
1946     /* render bibliographic record .. */
1947     if (r->which == Z_External_OPAC)
1948     {
1949         return return_opac_record(rec, marctype, len,
1950                                   r->u.opac, charset);
1951     }
1952     if (r->which == Z_External_sutrs)
1953         return return_string_record(rec, len,
1954                                     (char*) r->u.sutrs->buf,
1955                                     r->u.sutrs->len,
1956                                     charset);
1957     else if (r->which == Z_External_octet)
1958     {
1959         if (yaz_oid_is_iso2709(oid))
1960         {
1961             const char *ret_buf = return_marc_record(
1962                 rec, marctype, len,
1963                 (const char *) r->u.octet_aligned->buf,
1964                 r->u.octet_aligned->len,
1965                 charset);
1966             if (ret_buf)
1967                 return ret_buf;
1968         }
1969         return return_string_record(rec, len,
1970                                     (const char *) r->u.octet_aligned->buf,
1971                                     r->u.octet_aligned->len,
1972                                     charset);
1973     }
1974     else if (r->which == Z_External_grs1)
1975     {
1976         if (!rec->wrbuf)
1977             rec->wrbuf = wrbuf_alloc();
1978         wrbuf_rewind(rec->wrbuf);
1979         yaz_display_grs1(rec->wrbuf, r->u.grs1, 0);
1980         return return_string_record(rec, len,
1981                                     wrbuf_buf(rec->wrbuf),
1982                                     wrbuf_len(rec->wrbuf),
1983                                     charset);
1984     }
1985     return 0;
1986 }
1987     
1988
1989 ZOOM_API(int)
1990     ZOOM_record_error(ZOOM_record rec, const char **cp,
1991                       const char **addinfo, const char **diagset)
1992 {
1993     Z_NamePlusRecord *npr;
1994     
1995     if (!rec)
1996         return 0;
1997
1998     npr = rec->npr;
1999     if (rec->diag_uri)
2000     {
2001         if (cp)
2002             *cp = rec->diag_message;
2003         if (addinfo)
2004             *addinfo = rec->diag_details;
2005         if (diagset)
2006             *diagset = rec->diag_set;
2007         return uri_to_code(rec->diag_uri);
2008     }
2009     if (npr && npr->which == Z_NamePlusRecord_surrogateDiagnostic)
2010     {
2011         Z_DiagRec *diag_rec = npr->u.surrogateDiagnostic;
2012         int error = YAZ_BIB1_UNSPECIFIED_ERROR;
2013         const char *add = 0;
2014
2015         if (diag_rec->which == Z_DiagRec_defaultFormat)
2016         {
2017             Z_DefaultDiagFormat *ddf = diag_rec->u.defaultFormat;
2018             oid_class oclass;
2019     
2020             error = *ddf->condition;
2021             switch (ddf->which)
2022             {
2023             case Z_DefaultDiagFormat_v2Addinfo:
2024                 add = ddf->u.v2Addinfo;
2025                 break;
2026             case Z_DefaultDiagFormat_v3Addinfo:
2027                 add = ddf->u.v3Addinfo;
2028                 break;
2029             }
2030             if (diagset)
2031                 *diagset =
2032                     yaz_oid_to_string(yaz_oid_std(),
2033                                       ddf->diagnosticSetId, &oclass);
2034         }
2035         else
2036         {
2037             if (diagset)
2038                 *diagset = "Bib-1";
2039         }
2040         if (addinfo)
2041             *addinfo = add ? add : "";
2042         if (cp)
2043             *cp = diagbib1_str(error);
2044         return error;
2045     }
2046     return 0;
2047 }
2048
2049 ZOOM_API(const char *)
2050     ZOOM_record_get(ZOOM_record rec, const char *type_spec, int *len)
2051 {
2052     char type[40];
2053     char charset[40];
2054     char xpath[512];
2055     const char *cp;
2056     int i;
2057     Z_NamePlusRecord *npr;
2058     
2059     if (len)
2060         *len = 0; /* default return */
2061         
2062     if (!rec)
2063         return 0;
2064     npr = rec->npr;
2065     if (!npr)
2066         return 0;
2067
2068     cp = type_spec;
2069     for (i = 0; cp[i] && i < sizeof(type)-1; i++)
2070     {
2071         if (cp[i] == ';' || cp[i] == ' ')
2072             break;
2073         type[i] = cp[i];
2074     }
2075     type[i] = '\0';
2076     charset[0] = '\0';
2077     while (type_spec[i] == ';')
2078     {
2079         i++;
2080         while (type_spec[i] == ' ')
2081             i++;
2082         if (!strncmp(type_spec+i, "charset=", 8))
2083         {
2084             int j = 0;
2085             i = i + 8; /* skip charset= */
2086             for (j = 0; type_spec[i]  && j < sizeof(charset)-1; i++, j++)
2087             {
2088                 if (type_spec[i] == ';' || type_spec[i] == ' ')
2089                     break;
2090                 charset[j] = cp[i];
2091             }
2092             charset[j] = '\0';
2093         }
2094         else if (!strncmp(type_spec+i, "xpath=", 6))
2095         {
2096             int j = 0; 
2097             i = i + 6;
2098             for (j = 0; type_spec[i] && j < sizeof(xpath)-1; i++, j++)
2099                 xpath[j] = cp[i];
2100             xpath[j] = '\0';
2101         } 
2102         while (type_spec[i] == ' ')
2103             i++;
2104     }
2105     if (!strcmp(type, "database"))
2106     {
2107         if (len)
2108             *len = (npr->databaseName ? strlen(npr->databaseName) : 0);
2109         return npr->databaseName;
2110     }
2111     else if (!strcmp(type, "schema"))
2112     {
2113         if (len)
2114             *len = rec->schema ? strlen(rec->schema) : 0;
2115         return rec->schema;
2116     }
2117     else if (!strcmp(type, "syntax"))
2118     {
2119         const char *desc = 0;   
2120         if (npr->which == Z_NamePlusRecord_databaseRecord)
2121         {
2122             Z_External *r = (Z_External *) npr->u.databaseRecord;
2123             desc = yaz_oid_to_string(yaz_oid_std(), r->direct_reference, 0);
2124         }
2125         if (!desc)
2126             desc = "none";
2127         if (len)
2128             *len = strlen(desc);
2129         return desc;
2130     }
2131     if (npr->which != Z_NamePlusRecord_databaseRecord)
2132         return 0;
2133
2134     /* from now on - we have a database record .. */
2135     if (!strcmp(type, "render"))
2136     {
2137         return return_record(rec, len, npr, YAZ_MARC_LINE, charset);
2138     }
2139     else if (!strcmp(type, "xml"))
2140     {
2141         return return_record(rec, len, npr, YAZ_MARC_MARCXML, charset);
2142     }
2143     else if (!strcmp(type, "raw"))
2144     {
2145         return return_record(rec, len, npr, YAZ_MARC_ISO2709, charset);
2146     }
2147     else if (!strcmp(type, "ext"))
2148     {
2149         if (len) *len = -1;
2150         return (const char *) npr->u.databaseRecord;
2151     }
2152     else if (!strcmp(type, "opac"))
2153     {
2154         if (npr->u.databaseRecord->which == Z_External_OPAC)
2155             return return_record(rec, len, npr, YAZ_MARC_MARCXML, charset);
2156     }
2157     return 0;
2158 }
2159
2160 static int strcmp_null(const char *v1, const char *v2)
2161 {
2162     if (!v1 && !v2)
2163         return 0;
2164     if (!v1 || !v2)
2165         return -1;
2166     return strcmp(v1, v2);
2167 }
2168
2169 static size_t record_hash(int pos)
2170 {
2171     if (pos < 0)
2172         pos = 0;
2173     return pos % RECORD_HASH_SIZE;
2174 }
2175
2176 static void record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr, 
2177                              int pos,
2178                              const char *syntax, const char *elementSetName,
2179                              const char *schema,
2180                              Z_SRW_diagnostic *diag)
2181 {
2182     ZOOM_record_cache rc = 0;
2183     
2184     ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD);
2185     ZOOM_connection_put_event(r->connection, event);
2186
2187     for (rc = r->record_hash[record_hash(pos)]; rc; rc = rc->next)
2188     {
2189         if (pos == rc->pos 
2190             && strcmp_null(r->schema, rc->schema) == 0
2191             && strcmp_null(elementSetName,rc->elementSetName) == 0
2192             && strcmp_null(syntax, rc->syntax) == 0)
2193             break;
2194     }
2195     if (!rc)
2196     {
2197         rc = (ZOOM_record_cache) odr_malloc(r->odr, sizeof(*rc));
2198         rc->rec.odr = 0;
2199         rc->rec.wrbuf = 0;
2200         rc->elementSetName = odr_strdup_null(r->odr, elementSetName);
2201         
2202         rc->syntax = odr_strdup_null(r->odr, syntax);
2203         
2204         rc->schema = odr_strdup_null(r->odr, r->schema);
2205
2206         rc->pos = pos;
2207         rc->next = r->record_hash[record_hash(pos)];
2208         r->record_hash[record_hash(pos)] = rc;
2209     }
2210     rc->rec.npr = npr;
2211     rc->rec.schema = odr_strdup_null(r->odr, schema);
2212     rc->rec.diag_set = 0;
2213     rc->rec.diag_uri = 0;
2214     rc->rec.diag_message = 0;
2215     rc->rec.diag_details = 0;
2216     if (diag)
2217     {
2218         if (diag->uri)
2219         {
2220             char *cp;
2221             rc->rec.diag_set = odr_strdup(r->odr, diag->uri);
2222             if ((cp = strrchr(rc->rec.diag_set, '/')))
2223                 *cp = '\0';
2224             rc->rec.diag_uri = odr_strdup(r->odr, diag->uri);
2225         }
2226         rc->rec.diag_message = odr_strdup_null(r->odr, diag->message);            
2227         rc->rec.diag_details = odr_strdup_null(r->odr, diag->details);
2228     }
2229 }
2230
2231 static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos,
2232                                        const char *syntax,
2233                                        const char *elementSetName)
2234 {
2235     ZOOM_record_cache rc;
2236     
2237     for (rc = r->record_hash[record_hash(pos)]; rc; rc = rc->next)
2238     {
2239         if (pos == rc->pos)
2240         {
2241             if (strcmp_null(r->schema, rc->schema))
2242                 continue;
2243             if (strcmp_null(elementSetName,rc->elementSetName))
2244                 continue;
2245             if (strcmp_null(syntax, rc->syntax))
2246                 continue;
2247             return &rc->rec;
2248         }
2249     }
2250     return 0;
2251 }
2252                                              
2253 static void handle_records(ZOOM_connection c, Z_Records *sr,
2254                            int present_phase)
2255 {
2256     ZOOM_resultset resultset;
2257     int *start, *count;
2258     const char *syntax = 0, *elementSetName = 0;
2259
2260     if (!c->tasks)
2261         return ;
2262     switch (c->tasks->which)
2263     {
2264     case ZOOM_TASK_SEARCH:
2265         resultset = c->tasks->u.search.resultset;
2266         start = &c->tasks->u.search.start;
2267         count = &c->tasks->u.search.count;
2268         syntax = c->tasks->u.search.syntax;
2269         elementSetName = c->tasks->u.search.elementSetName;
2270         break;
2271     case ZOOM_TASK_RETRIEVE:
2272         resultset = c->tasks->u.retrieve.resultset;        
2273         start = &c->tasks->u.retrieve.start;
2274         count = &c->tasks->u.retrieve.count;
2275         syntax = c->tasks->u.retrieve.syntax;
2276         elementSetName = c->tasks->u.retrieve.elementSetName;
2277         break;
2278     default:
2279         return;
2280     }
2281     if (sr && sr->which == Z_Records_NSD)
2282         response_default_diag(c, sr->u.nonSurrogateDiagnostic);
2283     else if (sr && sr->which == Z_Records_multipleNSD)
2284     {
2285         if (sr->u.multipleNonSurDiagnostics->num_diagRecs >= 1)
2286             response_diag(c, sr->u.multipleNonSurDiagnostics->diagRecs[0]);
2287         else
2288             set_ZOOM_error(c, ZOOM_ERROR_DECODE, 0);
2289     }
2290     else 
2291     {
2292         if (*count + *start > resultset->size)
2293             *count = resultset->size - *start;
2294         if (*count < 0)
2295             *count = 0;
2296         if (sr && sr->which == Z_Records_DBOSD)
2297         {
2298             int i;
2299             NMEM nmem = odr_extract_mem(c->odr_in);
2300             Z_NamePlusRecordList *p =
2301                 sr->u.databaseOrSurDiagnostics;
2302             for (i = 0; i<p->num_records; i++)
2303             {
2304                 record_cache_add(resultset, p->records[i], i + *start,
2305                                  syntax, elementSetName,
2306                                  elementSetName, 0);
2307             }
2308             *count -= i;
2309             if (*count < 0)
2310                 *count = 0;
2311             *start += i;
2312             yaz_log(log_details, 
2313                     "handle_records resultset=%p start=%d count=%d",
2314                     resultset, *start, *count);
2315
2316             /* transfer our response to search_nmem .. we need it later */
2317             nmem_transfer(odr_getmem(resultset->odr), nmem);
2318             nmem_destroy(nmem);
2319             if (present_phase && p->num_records == 0)
2320             {
2321                 /* present response and we didn't get any records! */
2322                 Z_NamePlusRecord *myrec = 
2323                     zget_surrogateDiagRec(resultset->odr, 0, 14, 0);
2324                 record_cache_add(resultset, myrec, *start,
2325                                  syntax, elementSetName, 0, 0);
2326             }
2327         }
2328         else if (present_phase)
2329         {
2330             /* present response and we didn't get any records! */
2331             Z_NamePlusRecord *myrec = 
2332                 zget_surrogateDiagRec(resultset->odr, 0, 14, 0);
2333             record_cache_add(resultset, myrec, *start, syntax, elementSetName,
2334                              0, 0);
2335         }
2336     }
2337 }
2338
2339 static void handle_present_response(ZOOM_connection c, Z_PresentResponse *pr)
2340 {
2341     handle_records(c, pr->records, 1);
2342 }
2343
2344 static void handle_queryExpressionTerm(ZOOM_options opt, const char *name,
2345                                        Z_Term *term)
2346 {
2347     switch (term->which)
2348     {
2349     case Z_Term_general:
2350         ZOOM_options_setl(opt, name,
2351                           (const char *)(term->u.general->buf), 
2352                           term->u.general->len);
2353         break;
2354     case Z_Term_characterString:
2355         ZOOM_options_set(opt, name, term->u.characterString);
2356         break;
2357     case Z_Term_numeric:
2358         ZOOM_options_set_int(opt, name, *term->u.numeric);
2359         break;
2360     }
2361 }
2362
2363 static void handle_queryExpression(ZOOM_options opt, const char *name,
2364                                    Z_QueryExpression *exp)
2365 {
2366     char opt_name[80];
2367     
2368     switch (exp->which)
2369     {
2370     case Z_QueryExpression_term:
2371         if (exp->u.term && exp->u.term->queryTerm)
2372         {
2373             sprintf(opt_name, "%s.term", name);
2374             handle_queryExpressionTerm(opt, opt_name, exp->u.term->queryTerm);
2375         }
2376         break;
2377     case Z_QueryExpression_query:
2378         break;
2379     }
2380 }
2381
2382 static void handle_searchResult(ZOOM_connection c, ZOOM_resultset resultset,
2383                                 Z_OtherInformation *o)
2384 {
2385     int i;
2386     for (i = 0; o && i < o->num_elements; i++)
2387     {
2388         if (o->list[i]->which == Z_OtherInfo_externallyDefinedInfo)
2389         {
2390             Z_External *ext = o->list[i]->information.externallyDefinedInfo;
2391             
2392             if (ext->which == Z_External_searchResult1)
2393             {
2394                 int j;
2395                 Z_SearchInfoReport *sr = ext->u.searchResult1;
2396                 
2397                 if (sr->num)
2398                     ZOOM_options_set_int(
2399                         resultset->options, "searchresult.size", sr->num);
2400
2401                 for (j = 0; j < sr->num; j++)
2402                 {
2403                     Z_SearchInfoReport_s *ent =
2404                         ext->u.searchResult1->elements[j];
2405                     char pref[80];
2406                     
2407                     sprintf(pref, "searchresult.%d", j);
2408
2409                     if (ent->subqueryId)
2410                     {
2411                         char opt_name[80];
2412                         sprintf(opt_name, "%s.id", pref);
2413                         ZOOM_options_set(resultset->options, opt_name,
2414                                          ent->subqueryId);
2415                     }
2416                     if (ent->subqueryExpression)
2417                     {
2418                         char opt_name[80];
2419                         sprintf(opt_name, "%s.subquery", pref);
2420                         handle_queryExpression(resultset->options, opt_name,
2421                                                ent->subqueryExpression);
2422                     }
2423                     if (ent->subqueryInterpretation)
2424                     {
2425                         char opt_name[80];
2426                         sprintf(opt_name, "%s.interpretation", pref);
2427                         handle_queryExpression(resultset->options, opt_name,
2428                                                ent->subqueryInterpretation);
2429                     }
2430                     if (ent->subqueryRecommendation)
2431                     {
2432                         char opt_name[80];
2433                         sprintf(opt_name, "%s.recommendation", pref);
2434                         handle_queryExpression(resultset->options, opt_name,
2435                                                ent->subqueryRecommendation);
2436                     }
2437                     if (ent->subqueryCount)
2438                     {
2439                         char opt_name[80];
2440                         sprintf(opt_name, "%s.count", pref);
2441                         ZOOM_options_set_int(resultset->options, opt_name,
2442                                              *ent->subqueryCount);
2443                     }                                             
2444                 }
2445             }
2446         }
2447     }
2448 }
2449
2450 static void handle_search_response(ZOOM_connection c, Z_SearchResponse *sr)
2451 {
2452     ZOOM_resultset resultset;
2453     ZOOM_Event event;
2454
2455     if (!c->tasks || c->tasks->which != ZOOM_TASK_SEARCH)
2456         return ;
2457
2458     event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
2459     ZOOM_connection_put_event(c, event);
2460
2461     resultset = c->tasks->u.search.resultset;
2462
2463     if (sr->resultSetStatus)
2464     {
2465         ZOOM_options_set_int(resultset->options, "resultSetStatus",
2466                              *sr->resultSetStatus);
2467     }
2468     if (sr->presentStatus)
2469     {
2470         ZOOM_options_set_int(resultset->options, "presentStatus",
2471                              *sr->presentStatus);
2472     }
2473     handle_searchResult(c, resultset, sr->additionalSearchInfo);
2474
2475     resultset->size = *sr->resultCount;
2476     handle_records(c, sr->records, 0);
2477 }
2478
2479 static void sort_response(ZOOM_connection c, Z_SortResponse *res)
2480 {
2481     if (res->diagnostics && res->num_diagnostics > 0)
2482         response_diag(c, res->diagnostics[0]);
2483 }
2484
2485 static int scan_response(ZOOM_connection c, Z_ScanResponse *res)
2486 {
2487     NMEM nmem = odr_extract_mem(c->odr_in);
2488     ZOOM_scanset scan;
2489
2490     if (!c->tasks || c->tasks->which != ZOOM_TASK_SCAN)
2491         return 0;
2492     scan = c->tasks->u.scan.scan;
2493
2494     if (res->entries && res->entries->nonsurrogateDiagnostics)
2495         response_diag(c, res->entries->nonsurrogateDiagnostics[0]);
2496     scan->scan_response = res;
2497     scan->srw_scan_response = 0;
2498     nmem_transfer(odr_getmem(scan->odr), nmem);
2499     if (res->stepSize)
2500         ZOOM_options_set_int(scan->options, "stepSize", *res->stepSize);
2501     if (res->positionOfTerm)
2502         ZOOM_options_set_int(scan->options, "position", *res->positionOfTerm);
2503     if (res->scanStatus)
2504         ZOOM_options_set_int(scan->options, "scanStatus", *res->scanStatus);
2505     if (res->numberOfEntriesReturned)
2506         ZOOM_options_set_int(scan->options, "number",
2507                              *res->numberOfEntriesReturned);
2508     nmem_destroy(nmem);
2509     return 1;
2510 }
2511
2512 static zoom_ret send_sort(ZOOM_connection c,
2513                           ZOOM_resultset resultset)
2514 {
2515     if (c->error)
2516         resultset->r_sort_spec = 0;
2517     if (resultset->r_sort_spec)
2518     {
2519         Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_sortRequest);
2520         Z_SortRequest *req = apdu->u.sortRequest;
2521         
2522         req->num_inputResultSetNames = 1;
2523         req->inputResultSetNames = (Z_InternationalString **)
2524             odr_malloc(c->odr_out, sizeof(*req->inputResultSetNames));
2525         req->inputResultSetNames[0] =
2526             odr_strdup(c->odr_out, resultset->setname);
2527         req->sortedResultSetName = odr_strdup(c->odr_out, resultset->setname);
2528         req->sortSequence = resultset->r_sort_spec;
2529         resultset->r_sort_spec = 0;
2530         return send_APDU(c, apdu);
2531     }
2532     return zoom_complete;
2533 }
2534
2535 static zoom_ret send_present(ZOOM_connection c)
2536 {
2537     Z_APDU *apdu = 0;
2538     Z_PresentRequest *req = 0;
2539     int i = 0;
2540     const char *syntax = 0;
2541     const char *elementSetName = 0;
2542     ZOOM_resultset  resultset;
2543     int *start, *count;
2544
2545     if (!c->tasks)
2546     {
2547         yaz_log(log_details, "%p send_present no tasks", c);
2548         return zoom_complete;
2549     }
2550     
2551     switch (c->tasks->which)
2552     {
2553     case ZOOM_TASK_SEARCH:
2554         resultset = c->tasks->u.search.resultset;
2555         start = &c->tasks->u.search.start;
2556         count = &c->tasks->u.search.count;
2557         syntax = c->tasks->u.search.syntax;
2558         elementSetName = c->tasks->u.search.elementSetName;
2559         break;
2560     case ZOOM_TASK_RETRIEVE:
2561         resultset = c->tasks->u.retrieve.resultset;
2562         start = &c->tasks->u.retrieve.start;
2563         count = &c->tasks->u.retrieve.count;
2564         syntax = c->tasks->u.retrieve.syntax;
2565         elementSetName = c->tasks->u.retrieve.elementSetName;
2566         break;
2567     default:
2568         return zoom_complete;
2569     }
2570     yaz_log(log_details, "%p send_present start=%d count=%d",
2571             c, *start, *count);
2572
2573     if (*start < 0 || *count < 0 || *start + *count > resultset->size)
2574     {
2575         set_dset_error(c, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, "Bib-1",
2576                        "", 0);
2577     }
2578     if (c->error)                  /* don't continue on error */
2579         return zoom_complete;
2580     yaz_log(log_details, "send_present resultset=%p start=%d count=%d",
2581             resultset, *start, *count);
2582
2583     for (i = 0; i < *count; i++)
2584     {
2585         ZOOM_record rec =
2586             record_cache_lookup(resultset, i + *start, syntax, elementSetName);
2587         if (!rec)
2588             break;
2589         else
2590         {
2591             ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD);
2592             ZOOM_connection_put_event(c, event);
2593         }
2594     }
2595     *start += i;
2596     *count -= i;
2597
2598     if (*count == 0)
2599     {
2600         yaz_log(log_details, "%p send_present skip=%d no more to fetch", c, i);
2601         return zoom_complete;
2602     }
2603
2604     apdu = zget_APDU(c->odr_out, Z_APDU_presentRequest);
2605     req = apdu->u.presentRequest;
2606
2607     if (i)
2608         yaz_log(log_details, "%p send_present skip=%d", c, i);
2609
2610     *req->resultSetStartPoint = *start + 1;
2611
2612     if (resultset->step > 0 && resultset->step < *count)
2613         *req->numberOfRecordsRequested = resultset->step;
2614     else
2615         *req->numberOfRecordsRequested = *count;
2616     
2617     if (*req->numberOfRecordsRequested + *start > resultset->size)
2618         *req->numberOfRecordsRequested = resultset->size - *start;
2619     assert(*req->numberOfRecordsRequested > 0);
2620
2621     if (syntax && *syntax)
2622         req->preferredRecordSyntax =
2623             zoom_yaz_str_to_z3950oid(c, CLASS_RECSYN, syntax);
2624
2625     if (resultset->schema && *resultset->schema)
2626     {
2627         Z_RecordComposition *compo = (Z_RecordComposition *)
2628             odr_malloc(c->odr_out, sizeof(*compo));
2629
2630         req->recordComposition = compo;
2631         compo->which = Z_RecordComp_complex;
2632         compo->u.complex = (Z_CompSpec *)
2633             odr_malloc(c->odr_out, sizeof(*compo->u.complex));
2634         compo->u.complex->selectAlternativeSyntax = (bool_t *) 
2635             odr_malloc(c->odr_out, sizeof(bool_t));
2636         *compo->u.complex->selectAlternativeSyntax = 0;
2637
2638         compo->u.complex->generic = (Z_Specification *)
2639             odr_malloc(c->odr_out, sizeof(*compo->u.complex->generic));
2640
2641         compo->u.complex->generic->which = Z_Schema_oid;
2642         compo->u.complex->generic->schema.oid = (Odr_oid *)
2643             zoom_yaz_str_to_z3950oid (c, CLASS_SCHEMA, resultset->schema);
2644
2645         if (!compo->u.complex->generic->schema.oid)
2646         {
2647             /* OID wasn't a schema! Try record syntax instead. */
2648
2649             compo->u.complex->generic->schema.oid = (Odr_oid *)
2650                 zoom_yaz_str_to_z3950oid (c, CLASS_RECSYN, resultset->schema);
2651         }
2652         if (elementSetName && *elementSetName)
2653         {
2654             compo->u.complex->generic->elementSpec = (Z_ElementSpec *)
2655                 odr_malloc(c->odr_out, sizeof(Z_ElementSpec));
2656             compo->u.complex->generic->elementSpec->which =
2657                 Z_ElementSpec_elementSetName;
2658             compo->u.complex->generic->elementSpec->u.elementSetName =
2659                 odr_strdup(c->odr_out, elementSetName);
2660         }
2661         else
2662             compo->u.complex->generic->elementSpec = 0;
2663         compo->u.complex->num_dbSpecific = 0;
2664         compo->u.complex->dbSpecific = 0;
2665         compo->u.complex->num_recordSyntax = 0;
2666         compo->u.complex->recordSyntax = 0;
2667     }
2668     else if (elementSetName && *elementSetName)
2669     {
2670         Z_ElementSetNames *esn = (Z_ElementSetNames *)
2671             odr_malloc(c->odr_out, sizeof(*esn));
2672         Z_RecordComposition *compo = (Z_RecordComposition *)
2673             odr_malloc(c->odr_out, sizeof(*compo));
2674         
2675         esn->which = Z_ElementSetNames_generic;
2676         esn->u.generic = odr_strdup(c->odr_out, elementSetName);
2677         compo->which = Z_RecordComp_simple;
2678         compo->u.simple = esn;
2679         req->recordComposition = compo;
2680     }
2681     req->resultSetId = odr_strdup(c->odr_out, resultset->setname);
2682     return send_APDU(c, apdu);
2683 }
2684
2685 ZOOM_API(ZOOM_scanset)
2686     ZOOM_connection_scan(ZOOM_connection c, const char *start)
2687 {
2688     ZOOM_scanset s;
2689     ZOOM_query q = ZOOM_query_create();
2690
2691     ZOOM_query_prefix(q, start);
2692
2693     s = ZOOM_connection_scan1(c, q);
2694     ZOOM_query_destroy(q);
2695     return s;
2696
2697 }
2698
2699 ZOOM_API(ZOOM_scanset)
2700     ZOOM_connection_scan1(ZOOM_connection c, ZOOM_query q)
2701 {
2702     ZOOM_scanset scan = 0;
2703
2704     if (!q->z_query)
2705         return 0;
2706     scan = (ZOOM_scanset) xmalloc(sizeof(*scan));
2707     scan->connection = c;
2708     scan->odr = odr_createmem(ODR_DECODE);
2709     scan->options = ZOOM_options_create_with_parent(c->options);
2710     scan->refcount = 1;
2711     scan->scan_response = 0;
2712     scan->srw_scan_response = 0;
2713
2714     scan->query = q;
2715     (q->refcount)++;
2716     scan->databaseNames = set_DatabaseNames(c, c->options,
2717                                             &scan->num_databaseNames,
2718                                             scan->odr);
2719
2720     if (1)
2721     {
2722         ZOOM_task task = ZOOM_connection_add_task(c, ZOOM_TASK_SCAN);
2723         task->u.scan.scan = scan;
2724         
2725         (scan->refcount)++;
2726         if (!c->async)
2727         {
2728             while (ZOOM_event(1, &c))
2729                 ;
2730         }
2731     }
2732     return scan;
2733 }
2734
2735 ZOOM_API(void)
2736     ZOOM_scanset_destroy(ZOOM_scanset scan)
2737 {
2738     if (!scan)
2739         return;
2740     (scan->refcount)--;
2741     if (scan->refcount == 0)
2742     {
2743         ZOOM_query_destroy(scan->query);
2744
2745         odr_destroy(scan->odr);
2746         
2747         ZOOM_options_destroy(scan->options);
2748         xfree(scan);
2749     }
2750 }
2751
2752 static zoom_ret send_package(ZOOM_connection c)
2753 {
2754     ZOOM_Event event;
2755
2756     yaz_log(log_details, "%p send_package", c);
2757     if (!c->tasks)
2758         return zoom_complete;
2759     assert (c->tasks->which == ZOOM_TASK_PACKAGE);
2760     
2761     event = ZOOM_Event_create(ZOOM_EVENT_SEND_APDU);
2762     ZOOM_connection_put_event(c, event);
2763     
2764     c->buf_out = c->tasks->u.package->buf_out;
2765     c->len_out = c->tasks->u.package->len_out;
2766
2767     return do_write(c);
2768 }
2769
2770 static zoom_ret ZOOM_connection_send_scan(ZOOM_connection c)
2771 {
2772     ZOOM_scanset scan;
2773     Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_scanRequest);
2774     Z_ScanRequest *req = apdu->u.scanRequest;
2775
2776     yaz_log(log_details, "%p send_scan", c);
2777     if (!c->tasks)
2778         return zoom_complete;
2779     assert (c->tasks->which == ZOOM_TASK_SCAN);
2780     scan = c->tasks->u.scan.scan;
2781
2782     /* Z39.50 scan can only carry RPN */
2783     if (scan->query->z_query->which == Z_Query_type_1 ||
2784         scan->query->z_query->which == Z_Query_type_101)
2785     {
2786         Z_RPNQuery *rpn = scan->query->z_query->u.type_1;
2787         const char *cp = ZOOM_options_get(scan->options, "rpnCharset");
2788         if (cp)
2789         {
2790             yaz_iconv_t cd = yaz_iconv_open(cp, "UTF-8");
2791             if (cd)
2792             {
2793                 rpn = yaz_copy_z_RPNQuery(rpn, c->odr_out);
2794
2795                 yaz_query_charset_convert_rpnquery(
2796                     rpn, c->odr_out, cd);
2797                 yaz_iconv_close(cd);
2798             }
2799         }
2800         req->attributeSet = rpn->attributeSetId;
2801         if (!req->attributeSet)
2802             req->attributeSet = odr_oiddup(c->odr_out, yaz_oid_attset_bib_1);
2803         if (rpn->RPNStructure->which == Z_RPNStructure_simple &&
2804             rpn->RPNStructure->u.simple->which == Z_Operand_APT)
2805         {
2806             req->termListAndStartPoint =
2807                 rpn->RPNStructure->u.simple->u.attributesPlusTerm;
2808         }
2809         else
2810         {
2811             set_ZOOM_error(c, ZOOM_ERROR_INVALID_QUERY, 0);
2812             return zoom_complete;
2813         }
2814     }
2815     else
2816     {
2817         set_ZOOM_error(c, ZOOM_ERROR_UNSUPPORTED_QUERY, 0);
2818         return zoom_complete;
2819     }
2820
2821     *req->numberOfTermsRequested =
2822         ZOOM_options_get_int(scan->options, "number", 10);
2823
2824     req->preferredPositionInResponse =
2825         odr_intdup(c->odr_out,
2826                    ZOOM_options_get_int(scan->options, "position", 1));
2827
2828     req->stepSize =
2829         odr_intdup(c->odr_out,
2830                    ZOOM_options_get_int(scan->options, "stepSize", 0));
2831     
2832     req->databaseNames = scan->databaseNames;
2833     req->num_databaseNames = scan->num_databaseNames;
2834
2835     return send_APDU(c, apdu);
2836 }
2837
2838 #if YAZ_HAVE_XML2
2839 static zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c)
2840 {
2841     ZOOM_scanset scan;
2842     Z_SRW_PDU *sr = 0;
2843     const char *option_val = 0;
2844
2845     if (!c->tasks)
2846         return zoom_complete;
2847     assert (c->tasks->which == ZOOM_TASK_SCAN);
2848     scan = c->tasks->u.scan.scan;
2849         
2850     sr = ZOOM_srw_get_pdu(c, Z_SRW_scan_request);
2851
2852     /* SRU scan can only carry CQL and PQF */
2853     if (scan->query->z_query->which == Z_Query_type_104)
2854     {
2855         sr->u.scan_request->query_type = Z_SRW_query_type_cql;
2856         sr->u.scan_request->scanClause.cql = scan->query->query_string;
2857     }
2858     else if (scan->query->z_query->which == Z_Query_type_1
2859              || scan->query->z_query->which == Z_Query_type_101)
2860     {
2861         sr->u.scan_request->query_type = Z_SRW_query_type_pqf;
2862         sr->u.scan_request->scanClause.pqf = scan->query->query_string;
2863     }
2864     else
2865     {
2866         set_ZOOM_error(c, ZOOM_ERROR_UNSUPPORTED_QUERY, 0);
2867         return zoom_complete;
2868     }
2869
2870     sr->u.scan_request->maximumTerms = odr_intdup(
2871         c->odr_out, ZOOM_options_get_int(scan->options, "number", 10));
2872     
2873     sr->u.scan_request->responsePosition = odr_intdup(
2874         c->odr_out, ZOOM_options_get_int(scan->options, "position", 1));
2875     
2876     option_val = ZOOM_options_get(scan->options, "extraArgs");
2877     yaz_encode_sru_extra(sr, c->odr_out, option_val);
2878     return send_srw(c, sr);
2879 }
2880 #else
2881 static zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c)
2882 {
2883     return zoom_complete;
2884 }
2885 #endif
2886
2887
2888 ZOOM_API(size_t)
2889     ZOOM_scanset_size(ZOOM_scanset scan)
2890 {
2891     if (!scan)
2892         return 0;
2893
2894     if (scan->scan_response && scan->scan_response->entries)
2895         return scan->scan_response->entries->num_entries;
2896     else if (scan->srw_scan_response)
2897         return scan->srw_scan_response->num_terms;
2898     return 0;
2899 }
2900
2901 static void ZOOM_scanset_term_x(ZOOM_scanset scan, size_t pos,
2902                                 int *occ,
2903                                 const char **value_term, size_t *value_len,
2904                                 const char **disp_term, size_t *disp_len)
2905 {
2906     size_t noent = ZOOM_scanset_size(scan);
2907     
2908     *value_term = 0;
2909     *value_len = 0;
2910
2911     *disp_term = 0;
2912     *disp_len = 0;
2913
2914     *occ = 0;
2915     if (pos >= noent || pos < 0)
2916         return;
2917     if (scan->scan_response)
2918     {
2919         Z_ScanResponse *res = scan->scan_response;
2920         if (res->entries->entries[pos]->which == Z_Entry_termInfo)
2921         {
2922             Z_TermInfo *t = res->entries->entries[pos]->u.termInfo;
2923             
2924             *value_term = (const char *) t->term->u.general->buf;
2925             *value_len = t->term->u.general->len;
2926             if (t->displayTerm)
2927             {
2928                 *disp_term = t->displayTerm;
2929                 *disp_len = strlen(*disp_term);
2930             }
2931             else if (t->term->which == Z_Term_general)
2932             {
2933                 *disp_term = (const char *) t->term->u.general->buf;
2934                 *disp_len = t->term->u.general->len;
2935             }
2936             *occ = t->globalOccurrences ? *t->globalOccurrences : 0;
2937         }
2938     }
2939     if (scan->srw_scan_response)
2940     {
2941         Z_SRW_scanResponse *res = scan->srw_scan_response;
2942         Z_SRW_scanTerm *t = res->terms + pos;
2943         if (t)
2944         {
2945             *value_term = t->value;
2946             *value_len = strlen(*value_term);
2947
2948             if (t->displayTerm)
2949                 *disp_term = t->displayTerm;
2950             else
2951                 *disp_term = t->value;
2952             *disp_len = strlen(*disp_term);
2953             *occ = t->numberOfRecords ? *t->numberOfRecords : 0;
2954         }
2955     }
2956 }
2957
2958 ZOOM_API(const char *)
2959     ZOOM_scanset_term(ZOOM_scanset scan, size_t pos,
2960                       int *occ, int *len)
2961 {
2962     const char *value_term = 0;
2963     size_t value_len = 0;
2964     const char *disp_term = 0;
2965     size_t disp_len = 0;
2966
2967     ZOOM_scanset_term_x(scan, pos, occ, &value_term, &value_len,
2968                         &disp_term, &disp_len);
2969     
2970     *len = value_len;
2971     return value_term;
2972 }
2973
2974 ZOOM_API(const char *)
2975     ZOOM_scanset_display_term(ZOOM_scanset scan, size_t pos,
2976                               int *occ, int *len)
2977 {
2978     const char *value_term = 0;
2979     size_t value_len = 0;
2980     const char *disp_term = 0;
2981     size_t disp_len = 0;
2982
2983     ZOOM_scanset_term_x(scan, pos, occ, &value_term, &value_len,
2984                         &disp_term, &disp_len);
2985     
2986     *len = disp_len;
2987     return disp_term;
2988 }
2989
2990 ZOOM_API(const char *)
2991     ZOOM_scanset_option_get(ZOOM_scanset scan, const char *key)
2992 {
2993     return ZOOM_options_get(scan->options, key);
2994 }
2995
2996 ZOOM_API(void)
2997     ZOOM_scanset_option_set(ZOOM_scanset scan, const char *key,
2998                             const char *val)
2999 {
3000     ZOOM_options_set(scan->options, key, val);
3001 }
3002
3003 static Z_APDU *create_es_package(ZOOM_package p, const Odr_oid *oid)
3004 {
3005     const char *str;
3006     Z_APDU *apdu = zget_APDU(p->odr_out, Z_APDU_extendedServicesRequest);
3007     Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
3008     
3009     str = ZOOM_options_get(p->options, "package-name");
3010     if (str && *str)
3011         req->packageName = odr_strdup(p->odr_out, str);
3012     
3013     str = ZOOM_options_get(p->options, "user-id");
3014     if (str)
3015         req->userId = odr_strdup_null(p->odr_out, str);
3016     
3017     req->packageType = odr_oiddup(p->odr_out, oid);
3018
3019     str = ZOOM_options_get(p->options, "function");
3020     if (str)
3021     {
3022         if (!strcmp (str, "create"))
3023             *req->function = Z_ExtendedServicesRequest_create;
3024         if (!strcmp (str, "delete"))
3025             *req->function = Z_ExtendedServicesRequest_delete;
3026         if (!strcmp (str, "modify"))
3027             *req->function = Z_ExtendedServicesRequest_modify;
3028     }
3029
3030     str = ZOOM_options_get(p->options, "waitAction");
3031     if (str)
3032     {
3033         if (!strcmp (str, "wait"))
3034             *req->waitAction = Z_ExtendedServicesRequest_wait;
3035         if (!strcmp (str, "waitIfPossible"))
3036             *req->waitAction = Z_ExtendedServicesRequest_waitIfPossible;
3037         if (!strcmp (str, "dontWait"))
3038             *req->waitAction = Z_ExtendedServicesRequest_dontWait;
3039         if (!strcmp (str, "dontReturnPackage"))
3040             *req->waitAction = Z_ExtendedServicesRequest_dontReturnPackage;
3041     }
3042     return apdu;
3043 }
3044
3045 static const char *ill_array_lookup(void *clientData, const char *idx)
3046 {
3047     ZOOM_package p = (ZOOM_package) clientData;
3048     return ZOOM_options_get(p->options, idx+4);
3049 }
3050
3051 static Z_External *encode_ill_request(ZOOM_package p)
3052 {
3053     ODR out = p->odr_out;
3054     ILL_Request *req;
3055     Z_External *r = 0;
3056     struct ill_get_ctl ctl;
3057         
3058     ctl.odr = p->odr_out;
3059     ctl.clientData = p;
3060     ctl.f = ill_array_lookup;
3061         
3062     req = ill_get_ILLRequest(&ctl, "ill", 0);
3063         
3064     if (!ill_Request(out, &req, 0, 0))
3065     {
3066         int ill_request_size;
3067         char *ill_request_buf = odr_getbuf(out, &ill_request_size, 0);
3068         if (ill_request_buf)
3069             odr_setbuf(out, ill_request_buf, ill_request_size, 1);
3070         return 0;
3071     }
3072     else
3073     {
3074         int illRequest_size = 0;
3075         char *illRequest_buf = odr_getbuf(out, &illRequest_size, 0);
3076                 
3077         r = (Z_External *) odr_malloc(out, sizeof(*r));
3078         r->direct_reference = odr_oiddup(out, yaz_oid_general_isoill_1);
3079         r->indirect_reference = 0;
3080         r->descriptor = 0;
3081         r->which = Z_External_single;
3082                 
3083         r->u.single_ASN1_type =
3084             odr_create_Odr_oct(out,
3085                                (unsigned char *)illRequest_buf,
3086                                illRequest_size);
3087     }
3088     return r;
3089 }
3090
3091 static Z_ItemOrder *encode_item_order(ZOOM_package p)
3092 {
3093     Z_ItemOrder *req = (Z_ItemOrder *) odr_malloc(p->odr_out, sizeof(*req));
3094     const char *str;
3095     int len;
3096     
3097     req->which = Z_IOItemOrder_esRequest;
3098     req->u.esRequest = (Z_IORequest *) 
3099         odr_malloc(p->odr_out,sizeof(Z_IORequest));
3100
3101     /* to keep part ... */
3102     req->u.esRequest->toKeep = (Z_IOOriginPartToKeep *)
3103         odr_malloc(p->odr_out,sizeof(Z_IOOriginPartToKeep));
3104     req->u.esRequest->toKeep->supplDescription = 0;
3105     req->u.esRequest->toKeep->contact = (Z_IOContact *)
3106         odr_malloc(p->odr_out, sizeof(*req->u.esRequest->toKeep->contact));
3107         
3108     str = ZOOM_options_get(p->options, "contact-name");
3109     req->u.esRequest->toKeep->contact->name =
3110         odr_strdup_null(p->odr_out, str);
3111         
3112     str = ZOOM_options_get(p->options, "contact-phone");
3113     req->u.esRequest->toKeep->contact->phone =
3114         odr_strdup_null(p->odr_out, str);
3115         
3116     str = ZOOM_options_get(p->options, "contact-email");
3117     req->u.esRequest->toKeep->contact->email =
3118         odr_strdup_null(p->odr_out, str);
3119         
3120     req->u.esRequest->toKeep->addlBilling = 0;
3121         
3122     /* not to keep part ... */
3123     req->u.esRequest->notToKeep = (Z_IOOriginPartNotToKeep *)
3124         odr_malloc(p->odr_out,sizeof(Z_IOOriginPartNotToKeep));
3125         
3126     str = ZOOM_options_get(p->options, "itemorder-setname");
3127     if (!str)
3128         str = "default";
3129
3130     if (!*str) 
3131         req->u.esRequest->notToKeep->resultSetItem = 0;
3132     else
3133     {
3134         req->u.esRequest->notToKeep->resultSetItem = (Z_IOResultSetItem *)
3135             odr_malloc(p->odr_out, sizeof(Z_IOResultSetItem));
3136
3137         req->u.esRequest->notToKeep->resultSetItem->resultSetId =
3138             odr_strdup(p->odr_out, str);
3139         req->u.esRequest->notToKeep->resultSetItem->item =
3140             odr_intdup(p->odr_out, 0);
3141         
3142         str = ZOOM_options_get(p->options, "itemorder-item");
3143         *req->u.esRequest->notToKeep->resultSetItem->item =
3144             (str ? atoi(str) : 1);
3145     }
3146
3147     str = ZOOM_options_getl(p->options, "doc", &len);
3148     if (str)
3149     {
3150         req->u.esRequest->notToKeep->itemRequest =
3151             z_ext_record_xml(p->odr_out, str, len);
3152     }
3153     else
3154         req->u.esRequest->notToKeep->itemRequest = encode_ill_request(p);
3155     
3156     return req;
3157 }
3158
3159 Z_APDU *create_admin_package(ZOOM_package p, int type, 
3160                              Z_ESAdminOriginPartToKeep **toKeepP,
3161                              Z_ESAdminOriginPartNotToKeep **notToKeepP)
3162 {
3163     Z_APDU *apdu = create_es_package(p, yaz_oid_extserv_admin);
3164     if (apdu)
3165     {
3166         Z_ESAdminOriginPartToKeep  *toKeep;
3167         Z_ESAdminOriginPartNotToKeep  *notToKeep;
3168         Z_External *r = (Z_External *) odr_malloc(p->odr_out, sizeof(*r));
3169         const char *first_db = "Default";
3170         int num_db;
3171         char **db = set_DatabaseNames(p->connection, p->options, &num_db,
3172                                       p->odr_out);
3173         if (num_db > 0)
3174             first_db = db[0];
3175             
3176         r->direct_reference = odr_oiddup(p->odr_out, yaz_oid_extserv_admin);
3177         r->descriptor = 0;
3178         r->indirect_reference = 0;
3179         r->which = Z_External_ESAdmin;
3180         
3181         r->u.adminService = (Z_Admin *)
3182             odr_malloc(p->odr_out, sizeof(*r->u.adminService));
3183         r->u.adminService->which = Z_Admin_esRequest;
3184         r->u.adminService->u.esRequest = (Z_AdminEsRequest *)
3185             odr_malloc(p->odr_out, sizeof(*r->u.adminService->u.esRequest));
3186         
3187         toKeep = r->u.adminService->u.esRequest->toKeep =
3188             (Z_ESAdminOriginPartToKeep *) 
3189             odr_malloc(p->odr_out, sizeof(*r->u.adminService->u.esRequest->toKeep));
3190         toKeep->which = type;
3191         toKeep->databaseName = odr_strdup(p->odr_out, first_db);
3192         toKeep->u.create = odr_nullval();
3193         apdu->u.extendedServicesRequest->taskSpecificParameters = r;
3194         
3195         r->u.adminService->u.esRequest->notToKeep = notToKeep =
3196             (Z_ESAdminOriginPartNotToKeep *)
3197             odr_malloc(p->odr_out,
3198                        sizeof(*r->u.adminService->u.esRequest->notToKeep));
3199         notToKeep->which = Z_ESAdminOriginPartNotToKeep_recordsWillFollow;
3200         notToKeep->u.recordsWillFollow = odr_nullval();
3201         if (toKeepP)
3202             *toKeepP = toKeep;
3203         if (notToKeepP)
3204             *notToKeepP = notToKeep;
3205     }
3206     return apdu;
3207 }
3208
3209 static Z_APDU *create_xmlupdate_package(ZOOM_package p)
3210 {
3211     Z_APDU *apdu = create_es_package(p, yaz_oid_extserv_xml_es);
3212     Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
3213     Z_External *ext = (Z_External *) odr_malloc(p->odr_out, sizeof(*ext));
3214     int len;
3215     const char *doc = ZOOM_options_getl(p->options, "doc", &len);
3216
3217     if (!doc)
3218     {
3219         doc = "";
3220         len = 0;
3221     }
3222
3223     req->taskSpecificParameters = ext;
3224     ext->direct_reference = req->packageType;
3225     ext->descriptor = 0;
3226     ext->indirect_reference = 0;
3227     
3228     ext->which = Z_External_octet;
3229     ext->u.single_ASN1_type =
3230         odr_create_Odr_oct(p->odr_out, (const unsigned char *) doc, len);
3231     return apdu;
3232 }
3233
3234 static Z_APDU *create_update_package(ZOOM_package p)
3235 {
3236     Z_APDU *apdu = 0;
3237     const char *first_db = "Default";
3238     int num_db;
3239     char **db = set_DatabaseNames(p->connection, p->options, &num_db, p->odr_out);
3240     const char *action = ZOOM_options_get(p->options, "action");
3241     int recordIdOpaque_len;
3242     const char *recordIdOpaque = ZOOM_options_getl(p->options, "recordIdOpaque",
3243         &recordIdOpaque_len);
3244     const char *recordIdNumber = ZOOM_options_get(p->options, "recordIdNumber");
3245     int record_len;
3246     const char *record_buf = ZOOM_options_getl(p->options, "record",
3247         &record_len);
3248     int recordOpaque_len;
3249     const char *recordOpaque_buf = ZOOM_options_getl(p->options, "recordOpaque",
3250         &recordOpaque_len);
3251     const char *syntax_str = ZOOM_options_get(p->options, "syntax");
3252     const char *version = ZOOM_options_get(p->options, "updateVersion");
3253
3254     const char *correlationInfo_note =
3255         ZOOM_options_get(p->options, "correlationInfo.note");
3256     const char *correlationInfo_id =
3257         ZOOM_options_get(p->options, "correlationInfo.id");
3258     int action_no = -1;
3259     Odr_oid *syntax_oid = 0;
3260     const Odr_oid *package_oid = yaz_oid_extserv_database_update;
3261
3262     if (!version)
3263         version = "3";
3264     if (!syntax_str)
3265         syntax_str = "xml";
3266     if (!record_buf && !recordOpaque_buf)
3267     {
3268         record_buf = "void";
3269         record_len = 4;
3270         syntax_str = "SUTRS";
3271     }
3272
3273     if (syntax_str)
3274     {
3275         syntax_oid = yaz_string_to_oid_odr(yaz_oid_std(),
3276                                            CLASS_RECSYN, syntax_str,
3277                                            p->odr_out);
3278     }
3279     if (!syntax_oid)
3280         return 0;
3281
3282     if (num_db > 0)
3283         first_db = db[0];
3284     
3285     switch(*version)
3286     {
3287     case '1':
3288         package_oid = yaz_oid_extserv_database_update_first_version;
3289         /* old update does not support specialUpdate */
3290         if (!action)
3291             action = "recordInsert";
3292         break;
3293     case '2':
3294         if (!action)
3295             action = "specialUpdate";
3296         package_oid = yaz_oid_extserv_database_update_second_version;
3297         break;
3298     case '3':
3299         if (!action)
3300             action = "specialUpdate";
3301         package_oid = yaz_oid_extserv_database_update;
3302         break;
3303     default:
3304         return 0;
3305     }
3306     
3307     if (!strcmp(action, "recordInsert"))
3308         action_no = Z_IUOriginPartToKeep_recordInsert;
3309     else if (!strcmp(action, "recordReplace"))
3310         action_no = Z_IUOriginPartToKeep_recordReplace;
3311     else if (!strcmp(action, "recordDelete"))
3312         action_no = Z_IUOriginPartToKeep_recordDelete;
3313     else if (!strcmp(action, "elementUpdate"))
3314         action_no = Z_IUOriginPartToKeep_elementUpdate;
3315     else if (!strcmp(action, "specialUpdate"))
3316         action_no = Z_IUOriginPartToKeep_specialUpdate;
3317     else
3318         return 0;
3319
3320     apdu = create_es_package(p, package_oid);
3321     if (apdu)
3322     {
3323         Z_IUOriginPartToKeep *toKeep;
3324         Z_IUSuppliedRecords *notToKeep;
3325         Z_External *r = (Z_External *)
3326             odr_malloc(p->odr_out, sizeof(*r));
3327         const char *elementSetName =
3328             ZOOM_options_get(p->options, "elementSetName");
3329         
3330         apdu->u.extendedServicesRequest->taskSpecificParameters = r;
3331         
3332         r->direct_reference = odr_oiddup(p->odr_out, package_oid);
3333         r->descriptor = 0;
3334         r->which = Z_External_update;
3335         r->indirect_reference = 0;
3336         r->u.update = (Z_IUUpdate *)
3337             odr_malloc(p->odr_out, sizeof(*r->u.update));
3338         
3339         r->u.update->which = Z_IUUpdate_esRequest;
3340         r->u.update->u.esRequest = (Z_IUUpdateEsRequest *)
3341             odr_malloc(p->odr_out, sizeof(*r->u.update->u.esRequest));
3342         toKeep = r->u.update->u.esRequest->toKeep = 
3343             (Z_IUOriginPartToKeep *)
3344             odr_malloc(p->odr_out, sizeof(*toKeep));
3345         
3346         toKeep->databaseName = odr_strdup(p->odr_out, first_db);
3347         toKeep->schema = 0;
3348         
3349         toKeep->elementSetName = odr_strdup_null(p->odr_out, elementSetName);
3350             
3351         toKeep->actionQualifier = 0;
3352         toKeep->action = odr_intdup(p->odr_out, action_no);
3353         
3354         notToKeep = r->u.update->u.esRequest->notToKeep = 
3355             (Z_IUSuppliedRecords *)
3356             odr_malloc(p->odr_out, sizeof(*notToKeep));
3357         notToKeep->num = 1;
3358         notToKeep->elements = (Z_IUSuppliedRecords_elem **)
3359             odr_malloc(p->odr_out, sizeof(*notToKeep->elements));
3360         notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
3361             odr_malloc(p->odr_out, sizeof(**notToKeep->elements));
3362         notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
3363         if (recordIdOpaque)
3364         {
3365             notToKeep->elements[0]->u.opaque = 
3366                 odr_create_Odr_oct(p->odr_out,
3367                                    (const unsigned char *) recordIdOpaque,
3368                                    recordIdOpaque_len);
3369         }
3370         else if (recordIdNumber)
3371         {
3372             notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_number;
3373             
3374             notToKeep->elements[0]->u.number =
3375                 odr_intdup(p->odr_out, atoi(recordIdNumber));
3376         }
3377         else
3378             notToKeep->elements[0]->u.opaque = 0;
3379         notToKeep->elements[0]->supplementalId = 0;
3380         if (correlationInfo_note || correlationInfo_id)
3381         {
3382             Z_IUCorrelationInfo *ci;
3383             ci = notToKeep->elements[0]->correlationInfo =
3384                 (Z_IUCorrelationInfo *) odr_malloc(p->odr_out, sizeof(*ci));
3385             ci->note = odr_strdup_null(p->odr_out, correlationInfo_note);
3386             ci->id = correlationInfo_id ?
3387                 odr_intdup(p->odr_out, atoi(correlationInfo_id)) : 0;
3388         }
3389         else
3390             notToKeep->elements[0]->correlationInfo = 0;
3391         if (recordOpaque_buf)
3392         {
3393             notToKeep->elements[0]->record =
3394                 z_ext_record_oid_any(p->odr_out, syntax_oid,
3395                                  recordOpaque_buf, recordOpaque_len);
3396         }
3397         else
3398         {
3399             notToKeep->elements[0]->record =
3400                 z_ext_record_oid(p->odr_out, syntax_oid,
3401                                  record_buf, record_len);
3402         }
3403     }
3404     if (0 && apdu)
3405     {
3406         ODR print = odr_createmem(ODR_PRINT);
3407
3408         z_APDU(print, &apdu, 0, 0);
3409         odr_destroy(print);
3410     }
3411     return apdu;
3412 }
3413
3414 ZOOM_API(void)
3415     ZOOM_package_send(ZOOM_package p, const char *type)
3416 {
3417     Z_APDU *apdu = 0;
3418     ZOOM_connection c;
3419     if (!p)
3420         return;
3421     c = p->connection;
3422     odr_reset(p->odr_out);
3423     xfree(p->buf_out);
3424     p->buf_out = 0;
3425     if (!strcmp(type, "itemorder"))
3426     {
3427         apdu = create_es_package(p, yaz_oid_extserv_item_order);
3428         if (apdu)
3429         {
3430             Z_External *r = (Z_External *) odr_malloc(p->odr_out, sizeof(*r));
3431             
3432             r->direct_reference = 
3433                 odr_oiddup(p->odr_out, yaz_oid_extserv_item_order);
3434             r->descriptor = 0;
3435             r->which = Z_External_itemOrder;
3436             r->indirect_reference = 0;
3437             r->u.itemOrder = encode_item_order(p);
3438
3439             apdu->u.extendedServicesRequest->taskSpecificParameters = r;
3440         }
3441     }
3442     else if (!strcmp(type, "create"))  /* create database */
3443     {
3444         apdu = create_admin_package(p, Z_ESAdminOriginPartToKeep_create,
3445                                     0, 0);
3446     }   
3447     else if (!strcmp(type, "drop"))  /* drop database */
3448     {
3449         apdu = create_admin_package(p, Z_ESAdminOriginPartToKeep_drop,
3450                                     0, 0);
3451     }
3452     else if (!strcmp(type, "commit"))  /* commit changes */
3453     {
3454         apdu = create_admin_package(p, Z_ESAdminOriginPartToKeep_commit,
3455                                     0, 0);
3456     }
3457     else if (!strcmp(type, "update")) /* update record(s) */
3458     {
3459         apdu = create_update_package(p);
3460     }
3461     else if (!strcmp(type, "xmlupdate"))
3462     {
3463         apdu = create_xmlupdate_package(p);
3464     }
3465     if (apdu)
3466     {
3467         if (encode_APDU(p->connection, apdu, p->odr_out) == 0)
3468         {
3469             char *buf;
3470
3471             ZOOM_task task = ZOOM_connection_add_task(c, ZOOM_TASK_PACKAGE);
3472             task->u.package = p;
3473             buf = odr_getbuf(p->odr_out, &p->len_out, 0);
3474             p->buf_out = (char *) xmalloc(p->len_out);
3475             memcpy(p->buf_out, buf, p->len_out);
3476             
3477             (p->refcount)++;
3478             if (!c->async)
3479             {
3480                 while (ZOOM_event(1, &c))
3481                     ;
3482             }
3483         }
3484     }
3485 }
3486
3487 ZOOM_API(ZOOM_package)
3488     ZOOM_connection_package(ZOOM_connection c, ZOOM_options options)
3489 {
3490     ZOOM_package p = (ZOOM_package) xmalloc(sizeof(*p));
3491
3492     p->connection = c;
3493     p->odr_out = odr_createmem(ODR_ENCODE);
3494     p->options = ZOOM_options_create_with_parent2(options, c->options);
3495     p->refcount = 1;
3496     p->buf_out = 0;
3497     p->len_out = 0;
3498     return p;
3499 }
3500
3501 ZOOM_API(void)
3502     ZOOM_package_destroy(ZOOM_package p)
3503 {
3504     if (!p)
3505         return;
3506     (p->refcount)--;
3507     if (p->refcount == 0)
3508     {
3509         odr_destroy(p->odr_out);
3510         xfree(p->buf_out);
3511         
3512         ZOOM_options_destroy(p->options);
3513         xfree(p);
3514     }
3515 }
3516
3517 ZOOM_API(const char *)
3518     ZOOM_package_option_get(ZOOM_package p, const char *key)
3519 {
3520     return ZOOM_options_get(p->options, key);
3521 }
3522
3523 ZOOM_API(const char *)
3524     ZOOM_package_option_getl(ZOOM_package p, const char *key, int *lenp)
3525 {
3526     return ZOOM_options_getl(p->options, key, lenp);
3527 }
3528
3529 ZOOM_API(void)
3530     ZOOM_package_option_set(ZOOM_package p, const char *key,
3531                             const char *val)
3532 {
3533     ZOOM_options_set(p->options, key, val);
3534 }
3535
3536 ZOOM_API(void)
3537     ZOOM_package_option_setl(ZOOM_package p, const char *key,
3538                              const char *val, int len)
3539 {
3540     ZOOM_options_setl(p->options, key, val, len);
3541 }
3542
3543 static int ZOOM_connection_exec_task(ZOOM_connection c)
3544 {
3545     ZOOM_task task = c->tasks;
3546     zoom_ret ret = zoom_complete;
3547
3548     if (!task)
3549         return 0;
3550     yaz_log(log_details, "%p ZOOM_connection_exec_task type=%d run=%d",
3551             c, task->which, task->running);
3552     if (c->error != ZOOM_ERROR_NONE)
3553     {
3554         yaz_log(log_details, "%p ZOOM_connection_exec_task "
3555                 "removing tasks because of error = %d", c, c->error);
3556         ZOOM_connection_remove_tasks(c);
3557         return 0;
3558     }
3559     if (task->running)
3560     {
3561         yaz_log(log_details, "%p ZOOM_connection_exec_task "
3562                 "task already running", c);
3563         return 0;
3564     }
3565     task->running = 1;
3566     ret = zoom_complete;
3567     if (c->cs || task->which == ZOOM_TASK_CONNECT)
3568     {
3569         switch (task->which)
3570         {
3571         case ZOOM_TASK_SEARCH:
3572             if (c->proto == PROTO_HTTP)
3573                 ret = ZOOM_connection_srw_send_search(c);
3574             else
3575                 ret = ZOOM_connection_send_search(c);
3576             break;
3577         case ZOOM_TASK_RETRIEVE:
3578             if (c->proto == PROTO_HTTP)
3579                 ret = ZOOM_connection_srw_send_search(c);
3580             else
3581                 ret = send_present(c);
3582             break;
3583         case ZOOM_TASK_CONNECT:
3584             ret = do_connect(c);
3585             break;
3586         case ZOOM_TASK_SCAN:
3587             if (c->proto == PROTO_HTTP)
3588                 ret = ZOOM_connection_srw_send_scan(c);
3589             else
3590                 ret = ZOOM_connection_send_scan(c);
3591             break;
3592         case ZOOM_TASK_PACKAGE:
3593             ret = send_package(c);
3594             break;
3595         case ZOOM_TASK_SORT:
3596             c->tasks->u.sort.resultset->r_sort_spec = 
3597                 c->tasks->u.sort.q->sort_spec;
3598             ret = send_sort(c, c->tasks->u.sort.resultset);
3599             break;
3600         }
3601     }
3602     else
3603     {
3604         yaz_log(log_details, "%p ZOOM_connection_exec_task "
3605                 "remove tasks because no connection exist", c);
3606         ZOOM_connection_remove_tasks(c);
3607     }
3608     if (ret == zoom_complete)
3609     {
3610         yaz_log(log_details, "%p ZOOM_connection_exec_task "
3611                 "task removed (complete)", c);
3612         ZOOM_connection_remove_task(c);
3613         return 0;
3614     }
3615     yaz_log(log_details, "%p ZOOM_connection_exec_task "
3616             "task pending", c);
3617     return 1;
3618 }
3619
3620 static zoom_ret send_sort_present(ZOOM_connection c)
3621 {
3622     zoom_ret r = zoom_complete;
3623
3624     if (c->tasks && c->tasks->which == ZOOM_TASK_SEARCH)
3625         r = send_sort(c, c->tasks->u.search.resultset);
3626     if (r == zoom_complete)
3627         r = send_present(c);
3628     return r;
3629 }
3630
3631 static int es_response_taskpackage_update(ZOOM_connection c,
3632                 Z_IUUpdateTaskPackage *utp)
3633 {
3634         if (utp && utp->targetPart)
3635         {
3636                 Z_IUTargetPart *targetPart = utp->targetPart;
3637                 switch ( *targetPart->updateStatus ) {
3638                         case Z_IUTargetPart_success:
3639                                 ZOOM_options_set(c->tasks->u.package->options,"updateStatus", "success");
3640                                 break;
3641                         case Z_IUTargetPart_partial:
3642                                 ZOOM_options_set(c->tasks->u.package->options,"updateStatus", "partial");
3643                                 break;
3644                         case Z_IUTargetPart_failure:
3645                                 ZOOM_options_set(c->tasks->u.package->options,"updateStatus", "failure");
3646                                 if (targetPart->globalDiagnostics && targetPart->num_globalDiagnostics > 0)
3647                                         response_diag(c, targetPart->globalDiagnostics[0]);
3648                                 break;
3649                 }
3650                 // NOTE: Individual record status, surrogate diagnostics, and supplemental diagnostics ARE NOT REPORTED.
3651         }
3652     return 1;
3653 }
3654
3655 static int es_response_taskpackage(ZOOM_connection c,
3656                                    Z_TaskPackage *taskPackage)
3657 {
3658         // targetReference
3659         Odr_oct *id = taskPackage->targetReference;
3660         if (id)
3661                 ZOOM_options_setl(c->tasks->u.package->options,
3662                                                         "targetReference", (char*) id->buf, id->len);
3663         
3664         // taskStatus
3665         switch ( *taskPackage->taskStatus ) {
3666                 case Z_TaskPackage_pending:
3667                         ZOOM_options_set(c->tasks->u.package->options,"taskStatus", "pending");
3668                         break;
3669                 case Z_TaskPackage_active:
3670                         ZOOM_options_set(c->tasks->u.package->options,"taskStatus", "active");
3671                         break;
3672                 case Z_TaskPackage_complete:
3673                         ZOOM_options_set(c->tasks->u.package->options,"taskStatus", "complete");
3674                         break;
3675                 case Z_TaskPackage_aborted:
3676                         ZOOM_options_set(c->tasks->u.package->options,"taskStatus", "aborted");
3677                         if ( taskPackage->num_packageDiagnostics && taskPackage->packageDiagnostics )
3678                                 response_diag(c, taskPackage->packageDiagnostics[0]);
3679                         break;
3680         }
3681         
3682         // taskSpecificParameters
3683         // NOTE: Only Update implemented, no others.
3684         if ( taskPackage->taskSpecificParameters->which == Z_External_update ) {
3685                         Z_IUUpdateTaskPackage *utp = taskPackage->taskSpecificParameters->u.update->u.taskPackage;
3686                         es_response_taskpackage_update(c, utp);
3687         }