X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=35352215518a6be2e934b6ae8cafbe55c1c60af5;hp=d4459578842fe5df721163691b2bc5d16657142b;hb=5ba7734cc97eef6688596180b7faf535ee249976;hpb=6d20344358c013b71bf23a93f1998fc6036c1aef diff --git a/src/zoom-p.h b/src/zoom-p.h index d445957..3535221 100644 --- a/src/zoom-p.h +++ b/src/zoom-p.h @@ -1,19 +1,42 @@ -/* - * Copyright (C) 1995-2005, Index Data ApS - * See the file LICENSE for details. +/* This file is part of the YAZ toolkit. + * 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: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Index Data nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. * - * $Id: zoom-p.h,v 1.9 2005-10-17 12:25:39 mike Exp $ + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** * \file zoom-p.h * \brief Internal header for ZOOM implementation */ - #include +#include #include #include #include #include +#include +#include + typedef struct ZOOM_Event_p *ZOOM_Event; struct ZOOM_query_p { @@ -24,15 +47,21 @@ struct ZOOM_query_p { char *query_string; }; +typedef enum { + zoom_sru_error, + zoom_sru_soap, + zoom_sru_get, + zoom_sru_post +} zoom_sru_mode; + + typedef struct ZOOM_task_p *ZOOM_task; #define STATE_IDLE 0 #define STATE_CONNECTING 1 #define STATE_ESTABLISHED 2 -#define ZOOM_SELECT_READ 1 -#define ZOOM_SELECT_WRITE 2 -#define ZOOM_SELECT_EXCEPT 4 +typedef struct ZOOM_resultsets_p *ZOOM_resultsets; struct ZOOM_connection_p { enum oid_proto proto; @@ -47,6 +76,7 @@ struct ZOOM_connection_p { int reconnect_ok; ODR odr_in; ODR odr_out; + ODR odr_print; char *buf_in; int len_in; char *buf_out; @@ -57,16 +87,34 @@ struct ZOOM_connection_p { char *cookie_out; char *cookie_in; char *client_IP; + char *sru_version; + + char *user; + char *group; + char *password; + int async; int support_named_resultsets; int last_event; + + int maximum_record_size; + int preferred_message_size; + ZOOM_task tasks; ZOOM_options options; - ZOOM_resultset resultsets; + ZOOM_resultsets resultsets; 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 */ +}; + +struct ZOOM_resultsets_p { + ZOOM_resultset resultset; + ZOOM_resultsets next; }; + struct ZOOM_options_entry { char *name; char *value; @@ -83,32 +131,44 @@ struct ZOOM_options_p { ZOOM_options parent2; }; + typedef struct ZOOM_record_cache_p *ZOOM_record_cache; +#define RECORD_HASH_SIZE 131 + struct ZOOM_resultset_p { Z_SortKeySpecList *r_sort_spec; ZOOM_query query; int refcount; - int size; - int start; - int count; + Odr_int size; int step; int piggyback; char *setname; char *schema; ODR odr; - ZOOM_record_cache record_cache; + 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; }; struct ZOOM_record_p { ODR odr; - WRBUF wrbuf_marc; - WRBUF wrbuf_iconv; - WRBUF wrbuf_opac; + WRBUF wrbuf; 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; }; struct ZOOM_record_cache_p { @@ -125,9 +185,12 @@ struct ZOOM_scanset_p { ODR odr; ZOOM_options options; ZOOM_connection connection; - Z_AttributesPlusTerm *termListAndStartPoint; - Z_AttributeSetId *attributeSet; + ZOOM_query query; Z_ScanResponse *scan_response; + Z_SRW_scanResponse *srw_scan_response; + + char **databaseNames; + int num_databaseNames; }; struct ZOOM_package_p { @@ -145,13 +208,20 @@ struct ZOOM_task_p { union { #define ZOOM_TASK_SEARCH 1 struct { + int count; + int start; ZOOM_resultset resultset; + char *syntax; + char *elementSetName; + int recv_search_fired; } search; #define ZOOM_TASK_RETRIEVE 2 struct { int start; ZOOM_resultset resultset; int count; + char *syntax; + char *elementSetName; } retrieve; #define ZOOM_TASK_CONNECT 3 #define ZOOM_TASK_SCAN 4 @@ -176,9 +246,11 @@ struct ZOOM_Event_p { }; void ZOOM_options_addref (ZOOM_options opt); + /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab