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 a7047c7..9d42c37 100644 (file)
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.h,v 1.30 2007-04-20 15:36:48 quinn 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.
@@ -61,15 +61,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 {
@@ -92,6 +83,7 @@ struct connection {
     char *ibuf;
     int ibufsize;
     enum {
+        Conn_Resolving,
         Conn_Connecting,
         Conn_Open,
         Conn_Waiting,
@@ -126,17 +118,11 @@ struct client {
     struct client *next;
 };
 
-#define SESSION_WATCH_RECORDS   0
-#define SESSION_WATCH_MAX       0
-
-#define SESSION_MAX_TERMLISTS 10
-
-typedef void (*session_watchfun)(void *data);
-
-struct named_termlist
-{
-    char *name;
-    struct termlist *termlist;
+// 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
@@ -150,6 +136,19 @@ struct session_database
     struct session_database *next;
 };
 
+#define SESSION_WATCH_RECORDS   0
+#define SESSION_WATCH_MAX       0
+
+#define SESSION_MAX_TERMLISTS 10
+
+typedef void (*session_watchfun)(void *data);
+
+struct named_termlist
+{
+    char *name;
+    struct termlist *termlist;
+};
+
 // End-user session
 struct session {
     struct session_database *databases;  // All databases, settings overriden
@@ -239,7 +238,8 @@ 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