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
Make cs_parse_host public
[yaz-moved-to-github.git]
/
src
/
zoom-p.h
diff --git
a/src/zoom-p.h
b/src/zoom-p.h
index
fcf869f
..
70bb2e4
100644
(file)
--- a/
src/zoom-p.h
+++ b/
src/zoom-p.h
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 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:
* 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 <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;
@@
-48,7
+47,7
@@
typedef enum {
zoom_sru_post,
zoom_sru_solr
} zoom_sru_mode;
zoom_sru_post,
zoom_sru_solr
} zoom_sru_mode;
-
+
typedef struct ZOOM_task_p *ZOOM_task;
typedef struct ZOOM_task_p *ZOOM_task;
@@
-56,10
+55,6
@@
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;
-#endif
-
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
@@
-91,6
+86,7
@@
struct ZOOM_connection_p {
char *user;
char *group;
char *password;
char *user;
char *group;
char *password;
+ int url_authentication;
int async;
int support_named_resultsets;
int async;
int support_named_resultsets;
@@
-101,11
+97,7
@@
struct ZOOM_connection_p {
ZOOM_task tasks;
ZOOM_options options;
ZOOM_task tasks;
ZOOM_options options;
-#if ZOOM_RESULT_LISTS
- ZOOM_resultsets resultsets;
-#else
ZOOM_resultset resultsets;
ZOOM_resultset resultsets;
-#endif
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
zoom_sru_mode sru_mode;
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
zoom_sru_mode sru_mode;
@@
-113,15
+105,9
@@
struct ZOOM_connection_p {
int log_details;
int log_api;
int log_details;
int log_api;
+ WRBUF saveAPDU_wrbuf;
};
};
-#if ZOOM_RESULT_LISTS
-struct ZOOM_resultsets_p {
- ZOOM_resultset resultset;
- ZOOM_resultsets next;
-};
-#endif
-
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
#define RECORD_HASH_SIZE 131
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
#define RECORD_HASH_SIZE 131
@@
-134,7
+120,6
@@
struct ZOOM_resultset_p {
int step;
int piggyback;
char *setname;
int step;
int piggyback;
char *setname;
- char *schema;
ODR odr;
ZOOM_record_cache record_hash[RECORD_HASH_SIZE];
ZOOM_options options;
ODR odr;
ZOOM_record_cache record_hash[RECORD_HASH_SIZE];
ZOOM_options options;
@@
-145,10
+130,7
@@
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;
ZOOM_resultset next;
-#endif
ZOOM_facet_field *facets;
int num_facets;
char **facets_names;
ZOOM_facet_field *facets;
int num_facets;
char **facets_names;
@@
-198,6
+180,7
@@
struct ZOOM_task_p {
ZOOM_resultset resultset;
char *syntax;
char *elementSetName;
ZOOM_resultset resultset;
char *syntax;
char *elementSetName;
+ char *schema;
int recv_search_fired;
} search;
#define ZOOM_TASK_RETRIEVE 2
int recv_search_fired;
} search;
#define ZOOM_TASK_RETRIEVE 2
@@
-207,6
+190,7
@@
struct ZOOM_task_p {
int count;
char *syntax;
char *elementSetName;
int count;
char *syntax;
char *elementSetName;
+ char *schema;
} retrieve;
#define ZOOM_TASK_CONNECT 3
#define ZOOM_TASK_SCAN 4
} retrieve;
#define ZOOM_TASK_CONNECT 3
#define ZOOM_TASK_SCAN 4
@@
-257,8
+241,9
@@
int ZOOM_test_reconnect(ZOOM_connection c);
ZOOM_record ZOOM_record_cache_lookup(ZOOM_resultset r, int pos,
const char *syntax,
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,
int pos,
const char *syntax, const char *elementSetName,
const char *schema,
@@
-283,6
+268,8
@@
void ZOOM_set_HTTP_error(ZOOM_connection c, int error,
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_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:
/*
* Local variables: