Zebra with full functionality

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

diff --git a/index/zebraapi.c b/index/zebraapi.c
index a84c4c1..f9effec 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2002, Index Data
  * All rights reserved.
  *
- * $Id: zebraapi.c,v 1.51 2002-04-04 14:14:13 adam Exp $
+ * $Id: zebraapi.c,v 1.53 2002-04-05 08:46:26 adam Exp $
  */
 
 #include <assert.h>
@@ -35,7 +35,6 @@ static void zebra_chdir (ZebraService zh)
 #endif
 }
 
-
 static void zebra_flush_reg (ZebraHandle zh)
 {
     zebraExplain_flush (zh->reg->zei, 1, zh);
@@ -44,7 +43,6 @@ static void zebra_flush_reg (ZebraHandle zh)
     zebra_index_merge (zh);
 }
 
-
 static struct zebra_register *zebra_register_open (ZebraService zs, 
                                                    const char *name,
                                                    int rw, int useshadow,
@@ -59,7 +57,8 @@ ZebraHandle zebra_open (ZebraService zs)
 {
     ZebraHandle zh;
 
-    assert (zs);
+    if (!zs)
+        return 0;
 
     zh = (ZebraHandle) xmalloc (sizeof(*zh));
     yaz_log (LOG_LOG, "zebra_open zs=%p returns %p", zs, zh);
@@ -96,36 +95,40 @@ ZebraHandle zebra_open (ZebraService zs)
 
 ZebraService zebra_start (const char *configName)
 {
-    ZebraService zh = xmalloc (sizeof(*zh));
+    Res res;
 
     yaz_log (LOG_LOG, "zebra_start %s", configName);
 
-    zh->configName = xstrdup(configName);
-    zh->sessions = 0;
-
-    if (!(zh->global_res = res_open (zh->configName, 0)))
-    {
-       logf (LOG_WARN, "Failed to read resources `%s'", zh->configName);
-    }
+    if (!(res = res_open (configName, 0)))
+       yaz_log (LOG_WARN, "Cannot read resources `%s'", configName);
     else
     {
-       logf (LOG_LOG, "Read resources `%s'", zh->configName);
-    }
-    zebra_chdir (zh);
+        ZebraService zh = xmalloc (sizeof(*zh));
 
-    zebra_mutex_cond_init (&zh->session_lock);
-    if (!res_get (zh->global_res, "passwd"))
-       zh->passwd_db = NULL;
-    else
-    {
-       zh->passwd_db = passwd_db_open ();
-       if (!zh->passwd_db)
-           logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed");
-       else
-           passwd_db_file (zh->passwd_db, res_get (zh->global_res, "passwd"));
+       yaz_log (LOG_LOG, "Read resources `%s'", configName);
+        
+        zh->global_res = res;
+        zh->configName = xstrdup(configName);
+        zh->sessions = 0;
+        
+        zebra_chdir (zh);
+        
+        zebra_mutex_cond_init (&zh->session_lock);
+        if (!res_get (zh->global_res, "passwd"))
+            zh->passwd_db = NULL;
+        else
+        {
+            zh->passwd_db = passwd_db_open ();
+            if (!zh->passwd_db)
+                logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed");
+            else
+                passwd_db_file (zh->passwd_db,
+                                res_get (zh->global_res, "passwd"));
+        }
+        zh->path_root = res_get (zh->global_res, "root");
+        return zh;
     }
-    zh->path_root = res_get (zh->global_res, "root");
-    return zh;
+    return 0;
 }
 
 static
@@ -162,10 +165,11 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     if (useshadow)
         bf_cache (reg->bfs, res_get (res, "shadow"));
     data1_set_tabpath (reg->dh, res_get(res, "profilePath"));
+    data1_set_tabroot (reg->dh, reg_path);
     reg->recTypes = recTypes_init (reg->dh);
     recTypes_default_handlers (reg->recTypes);
 
-    reg->zebra_maps = zebra_maps_open (res);
+    reg->zebra_maps = zebra_maps_open (res, reg_path);
     reg->rank_classes = NULL;
 
     reg->key_buf = 0;
@@ -178,11 +182,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     reg->sortIdx = 0;
     reg->isams = 0;
     reg->matchDict = 0;
-#if ZMBOL
     reg->isam = 0;
     reg->isamc = 0;
     reg->isamd = 0;
-#endif
     reg->zei = 0;
     reg->matchDict = 0;
     
@@ -223,7 +225,6 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
            return 0;
        }
     }
-#if ZMBOL
     else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
     {
        if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,
@@ -254,7 +255,6 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
            return 0;
        }
     }
-#endif
     reg->zei = zebraExplain_open (reg->records, reg->dh,
                                   res, rw, reg,
                                   explain_extract);
@@ -297,14 +297,12 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
        sortIdx_close (reg->sortIdx);
        if (reg->isams)
            isams_close (reg->isams);
-#if ZMBOL
         if (reg->isam)
             is_close (reg->isam);
         if (reg->isamc)
             isc_close (reg->isamc);
         if (reg->isamd)
             isamd_close (reg->isamd);
-#endif
         rec_close (&reg->records);
     }
 
@@ -400,21 +398,22 @@ static Res zebra_open_res (ZebraHandle zh)
 {
     Res res = 0;
     char fname[512];
-    if (*zh->reg_name == 0)
-    {
-        res = zh->service->global_res;
-        yaz_log (LOG_LOG, "local res = global res");
-    }
-    else if (zh->path_reg)
+    if (zh->path_reg)
     {
         sprintf (fname, "%.200s/zebra.cfg", zh->path_reg);
-        yaz_log (LOG_LOG, "res_open(%s)", fname);
         res = res_open (fname, zh->service->global_res);
         if (!res)
-            return 0;
+            res = zh->service->global_res;
+    }
+    else if (*zh->reg_name == 0)
+    {
+        res = zh->service->global_res;
     }
     else
+    {
+        yaz_log (LOG_WARN, "no register root specified");
         return 0;  /* no path for register - fail! */
+    }
     return res;
 }
 
@@ -635,7 +634,6 @@ void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
 
     zebra_end_read (zh);
 
-    logf(LOG_APP,"SEARCH:%d:",zh->hits);
     *hits = zh->hits;
 }