X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=5ba1584ae4ecd4f0609615dd5fc3f1c63a2f72e6;hb=7e025de4cfed622c3bcd95c99fd6e90e71cb05fc;hp=2f5a4e2e18c69a2d0506ccfaa6d3668e9bf54f82;hpb=4d4deab1ab8bfec73a481ae43127687d13826146;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 2f5a4e2..5ba1584 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.h,v 1.29 2007-04-20 13:03:22 marc Exp $
+/* $Id: pazpar2.h,v 1.36 2007-05-10 11:46:09 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -38,20 +38,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "reclists.h"
 #include "eventl.h"
 #include "config.h"
+#include "parameters.h"
 
 struct record;
 struct client;
 
-struct connection;
-
-// Represents a host (irrespective of databases)
-struct host {
-    char *hostport;
-    char *ipport;
-    struct connection *connections; // All connections to this
-    struct host *next;
-};
-
 // Represents a (virtual) database on a host
 struct database {
     struct host *host;
@@ -61,15 +52,6 @@ struct database {
     struct zr_explain *explain;
     struct setting **settings;
     struct database *next;
-    yaz_marc_t yaz_marc;
-    struct database_retrievalmap *map;
-};
-
-// Normalization filter. Turns incoming record into internal representation
-// Simple sequence of stylesheets run in series.
-struct database_retrievalmap {
-    xsltStylesheet *stylesheet;
-    struct database_retrievalmap *next;
 };
 
 struct database_criterion_value {
@@ -83,47 +65,23 @@ struct database_criterion {
     struct database_criterion *next;
 };
 
-// Represents a physical, reusable  connection to a remote Z39.50 host
-struct connection {
-    IOCHAN iochan;
-    COMSTACK link;
-    struct host *host;
-    struct client *client;
-    char *ibuf;
-    int ibufsize;
-    enum {
-        Conn_Connecting,
-        Conn_Open,
-        Conn_Waiting,
-    } state;
-    struct connection *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 client state for a connection to one search target
-struct client {
-    struct session_database *database;
-    struct connection *connection;
-    struct session *session;
-    char *pquery; // Current search
-    int hits;
-    int records;
-    int setno;
-    int requestid;                              // ID of current outstanding request
-    int diagnostic;
-    enum client_state
-    {
-        Client_Connecting,
-        Client_Connected,
-	Client_Idle,
-        Client_Initializing,
-        Client_Searching,
-        Client_Presenting,
-        Client_Error,
-        Client_Failed,
-        Client_Disconnected,
-        Client_Stopped
-    } state;
-    struct client *next;
+// Represents a database as viewed from one session, possibly with settings overriden
+// for that session
+struct session_database
+{
+    pp2_charset_t pct;
+    struct database *database;
+    struct setting **settings;
+    yaz_marc_t yaz_marc;
+    struct database_retrievalmap *map;
+    struct session_database *next;
 };
 
 #define SESSION_WATCH_RECORDS   0
@@ -139,15 +97,6 @@ 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 session_database *databases;  // All databases, settings overriden
@@ -190,29 +139,10 @@ struct hitsbytarget {
     int hits;
     int diagnostic;
     int records;
-    char* state;
+    const char *state;
     int connected;
 };
 
-struct parameters {
-    char proxy_override[128];
-    char listener_override[128];
-    char zproxy_override[128];
-    char settings_path_override[128];
-    struct conf_server *server;
-    int dump_records;
-    int timeout;		/* operations timeout, in seconds */
-    char implementationId[128];
-    char implementationName[128];
-    char implementationVersion[128];
-    int target_timeout; // seconds
-    int session_timeout;
-    int toget;
-    int chunk;
-    ODR odr_out;
-    ODR odr_in;
-};
-
 struct hitsbytarget *hitsbytarget(struct session *s, int *count);
 int select_targets(struct session *se, struct database_criterion *crit);
 struct session *new_session(NMEM nmem);
@@ -233,11 +163,17 @@ 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);
+
+xmlDoc *normalize_record(struct session_database *sdb, Z_External *rec);
 
+struct record *ingest_record(struct client *cl, Z_External *rec,
+                             int record_no);
+void session_alert_watch(struct session *s, int what);
+void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num);
 
 #endif