reverting to exit call, as it might be dangerous to have a dictionary which is not...

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

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 78862fb..9d42c37 100644 (file)
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.h,v 1.21 2007-04-10 08:48:56 adam Exp $
+/* $Id: pazpar2.h,v 1.33 2007-04-22 16:41:42 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -22,7 +22,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef PAZPAR2_H
 #define PAZPAR2_H
 
-struct record;
 
 #include <netdb.h>
 
@@ -40,39 +39,9 @@ struct record;
 #include "eventl.h"
 #include "config.h"
 
+struct record;
 struct client;
 
-union data_types {
-    char *text;
-    struct {
-        int min;
-        int max;
-    } number;
-};
-
-struct record_metadata {
-    union data_types data;
-    struct record_metadata *next; // next item of this name
-};
-
-struct record {
-    struct client *client;
-    struct record_metadata **metadata; // Array mirrors list of metadata fields in config
-    union data_types **sortkeys;       // Array mirrors list of sortkey fields in config
-    struct record *next;  // Next in cluster of merged records
-};
-
-struct record_cluster
-{
-    struct record_metadata **metadata; // Array mirrors list of metadata fields in config
-    union data_types **sortkeys;
-    char *merge_key;
-    int relevance;
-    int *term_frequency_vec;
-    int recid; // Set-specific ID for this record
-    struct record *records;
-};
-
 struct connection;
 
 // Represents a host (irrespective of databases)
@@ -87,21 +56,11 @@ struct host {
 struct database {
     struct host *host;
     char *url;
-    char *name;
     char **databases;
     int errors;
     struct zr_explain *explain;
     struct setting **settings;
     struct database *next;
-    CCL_bibset ccl_map;
-    yaz_marc_t yaz_marc;
-    struct database_retrievalmap *map;
-};
-
-// Normalization filter chain. Turns incoming record into internal representation
-struct database_retrievalmap {
-    xsltStylesheet *stylesheet;
-    struct database_retrievalmap *next;
 };
 
 struct database_criterion_value {
@@ -124,6 +83,7 @@ struct connection {
     char *ibuf;
     int ibufsize;
     enum {
+        Conn_Resolving,
         Conn_Connecting,
         Conn_Open,
         Conn_Waiting,
@@ -133,9 +93,10 @@ struct connection {
 
 // Represents client state for a connection to one search target
 struct client {
-    struct database *database;
+    struct session_database *database;
     struct connection *connection;
     struct session *session;
+    char *pquery; // Current search
     int hits;
     int records;
     int setno;
@@ -157,6 +118,24 @@ struct client {
     struct client *next;
 };
 
+// Normalization filter. Turns incoming record into internal representation
+// Simple sequence of stylesheets run in series.
+struct database_retrievalmap {
+    xsltStylesheet *stylesheet;
+    struct database_retrievalmap *next;
+};
+
+// Represents a database as viewed from one session, possibly with settings overriden
+// for that session
+struct session_database
+{
+    struct database *database;
+    struct setting **settings;
+    yaz_marc_t yaz_marc;
+    struct database_retrievalmap *map;
+    struct session_database *next;
+};
+
 #define SESSION_WATCH_RECORDS   0
 #define SESSION_WATCH_MAX       0
 
@@ -170,20 +149,11 @@ struct named_termlist
     struct termlist *termlist;
 };
 
-// Represents a database as viewed from one session, possibly with settings overriden
-// for that session (to support authorization/authentication)
-struct session_database
-{
-    struct database *database;
-    struct setting *settings;
-    struct session_database *next;
-};
-
 // End-user session
 struct session {
-    struct client *clients;
+    struct session_database *databases;  // All databases, settings overriden
+    struct client *clients;              // Clients connected for current search
     int requestid; 
-    char query[1024];
     NMEM session_nmem;  // Nmem for session-permanent storage
     NMEM nmem;          // Nmem for each operation (i.e. search, result set, etc)
     WRBUF wrbuf;        // Wrbuf for scratch(i.e. search)
@@ -257,6 +227,19 @@ struct record_cluster *show_single(struct session *s, int 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_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);
+
+void start_http_listener(void);
+void start_proxy(void);
+void start_zproxy(void);
+
+extern struct parameters global_parameters;
+void pazpar2_add_channel(IOCHAN c);
+void pazpar2_event_loop(void);
+
+int host_getaddrinfo(struct host *host);
+void connect_resolver_host(struct host *host);
 
 #endif