-/* $Id: zebraapi.c,v 1.213 2006-04-05 02:52:11 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: zebraapi.c,v 1.230 2006-10-12 13:06:00 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <assert.h>
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
#include "index.h"
+#include "rank.h"
#include "orddict.h"
#include <charmap.h>
#include <idzebra/api.h>
zh->shadow_enable = 1;
zh->m_staticrank = 0;
+ zh->m_segment_indexing = 0;
default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1");
{
Res res;
+ zebra_flock_init();
+
if (!log_level_initialized)
{
log_level = yaz_log_module_level("zebraapi");
zh->path_root = res_get (zh->global_res, "root");
zh->nmem = nmem_create();
zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem);
+
+ if (1)
+ {
+ const char *module_path = res_get(res, "modulePath");
+ if (module_path)
+ recTypeClass_load_modules(&zh->record_classes, zh->nmem,
+ module_path);
+ }
return zh;
}
return 0;
reg->keys = zebra_rec_keys_open();
-#if NATTR
reg->sortKeys = zebra_rec_keys_open();
-#else
- reg->sortKeys.buf = 0;
- reg->sortKeys.buf_max = 0;
-#endif
reg->records = 0;
reg->dict = 0;
reg->key_file_no = 0;
reg->ptr_i = 0;
+ /* installing rank classes */
zebraRankInstall (reg, rank_1_class);
- zebraRankInstall (reg, rank_zv_class);
+ zebraRankInstall (reg, rank_similarity_class);
zebraRankInstall (reg, rank_static_class);
recordCompression = res_get_def (res, "recordCompression", "none");
{
reg->zei = zebraExplain_open(reg->records, reg->dh,
res, rw, reg,
- explain_extract);
+ zebra_extract_explain);
if (!reg->zei)
{
yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
data1_destroy (reg->dh);
zebra_rec_keys_close(reg->keys);
-#if NATTR
zebra_rec_keys_close(reg->sortKeys);
-#else
- xfree(reg->sortKeys.buf);
-#endif
xfree(reg->key_buf);
xfree(reg->name);
return ZEBRA_OK;
}
-ZEBRA_RES zebra_close (ZebraHandle zh)
+ZEBRA_RES zebra_close(ZebraHandle zh)
{
ZebraService zs;
struct zebra_session **sp;
if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK)
yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank);
}
+ if (zh->res)
+ {
+ if (res_get_int(zh->res, "segment", &zh->m_segment_indexing) ==
+ ZEBRA_OK)
+ {
+ yaz_log(YLOG_DEBUG, "segment indexing set and is %d",
+ zh->m_segment_indexing);
+ }
+ }
}
void map_basenames_func (void *vp, const char *name, const char *value)
return ZEBRA_FAIL;
}
}
- res = rpn_scan (zh, stream, zapt, attributeset,
- zh->num_basenames, zh->basenames, position,
- num_entries, entries, is_partial, limit_rset, 0);
- zebra_end_read (zh);
+ res = rpn_scan(zh, stream, zapt, attributeset,
+ zh->num_basenames, zh->basenames, position,
+ num_entries, entries, is_partial, limit_rset);
+ zebra_end_read(zh);
return res;
}
}
action = 1; /* make it an insert (if it's an update).. */
}
- res = buffer_extract_record (zh, rec_buf, rec_len,
- action == 3 ? 1 : 0 /* delete flag */,
- 0, /* test mode */
- 0, /* recordType */
- &sysno,
- 0, /* match */
- 0, /* fname */
- 0, /* force update */
- 1 /* allow update */
+ res = zebra_buffer_extract_record(zh, rec_buf, rec_len,
+ action == 3 ? 1 : 0 /* delete flag */,
+ 0, /* test mode */
+ 0, /* recordType */
+ &sysno,
+ 0, /* match */
+ 0, /* fname */
+ 0, /* force update */
+ 1 /* allow update */
);
if (res == ZEBRA_FAIL)
{
if (zh->reg->isamb)
{
int db_ord;
- zebraExplain_curDatabase (zh->reg->zei, db);
- db_ord = zebraExplain_get_database_ord(zh->reg->zei);
- dict_delete_subtree_ord(zh->reg->matchDict, db_ord,
- 0 /* handle */, 0 /* func */);
- zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
- zebraExplain_removeDatabase(zh->reg->zei, zh);
+ if (zebraExplain_curDatabase (zh->reg->zei, db))
+ {
+ zebra_setError(zh, YAZ_BIB1_DATABASE_DOES_NOT_EXIST, db);
+ ret = ZEBRA_FAIL;
+ }
+ else
+ {
+ db_ord = zebraExplain_get_database_ord(zh->reg->zei);
+ dict_delete_subtree_ord(zh->reg->matchDict, db_ord,
+ 0 /* handle */, 0 /* func */);
+ zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
+ zebraExplain_removeDatabase(zh->reg->zei, zh);
+ zebra_remove_file_match(zh);
+ }
}
else
{
zh->records_processed, zh->records_inserted,
zh->records_updated, zh->records_deleted);
- status->processed = (int) zh->records_processed;
- status->inserted = (int) zh->records_inserted;
- status->updated = (int) zh->records_updated;
- status->deleted = (int) zh->records_deleted;
+ status->processed = zh->records_processed;
+ status->inserted = zh->records_inserted;
+ status->updated = zh->records_updated;
+ status->deleted = zh->records_deleted;
zebra_get_state (zh, &val, &seqno);
if (val != 'd')
return ZEBRA_OK;
}
-int zebra_repository_update (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_update(ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
yaz_log (log_level, "updating %s", path);
- repositoryUpdate (zh, path);
- return 0;
+
+ if (zh->m_record_id && !strcmp (zh->m_record_id, "file"))
+ return zebra_update_file_match(zh, path);
+ else
+ return zebra_update_from_path(zh, path);
}
-int zebra_repository_delete (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_delete(ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
yaz_log (log_level, "deleting %s", path);
- repositoryDelete (zh, path);
- return 0;
+ return zebra_delete_from_path(zh, path);
}
-int zebra_repository_show (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
repositoryShow (zh, path);
- return 0;
+ return ZEBRA_OK;
}
static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
}
zebra_get_state (zh, &val, &seqno);
+ if (val == 'd')
+ {
+ yaz_log(YLOG_WARN, "previous transaction didn't reach commit");
+ clean_only = 1;
+ }
+
if (rval && *rval)
bf_cache (bfs, rval);
if (bf_commitExists (bfs))
yaz_log (YLOG_DEBUG, "commit start");
bf_commitExec (bfs);
-#ifndef WIN32
- sync ();
-#endif
}
seqno++;
zebra_set_state (zh, 'o', seqno);
zebra_lock_w(zh->lock_shadow);
bf_commitClean (bfs, rval);
- zebra_unlock (zh->lock_normal);
+ zebra_unlock (zh->lock_shadow);
}
else
{
zh->shadow_enable = value;
}
-/* Used by Perl API.. Added the record buffer dup to zebra_records_retrieve
- so that it's identicical to the original api_records_retrieve */
-void api_records_retrieve (ZebraHandle zh, ODR stream,
- const char *setname, Z_RecordComposition *comp,
- oid_value input_format, int num_recs,
- ZebraRetrievalRecord *recs)
-{
- zebra_records_retrieve(zh, stream, setname, comp, input_format,
- num_recs, recs);
-}
-
-/* ---------------------------------------------------------------------------
- Record insert(=update), delete
-
- If sysno is provided, then it's used to identify the record.
- If not, and match_criteria is provided, then sysno is guessed
- If not, and a record is provided, then sysno is got from there
-NOTE: Now returns 0 at success and updates sysno, which is an int*
- 20-jun-2003 Heikki
-*/
-
-int zebra_add_record(ZebraHandle zh,
- const char *buf, int buf_size)
+ZEBRA_RES zebra_add_record(ZebraHandle zh,
+ const char *buf, int buf_size)
{
return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 0);
}
-ZEBRA_RES zebra_insert_record (ZebraHandle zh,
- const char *recordType,
- SYSNO *sysno, const char *match,
- const char *fname,
- const char *buf, int buf_size, int force_update)
+ZEBRA_RES zebra_insert_record(ZebraHandle zh,
+ const char *recordType,
+ SYSNO *sysno, const char *match,
+ const char *fname,
+ const char *buf, int buf_size, int force_update)
{
ZEBRA_RES res;
ASSERTZH;
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
- res = buffer_extract_record (zh, buf, buf_size,
- 0, /* delete_flag */
- 0, /* test_mode */
- recordType,
- sysno,
- match, fname,
- 0,
- 0); /* allow_update */
+ res = zebra_buffer_extract_record(zh, buf, buf_size,
+ 0, /* delete_flag */
+ 0, /* test_mode */
+ recordType,
+ sysno,
+ match, fname,
+ 0,
+ 0); /* allow_update */
if (zebra_end_trans(zh) != ZEBRA_OK)
{
yaz_log(YLOG_WARN, "zebra_end_trans failed");
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
- res = buffer_extract_record (zh, buf, buf_size,
- 0, /* delete_flag */
- 0, /* test_mode */
- recordType,
- sysno,
- match, fname,
- force_update,
- 1); /* allow_update */
+ res = zebra_buffer_extract_record(zh, buf, buf_size,
+ 0, /* delete_flag */
+ 0, /* test_mode */
+ recordType,
+ sysno,
+ match, fname,
+ force_update,
+ 1); /* allow_update */
if (zebra_end_trans(zh) != ZEBRA_OK)
{
yaz_log(YLOG_WARN, "zebra_end_trans failed");
ZEBRA_CHECK_HANDLE(zh);
- assert(sysno);
assert(buf);
- yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
+ yaz_log(log_level, "zebra_delete_record");
+ if (sysno)
+ yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
if (buf_size < 1) buf_size = strlen(buf);
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
- res = buffer_extract_record (zh, buf, buf_size,
- 1, /* delete_flag */
- 0, /* test_mode */
- recordType,
- sysno,
- match,fname,
- force_update,
- 1); /* allow_update */
+ res = zebra_buffer_extract_record(zh, buf, buf_size,
+ 1, /* delete_flag */
+ 0, /* test_mode */
+ recordType,
+ sysno,
+ match,fname,
+ force_update,
+ 1); /* allow_update */
if (zebra_end_trans(zh) != ZEBRA_OK)
{
yaz_log(YLOG_WARN, "zebra_end_trans failed");
strcat (path, "/");
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+