/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data.
+ * Copyright (C) 1995-2010 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:
#include <yaz/zoom.h>
#include <yaz/sortspec.h>
#include <yaz/srw.h>
+#include <yaz/mutex.h>
+
+#define SHPTR 1
+#define ZOOM_RESULT_LISTS 0
typedef struct ZOOM_Event_p *ZOOM_Event;
#define STATE_CONNECTING 1
#define STATE_ESTABLISHED 2
+#if ZOOM_RESULT_LISTS
+typedef struct ZOOM_resultsets_p *ZOOM_resultsets;
+#endif
+
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
ZOOM_task tasks;
ZOOM_options options;
+#if ZOOM_RESULT_LISTS
+ 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 */
+};
+
+#if ZOOM_RESULT_LISTS
+struct ZOOM_resultsets_p {
+ ZOOM_resultset resultset;
+ ZOOM_resultsets next;
};
+#endif
struct ZOOM_options_entry {
char *name;
Z_SortKeySpecList *r_sort_spec;
ZOOM_query query;
int refcount;
- int size;
+ Odr_int size;
int step;
int piggyback;
char *setname;
ZOOM_record_cache record_hash[RECORD_HASH_SIZE];
ZOOM_options options;
ZOOM_connection connection;
- ZOOM_resultset next;
char **databaseNames;
int num_databaseNames;
+ YAZ_MUTEX mutex;
+#if SHPTR
+ struct WRBUF_shptr *record_wrbuf;
+#endif
+#if ZOOM_RESULT_LISTS
+#else
+ ZOOM_resultset next;
+#endif
};
struct ZOOM_record_p {
ODR odr;
- WRBUF wrbuf_marc;
- WRBUF wrbuf_iconv;
+#if SHPTR
+ struct WRBUF_shptr *record_wrbuf;
+#else
+ WRBUF wrbuf;
+#endif
+
Z_NamePlusRecord *npr;
const char *schema;