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

diff --git a/include/yaz/zoom.h b/include/yaz/zoom.h
index c450adf..baa2246 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) 1995-2012 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,9 @@ 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
 
 ZOOM_API(int)
 ZOOM_connection_last_event(ZOOM_connection cs);
@@ -215,15 +218,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);
 
 
 
@@ -290,6 +295,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 */
@@ -552,6 +562,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
 
 /*