X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=6c76f3c5112803278841d45dfaa88022bb7b1e70;hb=18e6d4befe9117cc44003fc9c1e62aac14d4e3bb;hp=447d6afea4a76b3be8c8185e247ebf0e95bafae5;hpb=4e45c8e2e01c52e8d03dbd9a0873a9e2ff7e5f91;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index 447d6af..6c76f3c 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,117 +1,39 @@
-/*
- * Copyright (C) 1994-1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: zserver.h,v $
- * Revision 1.18  1996-05-14 06:16:50  adam
- * Compact use/set bytes used in search service.
- *
- * Revision 1.17  1995/12/08 16:22:57  adam
- * Work on update while servers are running. Three lock files introduced.
- * The servers reload their registers when necessary, but they don't
- * reestablish result sets yet.
- *
- * Revision 1.16  1995/12/07  17:38:48  adam
- * Work locking mechanisms for concurrent updates/commit.
- *
- * Revision 1.15  1995/11/21  15:29:13  adam
- * Config file 'base' read by default by both indexer and server.
- *
- * Revision 1.14  1995/11/16  17:00:57  adam
- * Better logging of rpn query.
- *
- * Revision 1.13  1995/11/16  15:34:56  adam
- * Uses new record management system in both indexer and server.
- *
- * Revision 1.12  1995/10/27  14:00:12  adam
- * Implemented detection of database availability.
- *
- * Revision 1.11  1995/10/17  18:02:12  adam
- * New feature: databases. Implemented as prefix to words in dictionary.
- *
- * Revision 1.10  1995/10/09  16:18:38  adam
- * Function dict_lookup_grep got extra client data parameter.
- *
- * Revision 1.9  1995/10/06  14:38:01  adam
- * New result set method: r_score.
- * Local no (sysno) and score is transferred to retrieveCtrl.
- *
- * Revision 1.8  1995/10/06  13:52:06  adam
- * Bug fixes. Handler may abort further scanning.
- *
- * Revision 1.7  1995/10/06  10:43:57  adam
- * Scan added. 'occurrences' in scan entries not set yet.
- *
- * Revision 1.6  1995/09/28  09:19:48  adam
- * xfree/xmalloc used everywhere.
- * Extract/retrieve method seems to work for text records.
- *
- * Revision 1.5  1995/09/27  16:17:32  adam
- * More work on retrieve.
- *
- * Revision 1.4  1995/09/14  11:53:28  adam
- * First work on regular expressions/truncations.
- *
- * Revision 1.3  1995/09/08  08:53:23  adam
- * Record buffer maintained in server_info.
- *
- * Revision 1.2  1995/09/06  16:11:19  adam
- * Option: only one word key per file.
- *
- * Revision 1.1  1995/09/05  15:28:40  adam
- * More work on search engine.
- *
- */
+/* $Id: zserver.h,v 1.61 2006-08-14 10:40:15 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra 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
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-#include <backend.h>
-#include <rset.h>
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-#include "index.h"
-#include "zinfo.h"
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-typedef struct {
-    int sysno;
-    int score;
-} ZServerSetSysno;
+*/
 
-typedef struct ZServerSet_ {
-    char *name;
-    RSET rset;
-    int size;
-    struct ZServerSet_ *next;
-} ZServerSet;
-   
-typedef struct {
-    int registerState; /* 0 (no commit pages), 1 (use commit pages) */
-    time_t registerChange;
-    ZServerSet *sets;
-    Dict wordDict;
-    ISAM wordIsam;
-    Records records;
-    int errCode;
-    char *errString;
-    ODR odr;
-    ZebTargetInfo *zti;
-} ZServerInfo;
 
-int rpn_search (ZServerInfo *zi, 
-                Z_RPNQuery *rpn, int num_bases, char **basenames, 
-                const char *setname, int *hits);
 
-int rpn_scan (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
-              int num_bases, char **basenames,
-              int *position, int *num_entries, struct scan_entry **list,
-              int *status);
+#include <yaz/backend.h>
+#include <yaz/charneg.h>
+#include <idzebra/api.h>
 
-ZServerSet *resultSetAdd (ZServerInfo *zi, const char *name,
-                          int ov, RSET rset);
-ZServerSet *resultSetGet (ZServerInfo *zi, const char *name);
-ZServerSetSysno *resultSetSysnoGet (ZServerInfo *zi, const char *name,
-                                    int num, int *positions);
-void resultSetSysnoDel (ZServerInfo *zi, ZServerSetSysno *records, int num);
-void zlog_rpn (Z_RPNQuery *rpn);
+YAZ_BEGIN_CDECL
+
+YAZ_END_CDECL
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
 
-int zebraServerLock (int lockCommit);
-void zebraServerUnlock (int commitPhase);
-int zebraServerLockGetState (time_t *timep);