X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2.h;h=d111196bb4c37c1dc99f175245b0c8a5a1aa7a7c;hb=082c4ffea584f55622bb16406d04dbed3b6e6519;hp=a6c99d700acc81ce8380d266bcceea014d0d5093;hpb=beea258a9423652de5dba16306551df31fc5519e;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index a6c99d7..d111196 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.h,v 1.24 2007-04-16 09:03:25 adam Exp $
+/* $Id: pazpar2.h,v 1.28 2007-04-20 04:32:33 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -92,7 +92,6 @@ struct database {
     struct zr_explain *explain;
     struct setting **settings;
     struct database *next;
-    CCL_bibset ccl_map;
     yaz_marc_t yaz_marc;
     struct database_retrievalmap *map;
 };
@@ -136,6 +135,7 @@ struct client {
     struct session_database *database;
     struct connection *connection;
     struct session *session;
+    char *pquery; // Current search
     int hits;
     int records;
     int setno;
@@ -184,7 +184,6 @@ struct session {
     struct session_database *databases;  // All databases, settings overriden
     struct client *clients;              // Clients connected for current search
     int requestid; 
-    char query[1024];
     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)
@@ -266,8 +265,8 @@ void start_proxy(void);
 void start_zproxy(void);
 
 extern struct parameters global_parameters;
-extern IOCHAN channel_list;
-
+void pazpar2_add_channel(IOCHAN c);
+void pazpar2_event_loop(void);
 #endif
 
 /*