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
Namespaces more or less in correct place
[yaz-moved-to-github.git]
/
src
/
zoom-p.h
diff --git
a/src/zoom-p.h
b/src/zoom-p.h
index
3041928
..
0f53b04
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-2011 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:
@@
-48,7
+48,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;
@@
-64,7
+64,6
@@
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
char *host_port;
enum oid_proto proto;
COMSTACK cs;
char *host_port;
- char *path;
int error;
char *addinfo;
char *diagset;
int error;
char *addinfo;
char *diagset;
@@
-74,11
+73,14
@@
struct ZOOM_connection_p {
ODR odr_in;
ODR odr_out;
ODR odr_print;
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 *buf_in;
int len_in;
char *buf_out;
int len_out;
char *proxy;
+ char *tproxy;
char *charset;
char *lang;
char *cookie_out;
char *charset;
char *lang;
char *cookie_out;
@@
-111,6
+113,7
@@
struct ZOOM_connection_p {
int log_details;
int log_api;
int log_details;
int log_api;
+ WRBUF saveAPDU_wrbuf;
};
#if ZOOM_RESULT_LISTS
};
#if ZOOM_RESULT_LISTS
@@
-132,7
+135,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;
@@
-196,6
+198,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
@@
-205,6
+208,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
@@
-255,8
+259,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,
@@
-264,7
+269,8
@@
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);
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);
int ZOOM_uri_to_code(const char *uri);
@@
-272,7
+278,7
@@
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 ZOOM_connection_srw_send_scan(ZOOM_connection c);
int ZOOM_handle_sru(ZOOM_connection c, Z_HTTP_Response *hres,
- zoom_ret *cret);
+ zoom_ret *cret, char **addinfo);
void ZOOM_set_HTTP_error(ZOOM_connection c, int error,
const char *addinfo, const char *addinfo2);
void ZOOM_set_HTTP_error(ZOOM_connection c, int error,
const char *addinfo, const char *addinfo2);
@@
-280,6
+286,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: