X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=5ccf66723d1313a58bbcccc1a8d9668ae64e4de0;hb=245fa946733907320f50a88095d71771ce4cda6a;hp=0776874bc3ae158288c70c43b0f58b178b026deb;hpb=a09d10bb2d1e817d8f1e0de404a47c8ff3759103;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 0776874..5ccf667 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.h,v 1.41 2007-06-15 06:45:39 adam Exp $
+/* $Id: pazpar2.h,v 1.47 2007-08-17 12:39:11 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -39,6 +39,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "eventl.h"
 #include "config.h"
 #include "parameters.h"
+#include "http.h"
 
 struct record;
 struct client;
@@ -116,6 +117,12 @@ struct named_termlist
     struct termlist *termlist;
 };
 
+struct session_watchentry {
+    void *data;
+    http_channel_observer_t obs;
+    session_watchfun fun;
+};
+
 // End-user session
 struct session {
     struct session_database *databases;  // All databases, settings overriden
@@ -128,10 +135,7 @@ struct session {
     struct named_termlist termlists[SESSION_MAX_TERMLISTS];
     struct relevance *relevance;
     struct reclist *reclist;
-    struct {
-        void *data;
-        session_watchfun fun;
-    } watchlist[SESSION_WATCH_MAX + 1];
+    struct session_watchentry watchlist[SESSION_WATCH_MAX + 1];
     int expected_maxrecs;
     int total_hits;
     int total_records;
@@ -154,7 +158,7 @@ struct statistics {
 
 struct hitsbytarget {
     char *id;
-    char *name;
+    const char *name;
     int hits;
     int diagnostic;
     int records;
@@ -166,29 +170,30 @@ struct hitsbytarget *hitsbytarget(struct session *s, int *count);
 int select_targets(struct session *se, struct database_criterion *crit);
 struct session *new_session(NMEM nmem);
 void destroy_session(struct session *s);
+void session_init_databases(struct session *s);
 int load_targets(struct session *s, const char *fn);
 void statistics(struct session *s, struct statistics *stat);
 enum pazpar2_error_code search(struct session *s, char *query, 
                                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, int id);
+struct record_cluster *show_single(struct session *s, const char *id);
 struct termlist_score **termlist(struct session *s, const char *name, int *num);
-void session_set_watch(struct session *s, int what, session_watchfun fun, void *data);
+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);
-char *session_setting_oneval(struct session_database *db, int offset);
+const char *session_setting_oneval(struct session_database *db, int offset);
 
 void start_http_listener(void);
 void start_proxy(void);
-//void start_zproxy(void);
 
 void pazpar2_add_channel(IOCHAN c);
 void pazpar2_event_loop(void);
 
 int host_getaddrinfo(struct host *host);
 
-xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec);
+xmlDoc *normalize_record(struct session_database *sdb, struct session *se,
+        Z_External *rec);
 xmlDoc *record_to_xml(struct session_database *sdb, Z_External *rec);
 
 struct record *ingest_record(struct client *cl, Z_External *rec,
@@ -196,7 +201,7 @@ struct record *ingest_record(struct client *cl, Z_External *rec,
 void session_alert_watch(struct session *s, int what);
 void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num);
 
-int pazpar2_process(int debug,
+int pazpar2_process(int debug, int daemon,
                     void (*work)(void *data), void *data,
                     const char *pidfile, const char *uid);