X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-p.h;h=be1107ee1842d6159fe4e332252d16e5c023e08b;hb=00537b483d646bd04a204708ecbde708861f044e;hp=1692e5cbe51f5e41f227c873a24fe9a37118a3ec;hpb=0ae46bd1e19dcc853c758af505c6f62f1f6be060;p=yaz-moved-to-github.git

diff --git a/src/zoom-p.h b/src/zoom-p.h
index 1692e5c..be1107e 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-2012 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:
@@ -45,9 +45,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;
 
@@ -63,7 +64,6 @@ struct ZOOM_connection_p {
     enum oid_proto proto;
     COMSTACK cs;
     char *host_port;
-    char *path;
     int error;
     char *addinfo;
     char *diagset;
@@ -73,11 +73,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;
@@ -255,7 +258,7 @@ 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, 
+void ZOOM_record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr,
                            int pos,
                            const char *syntax, const char *elementSetName,
                            const char *schema,
@@ -263,7 +266,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);
-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);
 
@@ -271,7 +275,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 *cret);
+                    zoom_ret *cret, char **addinfo);
 
 void ZOOM_set_HTTP_error(ZOOM_connection c, int error,
                          const char *addinfo, const char *addinfo2);