X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzinfo.c;h=7b16902d5259e6a34e5fcc05a4268a5db3c434fc;hb=12c6db025bffd23e760ceb31120468cf363256df;hp=67060efa6b5bfd103f4ef693fe3df5e2b0da63fc;hpb=6a395dd488e0f34f54ea44bafcde9c959292c252;p=idzebra-moved-to-github.git

diff --git a/index/zinfo.c b/index/zinfo.c
index 67060ef..7b16902 100644
--- a/index/zinfo.c
+++ b/index/zinfo.c
@@ -1,5 +1,5 @@
-/* $Id: zinfo.c,v 1.37 2003-06-30 19:37:12 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: zinfo.c,v 1.40 2004-08-25 09:23:36 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -25,7 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <time.h>
 
-#include <zebraver.h>
+#include <idzebra/version.h>
 #include "zinfo.h"
 
 #define ZINFO_DEBUG 0
@@ -44,7 +44,7 @@ struct zebSUInfoB {
 typedef struct zebAccessObjectB *zebAccessObject;
 struct zebAccessObjectB {
     void *handle;
-    int sysno;
+    SYSNO sysno;
     Odr_oid *oid;
     zebAccessObject next;
 };
@@ -57,7 +57,7 @@ struct zebAccessInfoB {
 
 typedef struct {
     struct zebSUInfoB *SUInfo;
-    int sysno;
+    SYSNO sysno;
     int dirty;
     int readFlag;
     data1_node *data1_tree;
@@ -67,9 +67,9 @@ struct zebDatabaseInfoB {
     zebAttributeDetails attributeDetails;
     char *databaseName;
     data1_node *data1_database;
-    int recordCount;     /* records in db */
-    int recordBytes;     /* size of records */
-    int sysno;           /* sysno of database info */
+    zint recordCount;    /* records in db */
+    zint recordBytes;    /* size of records */
+    SYSNO sysno;         /* sysno of database info */
     int readFlag;        /* 1: read is needed when referenced; 0 if not */
     int dirty;           /* 1: database is dirty: write is needed */
     struct zebDatabaseInfoB *next;
