X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fzoom.h;h=e46070486380d539afcce1eaf8ea4e8978b82d17;hp=c450adfcf8d58b118072dba9527d429c80d62dd9;hb=32790840d73b1f4a4bde1478e6b14699aac00e94;hpb=f0476c98735293629895df18be7ad965146676f8

diff --git a/include/yaz/zoom.h b/include/yaz/zoom.h
index c450adf..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-2010 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:
@@ -140,6 +140,10 @@ ZOOM_diag_str (int error);
 #define ZOOM_ERROR_CQL_TRANSFORM 10012
 #define ZOOM_ERROR_CCL_CONFIG 10013
 #define ZOOM_ERROR_CCL_PARSE 10014
+#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);
@@ -215,15 +219,17 @@ ZOOM_resultset_get_facet_field(ZOOM_resultset r, const char *facet_name);
 ZOOM_API(ZOOM_facet_field)
 ZOOM_resultset_get_facet_field_by_index(ZOOM_resultset r, int pos);
 
-/* Optional API ? */
 /* return number of facets available */
 ZOOM_API(size_t)
-ZOOM_resultset_facet_size(ZOOM_resultset r);
+ZOOM_resultset_facets_size(ZOOM_resultset r);
 
 /* retrieve (array of pointers to) facet fields */
-ZOOM_API(void)
-ZOOM_resultset_facets(ZOOM_resultset r, ZOOM_facet_field *recs,
-                       size_t start, size_t count);
+ZOOM_API(ZOOM_facet_field *)
+ZOOM_resultset_facets(ZOOM_resultset r);
+
+/* retrieve (array of pointers to) facet fields */
+ZOOM_API(const char **)
+ZOOM_resultset_facets_names(ZOOM_resultset r);
 
 
 
@@ -246,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 */
 
@@ -282,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)
@@ -290,6 +296,11 @@ ZOOM_query_prefix(ZOOM_query s, const char *str);
 /* specify sort criteria for search */
 ZOOM_API(int)
 ZOOM_query_sortby(ZOOM_query s, const char *criteria);
+ZOOM_API(int)
+ZOOM_query_sortby2(ZOOM_query s, const char *strategy, const char *criteria);
+
+ZOOM_API(void)
+ZOOM_query_addref(ZOOM_query s);
 
 /* ----------------------------------------------------------- */
 /* scan */
@@ -381,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);
@@ -410,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
@@ -451,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:
@@ -489,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)
 
@@ -552,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
 
 /*