* 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.54 2002-04-05 12:49:51 adam Exp $
*/
#include <assert.h>
#endif
}
-
static void zebra_flush_reg (ZebraHandle zh)
{
zebraExplain_flush (zh->reg->zei, 1, zh);
zebra_index_merge (zh);
}
-
static struct zebra_register *zebra_register_open (ZebraService zs,
const char *name,
int rw, int useshadow,
{
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);
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
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;
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;
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,
return 0;
}
}
-#endif
reg->zei = zebraExplain_open (reg->records, reg->dh,
res, rw, reg,
explain_extract);
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 (®->records);
}
{
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;
}
{
int i;
const char *cp;
- size_t len = 0;
+ int len = 0;
char *new_reg = 0;
if (num_bases < 1)
zh->errCode = 23;
return -1;
}
- if (len != cp - basenames[i] ||
+ if (len != cp1 - basenames[i] ||
memcmp (basenames[i], new_reg, len))
{
zh->errCode = 23;
zebra_end_read (zh);
- logf(LOG_APP,"SEARCH:%d:",zh->hits);
*hits = zh->hits;
}
zebra_set_state (zh, 'c', seqno);
logf (LOG_LOG, "commit start");
+#ifndef WIN32
sleep (2);
+#endif
bf_commitExec (bfs);
#ifndef WIN32
sync ();