Minor fixes. Many things still broken...

[idzebra-moved-to-github.git] / index / zebraapi.c

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 5124ad2..d1bf1a4 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.119 2004-05-10 08:47:54 adam Exp $
+/* $Id: zebraapi.c,v 1.130 2004-09-09 10:41:42 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -22,6 +22,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <assert.h>
 #include <stdio.h>
+#include <limits.h>
 #ifdef WIN32
 #include <io.h>
 #include <process.h>
@@ -35,7 +36,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/sortspec.h>
 #include "index.h"
 #include <charmap.h>
-#include "zebraapi.h"
+#include <idzebra/api.h>
 
 /* simple asserts to validate the most essential input args */
 #define ASSERTZH assert(zh && zh->service)
@@ -147,7 +148,12 @@ ZebraHandle zebra_open (ZebraService zs)
     return zh;
 }
 
-ZebraService zebra_start (const char *configName, Res def_res, Res over_res)
+ZebraService zebra_start (const char *configName)
+{
+    return zebra_start_res(configName, 0, 0);
+}
+
+ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
 {
     Res res;
 
@@ -190,6 +196,25 @@ void zebra_pidfname(ZebraService zs, char *path)
     strcat(path, "zebrasrv.pid");
 }
 
+Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
+                   int compact_flag, Res res)
+{
+    int page_size = 4096;
+    char resource_str[200];
+    const char *v;
+    sprintf (resource_str, "dict.%.100s.pagesize", name);
+
+    v = res_get(res, resource_str);
+    if (v)
+    {
+       page_size = atoi(v);
+       yaz_log(LOG_LOG, "Using custom dictionary page size %d for %s",
+               page_size, name);
+    }
+    return dict_open(bfs, name, cache, rw, compact_flag, page_size);
+}
+
+
 static
 struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
                                             int rw, int useshadow, Res res,
@@ -244,6 +269,10 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     reg->keys.buf_max = 0;
     reg->keys.buf = 0;
+#if IT_KEY_NEW
+    reg->keys.codec_handle = iscz1_start();
+#endif
+
     reg->sortKeys.buf = 0;
     reg->sortKeys.buf_max = 0;
 
@@ -252,9 +281,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     reg->sortIdx = 0;
     reg->isams = 0;
     reg->matchDict = 0;
-    reg->isam = 0;
     reg->isamc = 0;
-    reg->isamd = 0;
     reg->isamb = 0;
     reg->zei = 0;
     reg->matchDict = 0;
@@ -278,9 +305,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     }
     if (rw)
     {
-        reg->matchDict = dict_open (reg->bfs, GMATCH_DICT, 20, 1, 0);
+        reg->matchDict = dict_open_res (reg->bfs, GMATCH_DICT, 20, 1, 0, res);
     }
-    if (!(reg->dict = dict_open (reg->bfs, FNAME_DICT, 40, rw, 0)))
+    if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res)))
     {
        logf (LOG_WARN, "dict_open");
        return 0;
@@ -300,15 +327,6 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
            return 0;
        }
     }
-    if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
-    {
-       if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,
-                                 sizeof (struct it_key), res)))
-       {
-           logf (LOG_WARN, "is_open");
-           return 0;
-       }
-    }
     if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
     {
        struct ISAMC_M_s isamc_m;
@@ -319,17 +337,6 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
            return 0;
        }
     }
