iochan_man_t in logic.c gone

[pazpar2-moved-to-github.git] / src / pazpar2.h

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 158e2fb..7a55262 100644 (file)
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 2006-2010 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
@@ -48,6 +48,7 @@ enum pazpar2_error_code {
     PAZPAR2_CONFIG_TARGET,
     PAZPAR2_RECORD_FAIL,
     PAZPAR2_NOT_IMPLEMENTED,
+    PAZPAR2_NO_SERVICE,
 
     PAZPAR2_LAST_ERROR
 };
@@ -110,7 +111,7 @@ struct session {
     struct relevance *relevance;
     struct reclist *reclist;
     struct session_watchentry watchlist[SESSION_WATCH_MAX + 1];
-    int total_hits;
+    Odr_int total_hits;
     int total_records;
     int total_merged;
     int number_of_warnings_unknown_elements;
@@ -126,14 +127,14 @@ struct statistics {
     int num_idle;
     int num_failed;
     int num_error;
-    int num_hits;
+    Odr_int num_hits;
     int num_records;
 };
 
 struct hitsbytarget {
     char *id;
     const char *name;
-    int hits;
+    Odr_int hits;
     int diagnostic;
     int records;
     const char *state;
@@ -151,7 +152,7 @@ enum pazpar2_error_code search(struct session *s, const char *query,
                                const char *startrecs, const char *maxrecs,
                                const char *filter, const char **addinfo);
 struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, int start,
-        int *num, int *total, int *sumhits, NMEM nmem_show);
+        int *num, int *total, Odr_int *sumhits, NMEM nmem_show);
 struct record_cluster *show_single(struct session *s, const char *id,
                                    struct record_cluster **prev_r,
                                    struct record_cluster **next_r);
@@ -161,10 +162,7 @@ int session_active_clients(struct session *s);
 void session_apply_setting(struct session *se, char *dbname, char *setting, char *value);
 const char *session_setting_oneval(struct session_database *db, int offset);
 
-void pazpar2_add_channel(IOCHAN c);
-void pazpar2_event_loop(void);
-
-int host_getaddrinfo(struct host *host);
+int host_getaddrinfo(struct host *host, iochan_man_t iochan_man);
 
 struct record *ingest_record(struct client *cl, const char *rec,
                              int record_no);