X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fzoom.h;h=e46070486380d539afcce1eaf8ea4e8978b82d17;hp=63ebc14cdaa350dd246cbfe674ab35b410eaba26;hb=32790840d73b1f4a4bde1478e6b14699aac00e94;hpb=57cae124c6a1c7cdd8c70090db636b227887fc19 diff --git a/include/yaz/zoom.h b/include/yaz/zoom.h index 63ebc14..e460704 100644 --- a/include/yaz/zoom.h +++ b/include/yaz/zoom.h @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data. + * Copyright (C) Index Data. * All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -143,6 +143,7 @@ ZOOM_diag_str (int error); #define ZOOM_ERROR_ES_INVALID_ACTION 10015 #define ZOOM_ERROR_ES_INVALID_VERSION 10016 #define ZOOM_ERROR_ES_INVALID_SYNTAX 10017 +#define ZOOM_ERROR_MEMCACHED 10018 ZOOM_API(int) ZOOM_connection_last_event(ZOOM_connection cs); @@ -251,7 +252,7 @@ ZOOM_record_clone(ZOOM_record srec); ZOOM_API(int) ZOOM_record_error(ZOOM_record rec, const char **msg, const char **addinfo, const char **diagset); - + /* ----------------------------------------------------------- */ /* facets */ @@ -287,7 +288,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn); /* CCL translated client-side into RPN: `conn' is optional for diagnostics */ ZOOM_API(int) ZOOM_query_ccl2rpn(ZOOM_query s, const char *query_str, - const char *config, + const char *config, int *ccl_error, const char **error_string, int *error_pos); /* PQF */ ZOOM_API(int) @@ -391,7 +392,7 @@ ZOOM_options_getl(ZOOM_options opt, const char *name, int *lenp); ZOOM_API(void) ZOOM_options_set(ZOOM_options opt, const char *name, const char *v); - + ZOOM_API(void) ZOOM_options_setl(ZOOM_options opt, const char *name, const char *value, int len); @@ -420,7 +421,7 @@ ZOOM_options_set_int(ZOOM_options opt, const char *name, int value); \param cs connection array \retval 0 no event was fired \retval >0 event was fired for connection at (retval-1) - + blocking poll for events on a number of connections. Returns positive integer if event occurred ; zero if none occurred and no more events are pending. The positive integer specifies the @@ -461,7 +462,7 @@ ZOOM_event_nonblock(int no, ZOOM_connection *cs); \retval 0 no event was processed \retval 1 event was processed for connection - This function attemps to deal with outstandings events in + This function attemps to deal with outstandings events in a non-blocking fashion. If no event was processed (return value of 0), then the system should attempt to deal with sockets in blocking mode using socket select/poll which means calling the following functions: @@ -499,7 +500,7 @@ ZOOM_API(int) ZOOM_connection_get_socket(ZOOM_connection c); -/** \brief get socket mask for connection +/** \brief get socket mask for connection \param c connection \returns mask for connection (possibly 0) @@ -562,6 +563,15 @@ ZOOM_connection_peek_event(ZOOM_connection c); ZOOM_API(const char *) ZOOM_get_event_str(int event); +#ifdef WRBUF_H + +/** \brief log APDUs to WRBUF + \param c connection + \param w WRBUF where APDUs are logged +*/ +ZOOM_API(void) ZOOM_connection_save_apdu_wrbuf(ZOOM_connection c, WRBUF w); +#endif + ZOOM_END_CDECL /*