Mutex protect the session

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

diff --git a/src/pazpar2.h b/src/pazpar2.h
index bb46b52..c814be7 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
@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "termlists.h"
 #include "reclists.h"
-#include "pazpar2_config.h"
 #include "http.h"
 
 struct record;
@@ -48,15 +47,12 @@ enum pazpar2_error_code {
     PAZPAR2_CONFIG_TARGET,
     PAZPAR2_RECORD_FAIL,
     PAZPAR2_NOT_IMPLEMENTED,
+    PAZPAR2_NO_SERVICE,
 
     PAZPAR2_LAST_ERROR
 };
 
-enum pazpar2_database_criterion_type {
-    PAZPAR2_STRING_MATCH,
-    PAZPAR2_SUBSTRING_MATCH
-};
-
+struct host;
 // Represents a (virtual) database on a host
 struct database {
     struct host *host;
@@ -69,17 +65,6 @@ struct database {
     struct database *next;
 };
 
-struct database_criterion_value {
-    char *value;
-    struct database_criterion_value *next;
-};
-
-struct database_criterion {
-    char *name;
-    enum pazpar2_database_criterion_type type;
-    struct database_criterion_value *values;
-    struct database_criterion *next;
-};
 
 // Represents a database as viewed from one session, possibly with settings overriden
 // for that session
@@ -92,8 +77,6 @@ struct session_database
     struct session_database *next;
 };
 
-
-
 #define SESSION_WATCH_SHOW      0
 #define SESSION_WATCH_RECORD    1
 #define SESSION_WATCH_MAX       1
@@ -127,12 +110,13 @@ 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;
     int number_of_warnings_unknown_metadata;
     normalize_cache_t normalize_cache;
+    YAZ_MUTEX mutex;
 };
 
 struct statistics {
@@ -143,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;
@@ -159,7 +143,6 @@ struct hitsbytarget {
 };
 
 struct hitsbytarget *hitsbytarget(struct session *s, int *count, NMEM nmem);
-int select_targets(struct session *se, struct database_criterion *crit);
 struct session *new_session(NMEM nmem, struct conf_service *service);
 void destroy_session(struct session *s);
 void session_init_databases(struct session *s);
@@ -168,24 +151,25 @@ void statistics(struct session *s, struct statistics *stat);
 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);
-struct record_cluster *show_single(struct session *s, const char *id,
-                                   struct record_cluster **prev_r,
-                                   struct record_cluster **next_r);
+struct record_cluster **show_range_start(struct session *s,
+                                         struct reclist_sortparms *sp,
+                                         int start,
+                                         int *num, int *total, Odr_int *sumhits);
+void show_range_stop(struct session *s, struct record_cluster **recs);
+
+struct record_cluster *show_single_start(struct session *s, const char *id,
+                                         struct record_cluster **prev_r,
+                                         struct record_cluster **next_r);
+void show_single_stop(struct session *s, struct record_cluster *rec);
 struct termlist_score **termlist(struct session *s, const char *name, int *num);
 int session_set_watch(struct session *s, int what, session_watchfun fun, void *data, struct http_channel *c);
 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);
+int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem);
 void session_alert_watch(struct session *s, int what);
 void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num);