Happy new year

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

diff --git a/src/pazpar2.h b/src/pazpar2.h
index f27e9bb..c1d6e65 100644 (file)
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2009 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
@@ -21,8 +21,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PAZPAR2_H
 
 
-#include <netdb.h>
-
 #include <libxslt/xsltutils.h>
 #include <libxslt/transform.h>
 
@@ -35,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "relevance.h"
 #include "reclists.h"
 #include "eventl.h"
-#include "config.h"
+#include "pazpar2_config.h"
 #include "parameters.h"
 #include "http.h"
 
@@ -96,7 +94,9 @@ struct session_database
 {
     struct database *database;
     struct setting **settings;
+#ifdef RETIRED
     yaz_marc_t yaz_marc;
+#endif
     struct database_retrievalmap *map;
     struct session_database *next;
 };
@@ -127,7 +127,6 @@ struct session_watchentry {
 struct session {
     struct session_database *databases;  // All databases, settings overriden
     struct client *clients;              // Clients connected for current search
-    int requestid; 
     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)
@@ -140,15 +139,15 @@ struct session {
     int total_hits;
     int total_records;
     int total_merged;
+    int number_of_warnings_unknown_elements;
+    int number_of_warnings_unknown_metadata;
 };
 
 struct statistics {
     int num_clients;
     int num_no_connection;
     int num_connecting;
-    int num_initializing;
-    int num_searching;
-    int num_presenting;
+    int num_working;
     int num_idle;
     int num_failed;
     int num_error;
@@ -184,7 +183,7 @@ 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 start_http_listener(void);
+int start_http_listener(void);
 void start_proxy(void);
 
 void pazpar2_add_channel(IOCHAN c);
@@ -193,10 +192,10 @@ void pazpar2_event_loop(void);
 int host_getaddrinfo(struct host *host);
 
 xmlDoc *normalize_record(struct session_database *sdb, struct session *se,
-        Z_External *rec);
-xmlDoc *record_to_xml(struct session_database *sdb, Z_External *rec);
+        const char *rec);
+xmlDoc *record_to_xml(struct session_database *sdb, const char *rec);
 
-struct record *ingest_record(struct client *cl, Z_External *rec,
+struct record *ingest_record(struct client *cl, const char *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);