projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename attr facet specific functions
[yaz-moved-to-github.git]
/
src
/
zoom-p.h
diff --git
a/src/zoom-p.h
b/src/zoom-p.h
index
05f5503
..
51125b5
100644
(file)
--- a/
src/zoom-p.h
+++ b/
src/zoom-p.h
@@
-38,6
+38,7
@@
#include <yaz/mutex.h>
#define SHPTR 1
#include <yaz/mutex.h>
#define SHPTR 1
+#define ZOOM_RESULT_LISTS 0
typedef struct ZOOM_Event_p *ZOOM_Event;
typedef struct ZOOM_Event_p *ZOOM_Event;
@@
-63,7
+64,9
@@
typedef struct ZOOM_task_p *ZOOM_task;
#define STATE_CONNECTING 1
#define STATE_ESTABLISHED 2
#define STATE_CONNECTING 1
#define STATE_ESTABLISHED 2
+#if ZOOM_RESULT_LISTS
typedef struct ZOOM_resultsets_p *ZOOM_resultsets;
typedef struct ZOOM_resultsets_p *ZOOM_resultsets;
+#endif
struct ZOOM_connection_p {
enum oid_proto proto;
struct ZOOM_connection_p {
enum oid_proto proto;
@@
-104,18
+107,23
@@
struct ZOOM_connection_p {
ZOOM_task tasks;
ZOOM_options options;
ZOOM_task tasks;
ZOOM_options options;
+#if ZOOM_RESULT_LISTS
ZOOM_resultsets resultsets;
ZOOM_resultsets resultsets;
+#else
+ ZOOM_resultset resultsets;
+#endif
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
zoom_sru_mode sru_mode;
int no_redirects; /* 0 for no redirects. >0 for number of redirects */
};
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
zoom_sru_mode sru_mode;
int no_redirects; /* 0 for no redirects. >0 for number of redirects */
};
+#if ZOOM_RESULT_LISTS
struct ZOOM_resultsets_p {
ZOOM_resultset resultset;
ZOOM_resultsets next;
};
struct ZOOM_resultsets_p {
ZOOM_resultset resultset;
ZOOM_resultsets next;
};
-
+#endif
struct ZOOM_options_entry {
char *name;
struct ZOOM_options_entry {
char *name;
@@
-157,6
+165,13
@@
struct ZOOM_resultset_p {
#if SHPTR
struct WRBUF_shptr *record_wrbuf;
#endif
#if SHPTR
struct WRBUF_shptr *record_wrbuf;
#endif
+#if ZOOM_RESULT_LISTS
+#else
+ ZOOM_resultset next;
+#endif
+ ZOOM_facet_field *facets;
+ int num_facets;
+ char **facets_names;
};
struct ZOOM_record_p {
};
struct ZOOM_record_p {
@@
-170,17
+185,24
@@
struct ZOOM_record_p {
Z_NamePlusRecord *npr;
const char *schema;
Z_NamePlusRecord *npr;
const char *schema;
-#if YAZ_HAVE_XML2
- xmlChar *xml_mem;
- int xml_size;
-#endif
-
const char *diag_uri;
const char *diag_message;
const char *diag_details;
const char *diag_set;
};
const char *diag_uri;
const char *diag_message;
const char *diag_details;
const char *diag_set;
};
+struct facet_term_p {
+ char *term;
+ int frequency;
+};
+
+struct ZOOM_facet_field_p {
+ char *facet_name;
+ int num_terms;
+ struct facet_term_p *facet_terms;
+};
+
+
struct ZOOM_record_cache_p {
struct ZOOM_record_p rec;
char *elementSetName;
struct ZOOM_record_cache_p {
struct ZOOM_record_p rec;
char *elementSetName;