Moved file locking utilities from index/lockutil.c to util/flock.c

[idzebra-moved-to-github.git] / include / idzebra / recctrl.h

diff --git a/include/idzebra/recctrl.h b/include/idzebra/recctrl.h
index 0a39e70..4db54cc 100644 (file)
--- a/include/idzebra/recctrl.h
+++ b/include/idzebra/recctrl.h
@@ -1,4 +1,4 @@
-/* $Id: recctrl.h,v 1.10 2005-04-28 08:20:39 adam Exp $
+/* $Id: recctrl.h,v 1.14 2005-08-22 08:19:51 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -29,17 +29,28 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/odr.h>
 #include <idzebra/res.h>
 #include <idzebra/data1.h>
+#include <idzebra/snippet.h>
 #include <idzebra/zebramap.h>
 
 YAZ_BEGIN_CDECL
 
+#if NATTR
+#define ZEBRA_XPATH_ELM_BEGIN "_XPATH_BEGIN"
+#define ZEBRA_XPATH_ELM_END   "_XPATH_END"
+#define ZEBRA_XPATH_CDATA     "_XPATH_CDATA"
+#define ZEBRA_XPATH_ATTR      "_XPATH_ATTR"
+#endif
+
 /* single word entity */
 typedef struct {
+#if NATTR
+#else
     int  attrSet;
     int  attrUse;
-    unsigned reg_type;
-    char *attrStr;
-    char *term_buf;
+#endif
+    unsigned index_type;
+    const char *index_name;
+    const char *term_buf;
     int  term_len;
     zint seqno;
     zint record_id;
@@ -65,6 +76,7 @@ struct recExtractCtrl {
     int       flagShowRecords;
     int       seqno[256];
     char      match_criteria[256];
+    int       staticrank;
     void      (*schemaAdd)(struct recExtractCtrl *p, Odr_oid *oid);
     data1_handle dh;
     void      *handle;
@@ -87,6 +99,8 @@ struct recRetrieveCtrl {
     int       recordSize;             /* size of record in bytes */
     char      *fname;                 /* name of file (or NULL if internal) */
     data1_handle dh;
+    zebra_snippets *hit_snippet;
+    zebra_snippets *doc_snippet;
     
     /* response */
     oid_value  output_format;