X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=3b62367c6890701a64530f82cf11e6ba4388d2b8;hb=c3143b73c994edc3e1ec3dff53b91136ac00437c;hp=436240902d877692ee60f94dc16dfa43d4e16d37;hpb=8435c4aa3528b121b17304862a883bc322f75576;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 4362409..3b62367 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.98 2003-04-24 19:46:59 adam Exp $ +/* $Id: zebraapi.c,v 1.111 2003-07-07 13:55:37 pop Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 Index Data Aps @@ -44,6 +44,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define ASSERTZHRES assert(zh && zh->service && zh->res) #define ASSERTZS assert(zs) +/* A simple log macro */ +/* don't break with older yazen that lack log_app2 */ +#ifdef LOG_APP2 +#define LOG_API LOG_APP2 +#else +#define LOG_API LOG_DEBUG +#endif + static Res zebra_open_res (ZebraHandle zh); static void zebra_close_res (ZebraHandle zh); @@ -52,6 +60,7 @@ static void zebra_chdir (ZebraService zs) { const char *dir ; ASSERTZS; + yaz_log(LOG_API,"zebra_chdir"); dir = res_get (zs->global_res, "chdir"); if (!dir) return; @@ -66,6 +75,7 @@ static void zebra_chdir (ZebraService zs) static void zebra_flush_reg (ZebraHandle zh) { ASSERTZH; + yaz_log(LOG_API,"zebra_flush_reg"); zh->errCode=0; zebraExplain_flush (zh->reg->zei, zh); @@ -85,6 +95,7 @@ ZebraHandle zebra_open (ZebraService zs) ZebraHandle zh; const char *default_encoding; ASSERTZS; + yaz_log(LOG_API,"zebra_open"); if (!zs) return 0; @@ -143,7 +154,7 @@ ZebraService zebra_start (const char *configName) { Res res; - yaz_log (LOG_LOG, "zebra_start %s", configName); + yaz_log(LOG_API|LOG_LOG,"zebra_start %s",configName); if ((res = res_open (configName, 0))) { @@ -196,9 +207,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, assert (res); - yaz_log (LOG_DEBUG, "zebra_register_open rw = %d useshadow=%d p=%p", - rw, useshadow, reg); - + yaz_log (LOG_LOG|LOG_API, "zebra_register_open rw = %d useshadow=%d p=%p,n=%s,rp=%s", + rw, useshadow, reg, name, reg_path ? reg_path : "(none)"); + reg->dh = data1_createx (DATA1_FLAG_XML); if (!reg->dh) return 0; @@ -354,30 +365,34 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, return reg; } -void zebra_admin_shutdown (ZebraHandle zh) +int zebra_admin_shutdown (ZebraHandle zh) { ASSERTZH; + yaz_log(LOG_API,"zebra_admin_shutdown"); zh->errCode=0; zebra_mutex_cond_lock (&zh->service->session_lock); zh->service->stop_flag = 1; zebra_mutex_cond_unlock (&zh->service->session_lock); + return 0; } -void zebra_admin_start (ZebraHandle zh) +int zebra_admin_start (ZebraHandle zh) { ZebraService zs; ASSERTZH; + yaz_log(LOG_API,"zebra_admin_start"); zh->errCode=0; zs = zh->service; zebra_mutex_cond_lock (&zs->session_lock); zebra_mutex_cond_unlock (&zs->session_lock); + return 0; } static void zebra_register_close (ZebraService zs, struct zebra_register *reg) { ASSERTZS; - yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg); + yaz_log(LOG_LOG|LOG_API, "zebra_register_close p=%p", reg); reg->stop_flag = 0; zebra_chdir (zs); if (reg->records) @@ -414,11 +429,11 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg) xfree (reg); } -void zebra_stop(ZebraService zs) +int zebra_stop(ZebraService zs) { if (!zs) - return ; - yaz_log (LOG_LOG, "zebra_stop"); + return 0; + yaz_log (LOG_LOG|LOG_API, "zebra_stop"); while (zs->sessions) { @@ -434,23 +449,23 @@ void zebra_stop(ZebraService zs) xfree (zs->configName); xfree (zs->path_root); xfree (zs); + return 0; } -void zebra_close (ZebraHandle zh) +int zebra_close (ZebraHandle zh) { ZebraService zs; struct zebra_session **sp; int i; + yaz_log(LOG_API,"zebra_close"); if (!zh) - return; + return 0; ASSERTZH; zh->errCode=0; zs = zh->service; yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh); - if (!zh) - return ; resultSetDestroy (zh, -1, 0, 0); if (zh->reg) @@ -487,6 +502,7 @@ void zebra_close (ZebraHandle zh) xfree (zh->reg_name); zh->service=0; /* more likely to trigger an assert */ xfree (zh); + return 0; } struct map_baseinfo { @@ -635,6 +651,7 @@ void map_basenames (ZebraHandle zh, ODR stream, struct map_baseinfo *p = &info; int i; ASSERTZH; + yaz_log(LOG_API,"map_basenames "); zh->errCode=0; info.zh = zh; @@ -663,6 +680,7 @@ void map_basenames (ZebraHandle zh, ODR stream, int zebra_select_database (ZebraHandle zh, const char *basename) { ASSERTZH; + yaz_log(LOG_API,"zebra_select_database %s",basename); zh->errCode=0; return zebra_select_databases (zh, 1, &basename); } @@ -675,6 +693,8 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, int len = 0; char *new_reg = 0; ASSERTZH; + yaz_log(LOG_API,"zebra_select_databases n=%d [0]=%s", + num_bases,basenames[0]); zh->errCode=0; if (num_bases < 1) @@ -744,48 +764,51 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, return 0; } -void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream, +int zebra_search_RPN (ZebraHandle zh, ODR o, Z_RPNQuery *query, const char *setname, int *hits) { ASSERTZH; + yaz_log(LOG_API,"zebra_search_rpn"); zh->errCode=0; zh->hits = 0; *hits = 0; if (zebra_begin_read (zh)) - return; + return 1; zebra_livcode_transform(zh, query); - resultSetAddRPN (zh, decode, stream, query, + resultSetAddRPN (zh, odr_extract_mem(o), query, zh->num_basenames, zh->basenames, setname); zebra_end_read (zh); *hits = zh->hits; + return 0; } -void zebra_records_retrieve (ZebraHandle zh, ODR stream, +int zebra_records_retrieve (ZebraHandle zh, ODR stream, const char *setname, Z_RecordComposition *comp, oid_value input_format, int num_recs, ZebraRetrievalRecord *recs) { ZebraPosSet poset; - int i, *pos_array; + int i, *pos_array, ret = 0; ASSERTZH; + yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs); zh->errCode=0; if (!zh->res) { zh->errCode = 30; zh->errString = odr_strdup (stream, setname); - return; + return -1; } zh->errCode = 0; if (zebra_begin_read (zh)) - return; + return -1; pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); for (i = 0; ierrCode = 30; zh->errString = nmem_strdup (stream->mem, setname); + ret = -1; } else { @@ -826,6 +850,7 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, sprintf (num_str, "%d", pos_array[i]); zh->errCode = 13; zh->errString = odr_strdup (stream, num_str); + ret = -1; break; } } @@ -833,39 +858,44 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, } zebra_end_read (zh); xfree (pos_array); + return ret; } -void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, +int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, oid_value attributeset, int *position, int *num_entries, ZebraScanEntry **entries, int *is_partial) { ASSERTZH; + yaz_log(LOG_API,"zebra_scan"); zh->errCode=0; if (zebra_begin_read (zh)) { *entries = 0; *num_entries = 0; - return; + return 1; } rpn_scan (zh, stream, zapt, attributeset, zh->num_basenames, zh->basenames, position, num_entries, entries, is_partial, 0, 0); zebra_end_read (zh); + return 0; } -void zebra_sort (ZebraHandle zh, ODR stream, +int zebra_sort (ZebraHandle zh, ODR stream, int num_input_setnames, const char **input_setnames, const char *output_setname, Z_SortKeySpecList *sort_sequence, int *sort_status) { ASSERTZH; + yaz_log(LOG_API,"zebra_sort"); zh->errCode=0; if (zebra_begin_read (zh)) - return; + return 1; resultSetSort (zh, stream->mem, num_input_setnames, input_setnames, output_setname, sort_sequence, sort_status); zebra_end_read(zh); + return 0; } int zebra_deleleResultSet(ZebraHandle zh, int function, @@ -874,6 +904,7 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, { int i, status; ASSERTZH; + yaz_log(LOG_API,"zebra_deleleResultSet n=%d",num_setnames); zh->errCode=0; if (zebra_begin_read(zh)) return Z_DeleteStatus_systemProblemAtTarget; @@ -897,28 +928,46 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, int zebra_errCode (ZebraHandle zh) { if (zh) + { + yaz_log(LOG_API,"zebra_errCode: %d",zh->errCode); return zh->errCode; + } + yaz_log(LOG_API,"zebra_errCode: o"); return 0; } const char *zebra_errString (ZebraHandle zh) { + const char *e=""; if (zh) - return diagbib1_str (zh->errCode); - return ""; + e= diagbib1_str (zh->errCode); + yaz_log(LOG_API,"zebra_errString: %s",e); + return e; } char *zebra_errAdd (ZebraHandle zh) { + char *a=""; if (zh) - return zh->errString; - return ""; + a= zh->errString; + yaz_log(LOG_API,"zebra_errAdd: %s",a); + return a; +} + +void zebra_clearError(ZebraHandle zh) +{ + if (zh) + { + zh->errCode=0; + zh->errString=""; + } } int zebra_auth (ZebraHandle zh, const char *user, const char *pass) { ZebraService zs; ASSERTZH; + yaz_log(LOG_API,"zebra_auth u=%s p=%s",user,pass); zh->errCode=0; zs= zh->service; if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass)) @@ -931,30 +980,36 @@ int zebra_auth (ZebraHandle zh, const char *user, const char *pass) return 1; } -void zebra_admin_import_begin (ZebraHandle zh, const char *database, +int zebra_admin_import_begin (ZebraHandle zh, const char *database, const char *record_type) { ASSERTZH; + yaz_log(LOG_API,"zebra_admin_import_begin db=%s rt=%s", + database, record_type); zh->errCode=0; if (zebra_select_database(zh, database)) - return; + return 1; zebra_begin_trans (zh, 1); xfree (zh->admin_databaseName); zh->admin_databaseName = xstrdup(database); + return 0; } -void zebra_admin_import_end (ZebraHandle zh) +int zebra_admin_import_end (ZebraHandle zh) { ASSERTZH; + yaz_log(LOG_API,"zebra_admin_import_end"); zh->errCode=0; zebra_end_trans (zh); + return 0; } -void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) +int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) { int sysno; int i; ASSERTZH; + yaz_log(LOG_API,"zebra_admin_import_segment"); zh->errCode=0; for (i = 0; inum_segmentRecords; i++) { @@ -986,6 +1041,7 @@ void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) } } } + return 0; } int zebra_admin_exchange_record (ZebraHandle zh, @@ -999,6 +1055,8 @@ int zebra_admin_exchange_record (ZebraHandle zh, char *rinfo = 0; char recid_z[256]; ASSERTZH; + yaz_log(LOG_API,"zebra_admin_exchange_record db=%s ac=%d", + database, action); zh->errCode=0; if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) @@ -1006,17 +1064,26 @@ int zebra_admin_exchange_record (ZebraHandle zh, memcpy (recid_z, recid_buf, recid_len); recid_z[recid_len] = 0; + zebra_begin_trans(zh,1); + rinfo = dict_lookup (zh->reg->matchDict, recid_z); if (rinfo) { if (action == 1) /* fail if insert */ - return -1; + { + zebra_end_trans(zh); + return -1; + } + memcpy (&sysno, rinfo+1, sizeof(sysno)); } else { if (action == 2 || action == 3) /* fail if delete or update */ + { + zebra_end_trans(zh); return -1; + } } extract_rec_in_mem (zh, "grs.sgml", rec_buf, rec_len, database, action == 3 ? 1 : 0 /* delete flag */, @@ -1029,28 +1096,81 @@ int zebra_admin_exchange_record (ZebraHandle zh, { dict_delete (zh->reg->matchDict, recid_z); } + zebra_end_trans(zh); return 0; } -void zebra_admin_create (ZebraHandle zh, const char *database) +int delete_w_handle(const char *info, void *handle) +{ + ZebraHandle zh = (ZebraHandle) handle; + ISAMC_P pos; + + if (*info == sizeof(pos)) + { + memcpy (&pos, info+1, sizeof(pos)); + isamb_unlink(zh->reg->isamb, pos); + } + return 0; +} + +static int delete_SU_handle(void *handle, int ord) +{ + ZebraHandle zh = (ZebraHandle) handle; + char ord_buf[20]; + int ord_len; + + ord_len = key_SU_encode (ord, ord_buf); + ord_buf[ord_len] = '\0'; + + assert (zh->reg->isamb); + dict_delete_subtree(zh->reg->dict, ord_buf, + zh, delete_w_handle); + return 0; +} + +int zebra_drop_database (ZebraHandle zh, const char *database) +{ + ASSERTZH; + yaz_log(LOG_API,"zebra_drop_database"); + zh->errCode = 0; + + if (zebra_select_database (zh, database)) + return -1; + if (zebra_begin_trans (zh, 1)) + return -1; + if (zh->reg->isamb) + { + zebraExplain_curDatabase (zh->reg->zei, database); + + zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle); + zebraExplain_removeDatabase(zh->reg->zei, zh); + } + zebra_end_trans (zh); + return 0; +} + +int zebra_create_database (ZebraHandle zh, const char *database) { - ZebraService zs; ASSERTZH; + yaz_log(LOG_API,"zebra_create_database"); zh->errCode=0; if (zebra_select_database (zh, database)) - return; - zebra_begin_trans (zh, 1); + return -1; + if (zebra_begin_trans (zh, 1)) + return -1; - zs = zh->service; /* announce database */ if (zebraExplain_newDatabase (zh->reg->zei, database, 0 /* explainDatabase */)) { + zebra_end_trans (zh); zh->errCode = 224; zh->errString = "database already exist"; + return -1; } zebra_end_trans (zh); + return 0; } int zebra_string_norm (ZebraHandle zh, unsigned reg_id, @@ -1059,6 +1179,7 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, { WRBUF wrbuf; ASSERTZH; + yaz_log(LOG_API,"zebra_string_norm "); zh->errCode=0; if (!zh->reg->zebra_maps) return -1; @@ -1075,13 +1196,14 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, } -void zebra_set_state (ZebraHandle zh, int val, int seqno) +int zebra_set_state (ZebraHandle zh, int val, int seqno) { char state_fname[256]; char *fname; long p = getpid(); FILE *f; ASSERTZH; + yaz_log(LOG_API,"zebra_set_state v=%d seq=%d", val, seqno); zh->errCode=0; sprintf (state_fname, "state.%s.LCK", zh->reg_name); @@ -1092,15 +1214,17 @@ void zebra_set_state (ZebraHandle zh, int val, int seqno) fprintf (f, "%c %d %ld\n", val, seqno, p); fclose (f); xfree (fname); + return 0; } -void zebra_get_state (ZebraHandle zh, char *val, int *seqno) +int zebra_get_state (ZebraHandle zh, char *val, int *seqno) { char state_fname[256]; char *fname; FILE *f; ASSERTZH; + yaz_log(LOG_API,"zebra_get_state "); zh->errCode=0; sprintf (state_fname, "state.%s.LCK", zh->reg_name); fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); @@ -1114,6 +1238,7 @@ void zebra_get_state (ZebraHandle zh, char *val, int *seqno) fclose (f); } xfree (fname); + return 0; } int zebra_begin_read (ZebraHandle zh) @@ -1121,13 +1246,14 @@ int zebra_begin_read (ZebraHandle zh) return zebra_begin_trans(zh, 0); } -void zebra_end_read (ZebraHandle zh) +int zebra_end_read (ZebraHandle zh) { - zebra_end_trans(zh); + return zebra_end_trans(zh); } int zebra_begin_trans (ZebraHandle zh, int rw) { + yaz_log(LOG_LOG, "zebra_begin_trans rw=%d trans=%d", rw, zh->trans_no); if (!zh->res) { zh->errCode = 2; @@ -1135,6 +1261,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw) return -1; } ASSERTZHRES; + yaz_log(LOG_API,"zebra_begin_trans rw=%d",rw); assert (zh->res); if (rw) { @@ -1152,12 +1279,15 @@ int zebra_begin_trans (ZebraHandle zh, int rw) zh->errString = "zebra_begin_trans: write trans not allowed within read trans"; return -1; } + if (zh->reg) + { + resultSetInvalidate (zh); + zebra_register_close (zh->service, zh->reg); + } zh->trans_w_no = zh->trans_no; zh->errCode=0; - yaz_log (LOG_LOG, "zebra_begin_trans"); - zh->records_inserted = 0; zh->records_updated = 0; zh->records_deleted = 0; @@ -1222,6 +1352,21 @@ int zebra_begin_trans (ZebraHandle zh, int rw) zh->path_reg); if (zh->reg) zh->reg->seqno = seqno; + else + { + zebra_set_state (zh, 'o', seqno); + + zebra_unlock (zh->lock_shadow); + zebra_unlock (zh->lock_normal); + + zh->trans_no--; + zh->trans_w_no = 0; + + zh->errCode = 2; + zh->errString = "zebra_begin_trans: cannot open register"; + yaz_log(LOG_FATAL, zh->errString); + return -1; + } } else { @@ -1285,6 +1430,9 @@ int zebra_begin_trans (ZebraHandle zh, int rw) zh->res, zh->path_reg); if (!zh->reg) { + zebra_unlock (zh->lock_normal); + zebra_unlock (zh->lock_shadow); + zh->trans_no--; zh->errCode = 109; return -1; } @@ -1297,6 +1445,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw) int zebra_end_trans (ZebraHandle zh) { ZebraTransactionStatus dummy; + yaz_log(LOG_API,"zebra_end_trans"); return zebra_end_transaction(zh, &dummy); } @@ -1307,6 +1456,7 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) const char *rval; ASSERTZH; + yaz_log(LOG_API,"zebra_end_transaction"); status->processed = 0; status->inserted = 0; @@ -1344,6 +1494,8 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) zebra_flush_reg (zh); + resultSetInvalidate (zh); + zebra_register_close (zh->service, zh->reg); zh->reg = 0; @@ -1384,27 +1536,31 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) return 0; } -void zebra_repository_update (ZebraHandle zh) +int zebra_repository_update (ZebraHandle zh) { ASSERTZH; zh->errCode=0; - logf (LOG_LOG, "updating %s", zh->rGroup.path); + logf (LOG_LOG|LOG_API, "updating %s", zh->rGroup.path); repositoryUpdate (zh); + return zh->errCode; } -void zebra_repository_delete (ZebraHandle zh) +int zebra_repository_delete (ZebraHandle zh) { ASSERTZH; zh->errCode=0; - logf (LOG_LOG, "deleting %s", zh->rGroup.path); + logf (LOG_LOG|LOG_API, "deleting %s", zh->rGroup.path); repositoryDelete (zh); + return zh->errCode; } -void zebra_repository_show (ZebraHandle zh) +int zebra_repository_show (ZebraHandle zh) { ASSERTZH; + yaz_log(LOG_API,"zebra_repository_show"); zh->errCode=0; repositoryShow (zh); + return zh->errCode; } static int zebra_commit_ex (ZebraHandle zh, int clean_only) @@ -1470,11 +1626,13 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only) int zebra_clean (ZebraHandle zh) { + yaz_log(LOG_API,"zebra_clean"); return zebra_commit_ex(zh, 1); } int zebra_commit (ZebraHandle zh) { + yaz_log(LOG_API,"zebra_commit"); return zebra_commit_ex(zh, 0); } @@ -1483,6 +1641,7 @@ int zebra_init (ZebraHandle zh) const char *rval; BFiles bfs = 0; ASSERTZH; + yaz_log(LOG_API,"zebra_init"); zh->errCode=0; if (!zh->res) @@ -1507,6 +1666,7 @@ int zebra_compact (ZebraHandle zh) { BFiles bfs; ASSERTZH; + yaz_log(LOG_API,"zebra_compact"); zh->errCode=0; if (!zh->res) { @@ -1519,56 +1679,69 @@ int zebra_compact (ZebraHandle zh) return 0; } -int zebra_record_insert (ZebraHandle zh, const char *buf, int len) +int zebra_record_insert (ZebraHandle zh, const char *buf, int len, int *sysno) { - int sysno = 0; + int sysn=0; ASSERTZH; + yaz_log(LOG_API,"zebra_record_insert"); + if (sysno) + *sysno=0; zh->errCode=0; if (zebra_begin_trans (zh, 1)) - return 0; + return -1; extract_rec_in_mem (zh, "grs.sgml", buf, len, "Default", /* database */ 0 /* delete_flag */, 0 /* test_mode */, - &sysno /* sysno */, + &sysn /* sysno */, 1 /* store_keys */, 1 /* store_data */, 0 /* match criteria */); if (zebra_end_trans (zh)) - return 0; - return sysno; + return -1; + if (sysno) + *sysno=sysn; + return 0; } -void zebra_set_group (ZebraHandle zh, struct recordGroup *rg) +int zebra_set_group (ZebraHandle zh, struct recordGroup *rg) { ASSERTZH; + yaz_log(LOG_API,"zebra_set_group"); zh->errCode=0; memcpy (&zh->rGroup, rg, sizeof(*rg)); + return 0; } -void zebra_result (ZebraHandle zh, int *code, char **addinfo) +int zebra_result (ZebraHandle zh, int *code, char **addinfo) { ASSERTZH; + yaz_log(LOG_API,"zebra_result"); *code = zh->errCode; *addinfo = zh->errString; + return 0; } -void zebra_shadow_enable (ZebraHandle zh, int value) +int zebra_shadow_enable (ZebraHandle zh, int value) { ASSERTZH; + yaz_log(LOG_API,"zebra_shadow_enable"); zh->errCode=0; zh->shadow_enable = value; + return 0; } int zebra_record_encoding (ZebraHandle zh, const char *encoding) { ASSERTZH; + yaz_log(LOG_API,"zebra_record_encoding"); zh->errCode=0; xfree (zh->record_encoding); /* * Fixme! + * Something about charset aliases. Oleg??? */ if (zh->iconv_to_utf8 != 0) @@ -1592,38 +1765,53 @@ int zebra_record_encoding (ZebraHandle zh, const char *encoding) return 0; } -void zebra_set_resource(ZebraHandle zh, const char *name, const char *value) +int zebra_set_resource(ZebraHandle zh, const char *name, const char *value) { ASSERTZH; + yaz_log(LOG_API,"zebra_set_resource %s:%s",name,value); zh->errCode=0; res_put(zh->res, name, value); + return 0; } const char *zebra_get_resource(ZebraHandle zh, const char *name, const char *defaultvalue) { + const char *v; ASSERTZH; + v= res_get_def( zh->res, name, (char *)defaultvalue); zh->errCode=0; - return res_get_def( zh->res, name, (char *)defaultvalue); + yaz_log(LOG_API,"zebra_get_resource %s:%s",name,v); + return v; } /* moved from zebra_api_ext.c by pop */ +/* FIXME: Should this really be public??? -Heikki */ -int zebra_trans_no (ZebraHandle zh) { - return (zh->trans_no); +int zebra_trans_no (ZebraHandle zh) +{ + ASSERTZH; + yaz_log(LOG_API,"zebra_trans_no"); + return zh->trans_no; } - - -int zebra_get_shadow_enable (ZebraHandle zh) { - return (zh->shadow_enable); +int zebra_get_shadow_enable (ZebraHandle zh) +{ + yaz_log(LOG_API,"zebra_get_shadow_enable"); + return (zh->shadow_enable); } -void zebra_set_shadow_enable (ZebraHandle zh, int value) { - zh->shadow_enable = value; +int zebra_set_shadow_enable (ZebraHandle zh, int value) +{ + yaz_log(LOG_API,"zebra_set_shadow_enable %d",value); + zh->shadow_enable = value; + return 0; } -void init_recordGroup (struct recordGroup *rg) { +int init_recordGroup (struct recordGroup *rg) +{ + assert(rg); + yaz_log(LOG_API,"init_recordGroup"); rg->groupName = NULL; rg->databaseName = NULL; rg->path = NULL; @@ -1636,6 +1824,7 @@ void init_recordGroup (struct recordGroup *rg) { rg->explainDatabase = 0; rg->fileVerboseLimit = 100000; rg->followLinks = -1; + return 0; } @@ -1643,76 +1832,85 @@ void init_recordGroup (struct recordGroup *rg) { called... and in general... Should be moved to somewhere else */ void res_get_recordGroup (ZebraHandle zh, struct recordGroup *rGroup, - const char *ext) { - char gprefix[128]; - char ext_res[128]; + const char *ext) +{ + char gprefix[128]; + char ext_res[128]; - if (!rGroup->groupName || !*rGroup->groupName) - *gprefix = '\0'; - else - sprintf (gprefix, "%s.", rGroup->groupName); - - /* determine file type - depending on extension */ - if (!rGroup->recordType) { - sprintf (ext_res, "%srecordType.%s", gprefix, ext); - if (!(rGroup->recordType = res_get (zh->res, ext_res))) { - sprintf (ext_res, "%srecordType", gprefix); - rGroup->recordType = res_get (zh->res, ext_res); - } - } - /* determine match criteria */ - if (!rGroup->recordId) { - sprintf (ext_res, "%srecordId.%s", gprefix, ext); - if (!(rGroup->recordId = res_get (zh->res, ext_res))) { - sprintf (ext_res, "%srecordId", gprefix); - rGroup->recordId = res_get (zh->res, ext_res); - } - } - - /* determine database name */ - if (!rGroup->databaseName) { - sprintf (ext_res, "%sdatabase.%s", gprefix, ext); - if (!(rGroup->databaseName = res_get (zh->res, ext_res))) { - sprintf (ext_res, "%sdatabase", gprefix); - rGroup->databaseName = res_get (zh->res, ext_res); - } - } - if (!rGroup->databaseName) - rGroup->databaseName = "Default"; - - /* determine if explain database */ - sprintf (ext_res, "%sexplainDatabase", gprefix); - rGroup->explainDatabase = - atoi (res_get_def (zh->res, ext_res, "0")); - - /* storeData */ - if (rGroup->flagStoreData == -1) { - const char *sval; - sprintf (ext_res, "%sstoreData.%s", gprefix, ext); - if (!(sval = res_get (zh->res, ext_res))) { - sprintf (ext_res, "%sstoreData", gprefix); - sval = res_get (zh->res, ext_res); - } - if (sval) - rGroup->flagStoreData = atoi (sval); - } - if (rGroup->flagStoreData == -1) rGroup->flagStoreData = 0; - - /* storeKeys */ - if (rGroup->flagStoreKeys == -1) { - const char *sval; + yaz_log(LOG_API,"res_get_recordGroup e=%s",ext); + if (!rGroup->groupName || !*rGroup->groupName) + *gprefix = '\0'; + else + sprintf (gprefix, "%s.", rGroup->groupName); - sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext); - sval = res_get (zh->res, ext_res); - if (!sval) { - sprintf (ext_res, "%sstoreKeys", gprefix); - sval = res_get (zh->res, ext_res); - } - if (!sval) sval = res_get (zh->res, "storeKeys"); - if (sval) rGroup->flagStoreKeys = atoi (sval); - } - if (rGroup->flagStoreKeys == -1) rGroup->flagStoreKeys = 0; - + /* determine file type - depending on extension */ + if (!rGroup->recordType) { + sprintf (ext_res, "%srecordType.%s", gprefix, ext); + if (!(rGroup->recordType = res_get (zh->res, ext_res))) { + sprintf (ext_res, "%srecordType", gprefix); + rGroup->recordType = res_get (zh->res, ext_res); + } + } + /* determine match criteria */ + if (!rGroup->recordId) { + sprintf (ext_res, "%srecordId.%s", gprefix, ext); + if (!(rGroup->recordId = res_get (zh->res, ext_res))) { + sprintf (ext_res, "%srecordId", gprefix); + rGroup->recordId = res_get (zh->res, ext_res); + } + } + + /* determine database name */ + if (!rGroup->databaseName) { + sprintf (ext_res, "%sdatabase.%s", gprefix, ext); + if (!(rGroup->databaseName = res_get (zh->res, ext_res))) { + sprintf (ext_res, "%sdatabase", gprefix); + rGroup->databaseName = res_get (zh->res, ext_res); + } + } + if (!rGroup->databaseName) + rGroup->databaseName = "Default"; + + /* determine if explain database */ + sprintf (ext_res, "%sexplainDatabase", gprefix); + rGroup->explainDatabase = + atoi (res_get_def (zh->res, ext_res, "0")); + + /* storeData */ + if (rGroup->flagStoreData == -1) + { + const char *sval; + sprintf (ext_res, "%sstoreData.%s", gprefix, ext); + if (!(sval = res_get (zh->res, ext_res))) + { + sprintf (ext_res, "%sstoreData", gprefix); + sval = res_get (zh->res, ext_res); + } + if (sval) + rGroup->flagStoreData = atoi (sval); + } + if (rGroup->flagStoreData == -1) + rGroup->flagStoreData = 0; + + /* storeKeys */ + if (rGroup->flagStoreKeys == -1) + { + const char *sval; + + sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext); + sval = res_get (zh->res, ext_res); + if (!sval) + { + sprintf (ext_res, "%sstoreKeys", gprefix); + sval = res_get (zh->res, ext_res); + } + if (!sval) + sval = res_get (zh->res, "storeKeys"); + if (sval) + rGroup->flagStoreKeys = atoi (sval); + } + if (rGroup->flagStoreKeys == -1) + rGroup->flagStoreKeys = 0; } @@ -1725,6 +1923,7 @@ void api_records_retrieve (ZebraHandle zh, ODR stream, { ZebraPosSet poset; int i, *pos_array; + yaz_log(LOG_API,"api_records_retrieve s=%s n=%d",setname,num_recs); if (!zh->res) { @@ -1803,17 +2002,20 @@ void api_records_retrieve (ZebraHandle zh, ODR stream, If sysno is provided, then it's used to identify the reocord. 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_insert_record (ZebraHandle zh, struct recordGroup *rGroup, const char *recordType, - int sysno, const char *match, const char *fname, + int *sysno, const char *match, const char *fname, const char *buf, int buf_size, int force_update) /* This one is ignored */ { int res; + yaz_log(LOG_API,"zebra_insert_record sysno=%d", *sysno); if (buf_size < 1) buf_size = strlen(buf); @@ -1822,25 +2024,26 @@ int zebra_insert_record (ZebraHandle zh, 0, /* delete_flag */ 0, /* test_mode */ recordType, - &sysno, + sysno, match, fname, force_update, 0); /* allow_update */ zebra_end_trans(zh); if (res < 0) return (res); - return sysno; + return res; } int zebra_update_record (ZebraHandle zh, struct recordGroup *rGroup, const char *recordType, - int sysno, const char *match, const char *fname, + int* 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); + if (buf_size < 1) buf_size = strlen(buf); zebra_begin_trans(zh, 1); @@ -1848,24 +2051,23 @@ int zebra_update_record (ZebraHandle zh, 0, /* delete_flag */ 0, /* test_mode */ recordType, - &sysno, + sysno, match, fname, force_update, 1); /* allow_update */ zebra_end_trans(zh); - return sysno; + return res; } - - int zebra_delete_record (ZebraHandle zh, struct recordGroup *rGroup, const char *recordType, - int sysno, const char *match, const char *fname, + int *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); if (buf_size < 1) buf_size = strlen(buf); @@ -1874,77 +2076,64 @@ int zebra_delete_record (ZebraHandle zh, 1, /* delete_flag */ 0, /* test_mode */ recordType, - &sysno, + sysno, match,fname, force_update, 1); /* allow_update */ zebra_end_trans(zh); - return sysno; + return res; } /* --------------------------------------------------------------------------- Searching - - zebra_search_RPN is the same as zebra_search_rpn, except that read locking - is not mandatory. (it's repeatable now, also in zebraapi.c) */ -void zebra_search_RPN (ZebraHandle zh, ODR decode, ODR stream, - Z_RPNQuery *query, const char *setname, int *hits) +int zebra_search_PQF (ZebraHandle zh, const char *pqf_query, + const char *setname, int *numhits) { - zh->hits = 0; - *hits = 0; - - if (zebra_begin_read (zh)) - return; - resultSetAddRPN (zh, decode, stream, query, - zh->num_basenames, zh->basenames, setname); - - zebra_end_read (zh); - - *hits = zh->hits; -} - -int zebra_search_PQF (ZebraHandle zh, - ODR odr_input, ODR odr_output, - const char *pqf_query, - const char *setname) - -{ - int hits; + int hits = 0; + int res=-1; Z_RPNQuery *query; - query = p_query_rpn (odr_input, PROTO_Z3950, pqf_query); + ODR odr = odr_createmem(ODR_ENCODE); + + yaz_log(LOG_API,"zebra_search_PQF s=%s q=%s",setname, pqf_query); - if (!query) { - logf (LOG_WARN, "bad query %s\n", pqf_query); - odr_reset (odr_input); - return(0); - } - zebra_search_RPN (zh, odr_input, odr_output, query, setname, &hits); + query = p_query_rpn (odr, PROTO_Z3950, pqf_query); - odr_reset (odr_input); - odr_reset (odr_output); + if (!query) + yaz_log (LOG_WARN, "bad query %s\n", pqf_query); + else + res=zebra_search_RPN (zh, odr, query, setname, &hits); - return(hits); + odr_destroy(odr); + + yaz_log(LOG_API,"Hits: %d",numhits); + + if (numhits) + *numhits=hits; + + return res; } /* --------------------------------------------------------------------------- Sort - a simplified interface, with optional read locks. + FIXME - This is a horrible name, will conflict with half the applications */ -int sort (ZebraHandle zh, - ODR stream, - const char *sort_spec, - const char *output_setname, - const char **input_setnames - ) +int zebra_sort_by_specstr (ZebraHandle zh, + ODR stream, + const char *sort_spec, + const char *output_setname, + const char **input_setnames) { int num_input_setnames = 0; int sort_status = 0; Z_SortKeySpecList *sort_sequence = yaz_sort_spec (stream, sort_spec); - if (!sort_sequence) { + yaz_log(LOG_API,"sort (FIXME) "); + if (!sort_sequence) + { logf(LOG_WARN,"invalid sort specs '%s'", sort_spec); zh->errCode = 207; - return (-1); + return -1; } /* we can do this, since the perl typemap code for char** will @@ -1958,5 +2147,5 @@ int sort (ZebraHandle zh, output_setname, sort_sequence, &sort_status); zebra_end_read(zh); - return (sort_status); + return sort_status; }