I hate failed merges

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

diff --git a/src/pazpar2.h b/src/pazpar2.h
index c4989d0..243745c 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
@@ -20,10 +20,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef PAZPAR2_H
 #define PAZPAR2_H
 
-
-#include <libxslt/xsltutils.h>
-#include <libxslt/transform.h>
-
 #include <yaz/comstack.h>
 #include <yaz/pquery.h>
 #include <yaz/ccl.h>
@@ -94,7 +90,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;
 };
@@ -125,7 +123,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)
@@ -138,6 +135,8 @@ 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 {
@@ -202,7 +201,9 @@ void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num);
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+