X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.h;h=c16c369a7d74b4f9b3305747e603775585a4cabf;hb=6639c716d02ad6117ae6053ca18160dbb21a404a;hp=d7cb1493222cdfe53b5055deea028997b006a32c;hpb=66e0e8a545c0c303f2fc988ac6732e9d9438a937;p=pazpar2-moved-to-github.git

diff --git a/src/client.h b/src/client.h
index d7cb149..c16c369 100644
--- a/src/client.h
+++ b/src/client.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2009 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -34,9 +34,7 @@ enum client_state
     Client_Working,
     Client_Error,
     Client_Failed,
-    Client_Disconnected,
-    Client_Stopped,
-    Client_Continue
+    Client_Disconnected
 };
 
 int client_show_raw_begin(struct client *cl, int position,
@@ -45,8 +43,8 @@ int client_show_raw_begin(struct client *cl, int position,
                           void (*error_handler)(void *data, const char *addinfo),
                           void (*record_handler)(void *data, const char *buf,
                                                  size_t sz),
-                          void **data2,
                           int binary);
+
 void client_show_raw_remove(struct client *cl, void *rr);
 
 const char *client_get_state_str(struct client *cl);
@@ -73,7 +71,8 @@ void client_destroy(struct client *c);
 
 void client_set_connection(struct client *cl, struct connection *con);
 void client_disconnect(struct client *cl);
-int client_prep_connection(struct client *cl);
+int client_prep_connection(struct client *cl,
+                           int operation_timeout, int session_timeout);
 void client_start_search(struct client *cl);
 void client_set_session(struct client *cl, struct session *se);
 int client_is_active(struct client *cl);
@@ -92,7 +91,9 @@ const char *client_get_url(struct client *cl);
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+