X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2.h;h=39f513ddb9bc2fc7bcdd041930f80c9b2434f9da;hb=2c07c3edbd2fb4c6f72b6527632fab264b6ab66b;hp=e6d59d38b8ee9ee64e842ecdc9e9ff3cbdf40029;hpb=7db06f8379d23e8f1bce2c87f3ce082bb56ac2db;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index e6d59d3..39f513d 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,7 +1,5 @@
-/* $Id: pazpar2.h,v 1.49 2007-09-05 08:40:12 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   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
@@ -14,20 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #ifndef PAZPAR2_H
 #define PAZPAR2_H
 
-
-#include <netdb.h>
-
-#include <libxslt/xsltutils.h>
-#include <libxslt/transform.h>
-
 #include <yaz/comstack.h>
 #include <yaz/pquery.h>
 #include <yaz/ccl.h>
@@ -37,7 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "relevance.h"
 #include "reclists.h"
 #include "eventl.h"
-#include "config.h"
+#include "pazpar2_config.h"
 #include "parameters.h"
 #include "http.h"
 
@@ -89,6 +81,7 @@ struct database_criterion {
 // Simple sequence of stylesheets run in series.
 struct database_retrievalmap {
     xsltStylesheet *stylesheet;
+    struct marcmap *marcmap;
     struct database_retrievalmap *next;
 };
 
@@ -96,10 +89,11 @@ struct database_retrievalmap {
 // for that session
 struct session_database
 {
-    pp2_charset_t pct;
     struct database *database;
     struct setting **settings;
+#ifdef RETIRED
     yaz_marc_t yaz_marc;
+#endif
     struct database_retrievalmap *map;
     struct session_database *next;
 };
@@ -130,7 +124,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)
@@ -143,15 +136,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;
@@ -180,14 +173,16 @@ 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, const char *id);
+struct record_cluster *show_single(struct session *s, const char *id,
+                                   struct record_cluster **prev_r,
+                                   struct record_cluster **next_r);
 struct termlist_score **termlist(struct session *s, const char *name, int *num);
 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);
 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);
@@ -196,25 +191,22 @@ 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);
 
-int pazpar2_process(int debug, int daemon,
-                    void (*work)(void *data), void *data,
-                    const char *pidfile, const char *uid);
-
-
 #endif
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+