X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=70bb2e46ab6086a597162e08511d00535328b50b;hp=f0eb8a89717003007e4e349bbd47cfec9ddc5181;hb=e746aded3630be444c66f12e341a63413df92371;hpb=63c48920fd45817bf28177279f65099670fe258b diff --git a/src/zoom-p.h b/src/zoom-p.h index f0eb8a8..70bb2e4 100644 --- a/src/zoom-p.h +++ b/src/zoom-p.h @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data. + * Copyright (C) 1995-2013 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: @@ -37,7 +37,6 @@ #include #define SHPTR 1 -#define ZOOM_RESULT_LISTS 0 typedef struct ZOOM_Event_p *ZOOM_Event; @@ -45,9 +44,10 @@ typedef enum { zoom_sru_error, zoom_sru_soap, zoom_sru_get, - zoom_sru_post + zoom_sru_post, + zoom_sru_solr } zoom_sru_mode; - + typedef struct ZOOM_task_p *ZOOM_task; @@ -55,15 +55,10 @@ typedef struct ZOOM_task_p *ZOOM_task; #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; char *host_port; - char *path; int error; char *addinfo; char *diagset; @@ -73,11 +68,14 @@ struct ZOOM_connection_p { ODR odr_in; ODR odr_out; ODR odr_print; + ODR odr_save; + char *buf_in; int len_in; char *buf_out; int len_out; char *proxy; + char *tproxy; char *charset; char *lang; char *cookie_out; @@ -88,6 +86,7 @@ struct ZOOM_connection_p { char *user; char *group; char *password; + int url_authentication; int async; int support_named_resultsets; @@ -98,11 +97,7 @@ struct ZOOM_connection_p { 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; @@ -110,32 +105,9 @@ struct ZOOM_connection_p { int log_details; int log_api; + WRBUF saveAPDU_wrbuf; }; -#if ZOOM_RESULT_LISTS -struct ZOOM_resultsets_p { - ZOOM_resultset resultset; - ZOOM_resultsets next; -}; -#endif - -struct ZOOM_options_entry { - char *name; - char *value; - int len; /* of `value', which may contain NULs */ - struct ZOOM_options_entry *next; -}; - -struct ZOOM_options_p { - int refcount; - void *callback_handle; - ZOOM_options_callback callback_func; - struct ZOOM_options_entry *entries; - ZOOM_options parent1; - ZOOM_options parent2; -}; - - typedef struct ZOOM_record_cache_p *ZOOM_record_cache; #define RECORD_HASH_SIZE 131 @@ -148,7 +120,6 @@ struct ZOOM_resultset_p { int step; int piggyback; char *setname; - char *schema; ODR odr; ZOOM_record_cache record_hash[RECORD_HASH_SIZE]; ZOOM_options options; @@ -159,32 +130,12 @@ struct ZOOM_resultset_p { #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 { - ODR odr; -#if SHPTR - struct WRBUF_shptr *record_wrbuf; -#else - WRBUF wrbuf; -#endif - - Z_NamePlusRecord *npr; - const char *schema; - - const char *diag_uri; - const char *diag_message; - const char *diag_details; - const char *diag_set; -}; - struct facet_term_p { char *term; int frequency; @@ -196,16 +147,6 @@ struct ZOOM_facet_field_p { struct facet_term_p *facet_terms; }; - -struct ZOOM_record_cache_p { - struct ZOOM_record_p rec; - char *elementSetName; - char *syntax; - char *schema; - int pos; - ZOOM_record_cache next; -}; - struct ZOOM_scanset_p { int refcount; ODR odr; @@ -239,6 +180,7 @@ struct ZOOM_task_p { ZOOM_resultset resultset; char *syntax; char *elementSetName; + char *schema; int recv_search_fired; } search; #define ZOOM_TASK_RETRIEVE 2 @@ -248,6 +190,7 @@ struct ZOOM_task_p { int count; char *syntax; char *elementSetName; + char *schema; } retrieve; #define ZOOM_TASK_CONNECT 3 #define ZOOM_TASK_SCAN 4 @@ -265,12 +208,6 @@ struct ZOOM_task_p { ZOOM_task next; }; -struct ZOOM_Event_p { - int kind; - ZOOM_Event next; - ZOOM_Event prev; -}; - typedef enum { zoom_pending, zoom_complete @@ -304,8 +241,9 @@ int ZOOM_test_reconnect(ZOOM_connection c); ZOOM_record ZOOM_record_cache_lookup(ZOOM_resultset r, int pos, const char *syntax, - const char *elementSetName); -void ZOOM_record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr, + const char *elementSetName, + const char *schema); +void ZOOM_record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr, int pos, const char *syntax, const char *elementSetName, const char *schema, @@ -313,7 +251,25 @@ void ZOOM_record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr, Z_Query *ZOOM_query_get_Z_Query(ZOOM_query s); Z_SortKeySpecList *ZOOM_query_get_sortspec(ZOOM_query s); -char *ZOOM_query_get_query_string(ZOOM_query s); +const char *ZOOM_query_get_query_string(ZOOM_query s); +const char *ZOOM_query_get_sru11(ZOOM_query s); + +int ZOOM_uri_to_code(const char *uri); + +zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c); +zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c); + +int ZOOM_handle_sru(ZOOM_connection c, Z_HTTP_Response *hres, + zoom_ret *cret, char **addinfo); + +void ZOOM_set_HTTP_error(ZOOM_connection c, int error, + const char *addinfo, const char *addinfo2); + +ZOOM_Event ZOOM_connection_get_event(ZOOM_connection c); +void ZOOM_connection_remove_events(ZOOM_connection c); +void ZOOM_Event_destroy(ZOOM_Event event); +zoom_ret ZOOM_send_GDU(ZOOM_connection c, Z_GDU *gdu); +void ZOOM_handle_facet_list(ZOOM_resultset r, Z_FacetList *fl); /* * Local variables: