X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=include%2Fidzebra%2Frecctrl.h;h=6b4bb9ed5b073335cf00901410404cd383763275;hb=b88909df16157ed1e7859bc3fad6b01520d4865e;hp=fddb08a8c14119d312c87056522f62e6e1f6ca7d;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;p=idzebra-moved-to-github.git

diff --git a/include/idzebra/recctrl.h b/include/idzebra/recctrl.h
index fddb08a..6b4bb9e 100644
--- a/include/idzebra/recctrl.h
+++ b/include/idzebra/recctrl.h
@@ -1,4 +1,4 @@
-/* $Id: recctrl.h,v 1.19 2006-05-10 08:13:20 adam Exp $
+/* $Id: recctrl.h,v 1.22 2006-06-07 10:50:08 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -34,20 +34,23 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 YAZ_BEGIN_CDECL
 
-#if NATTR
+/* 1 */
 #define ZEBRA_XPATH_ELM_BEGIN "_XPATH_BEGIN"
+
+/* 2 */
 #define ZEBRA_XPATH_ELM_END   "_XPATH_END"
+
+/* 1016 */
 #define ZEBRA_XPATH_CDATA     "_XPATH_CDATA"
-#define ZEBRA_XPATH_ATTR      "_XPATH_ATTR"
-#endif
+
+/* 3 */
+#define ZEBRA_XPATH_ATTR_NAME       "_XPATH_ATTR_NAME"
+
+/* 1015 */
+#define ZEBRA_XPATH_ATTR_CDATA      "_XPATH_ATTR_CDATA"
 
 /* single word entity */
 typedef struct {
-#if NATTR
-#else
-    int  attrSet;
-    int  attrUse;
-#endif
     unsigned index_type;
     const char *index_name;
     const char *term_buf;
@@ -76,7 +79,7 @@ struct recExtractCtrl {
     int       flagShowRecords;
     int       seqno[256];
     char      match_criteria[256];
-    int       staticrank;
+    zint      staticrank;
     void      (*schemaAdd)(struct recExtractCtrl *p, Odr_oid *oid);
     data1_handle dh;
     void      *handle;
@@ -96,7 +99,7 @@ struct recRetrieveCtrl {
     char      *encoding;              /* preferred character encoding      */
     zint      localno;                /* local id of record                */
     int       score;                  /* score 0-1000 or -1 if none        */
-    int       staticrank;             /* static rank >= 0,  0 if none */
+    zint      staticrank;             /* static rank >= 0,  0 if none */
     int       recordSize;             /* size of record in bytes */
     char      *fname;                 /* name of file (or NULL if internal) */
     data1_handle dh;