-    if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
-    {
-       struct ISAMD_M_s isamd_m;
-       
-       if (!(reg->isamd = isamd_open (reg->bfs, FNAME_ISAMD,
-                                     rw, key_isamd_m(res, &isamd_m))))
-       {
-           logf (LOG_WARN, "isamd_open");
-           return 0;
-       }
-    }
     if (res_get_match (res, "isam", "b", ISAM_DEFAULT))
     {
        struct ISAMC_M_s isamc_m;
@@ -415,12 +422,8 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
        sortIdx_close (reg->sortIdx);
        if (reg->isams)
            isams_close (reg->isams);
-        if (reg->isam)
-            is_close (reg->isam);
         if (reg->isamc)
             isc_close (reg->isamc);
-        if (reg->isamd)
-            isamd_close (reg->isamd);
         if (reg->isamb)
             isamb_close (reg->isamb);
         rec_close (&reg->records);
@@ -434,6 +437,10 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
 
     xfree (reg->sortKeys.buf);
     xfree (reg->keys.buf);
+#if IT_KEY_NEW
+    if (reg->keys.codec_handle)
+       iscz1_stop(reg->keys.codec_handle);
+#endif
 
     xfree (reg->key_buf);
     xfree (reg->name);
@@ -778,6 +785,8 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
 int zebra_search_RPN (ZebraHandle zh, ODR o,
                       Z_RPNQuery *query, const char *setname, int *hits)
 {
+    const char *max;
+    zint maxhits;
     ASSERTZH;
     yaz_log(LOG_API,"zebra_search_rpn");
     zh->errCode=0;
@@ -793,8 +802,21 @@ int zebra_search_RPN (ZebraHandle zh, ODR o,
                      zh->num_basenames, zh->basenames, setname);
 
     zebra_end_read (zh);
-
-    *hits = zh->hits;
+    max = res_get (zh->res, "maxhits");
+    if (max)
+       maxhits=atoi(max);
+    else {
+        int i=0; 
+       maxhits=INT_MAX;
+       while (maxhits>100) { maxhits/=10; i++;}
+       while (i--) maxhits *= 10;
+    }
+    if (zh->hits > maxhits) { /* too large for yaz to handle */
+        logf(LOG_LOG,"limiting hits to "ZINT_FORMAT, maxhits);
+       *hits=maxhits;  /* round it down to two digits, to look like rounded */
+    }
+    else
+        *hits = zh->hits;
     return 0;
 }
 
@@ -1023,7 +1045,7 @@ int zebra_admin_import_end (ZebraHandle zh)
 
 int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
 {
-    int sysno;
+    SYSNO sysno;
     int i;
     ASSERTZH;
     yaz_log(LOG_API,"zebra_admin_import_segment");
@@ -1067,7 +1089,7 @@ int zebra_admin_exchange_record (ZebraHandle zh,
     /* 3 = delete. Fail if does not exist */
     /* 4 = update. Insert/replace */
 {
-    int sysno = 0;
+    SYSNO sysno = 0;
     char *rinfo = 0;
     char recid_z[256];
     ASSERTZH;
@@ -1340,7 +1362,10 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
         
         (zh->trans_no++);
         if (zh->trans_w_no)
+       {
+           read_res_for_transaction(zh);
             return 0;
+       }
         if (zh->trans_no != 1)
         {
             zh->errCode = 2;
@@ -1571,7 +1596,8 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
         zebra_register_close (zh->service, zh->reg);
         zh->reg = 0;
         
-        yaz_log (LOG_LOG, "Records: %7d i/u/d %d/%d/%d", 
+        yaz_log (LOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
+                       ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT, 
                  zh->records_processed, zh->records_inserted,
                  zh->records_updated, zh->records_deleted);
         
@@ -1725,6 +1751,8 @@ int zebra_init (ZebraHandle zh)
 
     bfs = bfs_create (res_get (zh->service->global_res, "register"),
                       zh->path_reg);
+    if (!bfs)
+       return -1;
     if (rval && *rval)
         bf_cache (bfs, rval);
     
@@ -1940,17 +1968,17 @@ NOTE: Now returns 0 at success and updates sysno, which is an int*
 int zebra_add_record(ZebraHandle zh,
                     const char *buf, int buf_size)
 {
-    int sysno = 0;
+    SYSNO sysno = 0;
     return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0);
 }
 
 int zebra_insert_record (ZebraHandle zh, 
                         const char *recordType,
-                        int *sysno, const char *match, const char *fname,
-                        const char *buf, int buf_size)
+                        SYSNO *sysno, const char *match, const char *fname,
+                        const char *buf, int buf_size, int force_update)
 {
     int res;
-    yaz_log(LOG_API,"zebra_insert_record sysno=%d", *sysno);
+    yaz_log(LOG_API,"zebra_insert_record sysno=" ZINT_FORMAT, *sysno);
 
     if (buf_size < 1) buf_size = strlen(buf);
 
@@ -1970,13 +1998,13 @@ int zebra_insert_record (ZebraHandle zh,
 
 int zebra_update_record (ZebraHandle zh, 
                         const char *recordType,
-                        int* sysno, const char *match, const char *fname,
+                        SYSNO* sysno, const char *match, const char *fname,
                         const char *buf, int buf_size,
                         int force_update)
 {
     int res;
 
-    yaz_log(LOG_API,"zebra_update_record sysno=%d", *sysno);
+    yaz_log(LOG_API,"zebra_update_record sysno=" ZINT_FORMAT, *sysno);
 
     if (buf_size < 1) buf_size = strlen(buf);
 
@@ -1996,12 +2024,12 @@ int zebra_update_record (ZebraHandle zh,
 
 int zebra_delete_record (ZebraHandle zh, 
                         const char *recordType,
-                        int *sysno, const char *match, const char *fname,
+                        SYSNO *sysno, const char *match, const char *fname,
                         const char *buf, int buf_size,
                         int force_update) 
 {
     int res;
-    yaz_log(LOG_API,"zebra_delete_record sysno=%d", *sysno);
+    yaz_log(LOG_API,"zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
 
     if (buf_size < 1) buf_size = strlen(buf);
 
@@ -2052,7 +2080,6 @@ int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
 
 /* ---------------------------------------------------------------------------
   Sort - a simplified interface, with optional read locks.
-  FIXME - This is a horrible name, will conflict with half the applications
 */
 int zebra_sort_by_specstr (ZebraHandle zh, 
                           ODR stream,
@@ -2084,3 +2111,4 @@ int zebra_sort_by_specstr (ZebraHandle zh,
     zebra_end_read(zh);
     return sort_status;
 }
+