@@ -84,14 +84,14 @@ struct zebraExplainAttset {
 
 struct zebraCategoryListInfo {
     int dirty;
-    int sysno;
+    SYSNO sysno;
     data1_node *data1_categoryList;
 };
 
 struct zebraExplainInfo {
-    int  ordinalSU;
-    int  runNumber;
-    int  dirty;
+    int ordinalSU;
+    zint runNumber;
+    int dirty;
     int write_flag;
     Records records;
     data1_handle dh;
@@ -132,7 +132,7 @@ static void zebraExplain_writeCategoryList (ZebraExplainInfo zei,
 					    int key_flush);
 
 
-static Record createRecord (Records records, int *sysno)
+static Record createRecord (Records records, SYSNO *sysno)
 {
     Record rec;
     if (*sysno)
@@ -437,12 +437,12 @@ ZebraExplainInfo zebraExplain_open (
 	    memcpy ((*zdip)->databaseName, node_name->u.data.data,
 		    node_name->u.data.len);
 	    (*zdip)->databaseName[node_name->u.data.len] = '\0';
-	    (*zdip)->sysno = atoi_n (node_id->u.data.data,
-				     node_id->u.data.len);
+	    (*zdip)->sysno = atoi_zn (node_id->u.data.data,
+				      node_id->u.data.len);
 	    (*zdip)->attributeDetails = (zebAttributeDetails)
 		nmem_malloc (zei->nmem, sizeof(*(*zdip)->attributeDetails));
-	    (*zdip)->attributeDetails->sysno = atoi_n (node_aid->u.data.data,
-						       node_aid->u.data.len);
+	    (*zdip)->attributeDetails->sysno = atoi_zn (node_aid->u.data.data,
+							node_aid->u.data.len);
 	    (*zdip)->attributeDetails->readFlag = 1;
 	    (*zdip)->attributeDetails->dirty = 0;
 	    (*zdip)->attributeDetails->SUInfo = NULL;
@@ -461,8 +461,8 @@ ZebraExplainInfo zebraExplain_open (
 				   "runNumber");
 	    np = np->child;
 	    assert (np && np->which == DATA1N_data);
-	    zei->runNumber = atoi_n (np->u.data.data, np->u.data.len);
-            yaz_log (LOG_DEBUG, "read runnumber = %d", zei->runNumber);
+	    zei->runNumber = atoi_zn (np->u.data.data, np->u.data.len);
+            yaz_log (LOG_DEBUG, "read runnumber=" ZINT_FORMAT, zei->runNumber);
 	    *zdip = NULL;
 	}
 	rec_rm (&trec);
@@ -627,16 +627,16 @@ static void zebraExplain_readDatabase (ZebraExplainInfo zei,
 	&& (np = data1_search_tag (zei->dh, node_zebra->child,
 				   "recordBytes")) 
 	&& np->child && np->child->which == DATA1N_data)
-	zdi->recordBytes = atoi_n (np->child->u.data.data,
-				   np->child->u.data.len);
+	zdi->recordBytes = atoi_zn (np->child->u.data.data,
+				    np->child->u.data.len);
     if ((np = data1_search_tag (zei->dh, node_dbinfo->child,
 				"recordCount")) &&
 	(np = data1_search_tag (zei->dh, np->child,
 				"recordCountActual")) &&
 	np->child->which == DATA1N_data)
     {
-	zdi->recordCount = atoi_n (np->child->u.data.data,
-				   np->child->u.data.len);
+	zdi->recordCount = atoi_zn (np->child->u.data.data,
+				    np->child->u.data.len);
     }
     zdi->readFlag = 0;
     rec_rm (&rec);
@@ -900,7 +900,7 @@ static void zebraExplain_writeCategoryList (ZebraExplainInfo zei,
     int i;
     Record drec;
     data1_node *node_ci, *node_categoryList;
-    int sysno = 0;
+    SYSNO sysno = 0;
     static char *category[] = {
 	"CategoryList",
 	"TargetInfo",
@@ -1117,13 +1117,13 @@ static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
     /* record count */
     node_count = data1_mk_tag_uni (zei->dh, zei->nmem,
 				 "recordCount", node_dbinfo);
-    data1_mk_tag_data_int (zei->dh, node_count, "recordCountActual",
-			      zdi->recordCount, zei->nmem);
+    data1_mk_tag_data_zint (zei->dh, node_count, "recordCountActual",
+			    zdi->recordCount, zei->nmem);
 
     /* zebra info (private) */
     node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
 				 "zebraInfo", node_dbinfo);
-    data1_mk_tag_data_int (zei->dh, node_zebra,
+    data1_mk_tag_data_zint (zei->dh, node_zebra,
 			   "recordBytes", zdi->recordBytes, zei->nmem);
     /* convert to "SGML" and write it */
 #if ZINFO_DEBUG
@@ -1275,16 +1275,16 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush)
                                 "database", 0 /* attr */, node_list);
 	data1_mk_tag_data_text (zei->dh, node_db, "name",
                                 zdi->databaseName, zei->nmem);
-	data1_mk_tag_data_int (zei->dh, node_db, "id",
-                               zdi->sysno, zei->nmem);
-	data1_mk_tag_data_int (zei->dh, node_db, "attributeDetailsId",
-                               zdi->attributeDetails->sysno, zei->nmem);
+	data1_mk_tag_data_zint (zei->dh, node_db, "id",
+				zdi->sysno, zei->nmem);
+	data1_mk_tag_data_zint (zei->dh, node_db, "attributeDetailsId",
+				zdi->attributeDetails->sysno, zei->nmem);
     }
     data1_mk_tag_data_int (zei->dh, node_zebra, "ordinalSU",
                            zei->ordinalSU, zei->nmem);
 
-    data1_mk_tag_data_int (zei->dh, node_zebra, "runNumber",
-			      zei->runNumber, zei->nmem);
+    data1_mk_tag_data_zint (zei->dh, node_zebra, "runNumber",
+			    zei->runNumber, zei->nmem);
 
 #if ZINFO_DEBUG
     data1_pr_tree (zei->dh, zei->data1_target, stderr);
@@ -1430,7 +1430,7 @@ void zebraExplain_recordCountIncrement (ZebraExplainInfo zei, int adjust_num)
     }
 }
 
-int zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
+zint zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
 {
     if (adjust_num)
     {