X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=32b47935dd2e63f8c11172605e158b043e4fb647;hb=3c32ec08b365ba1cbfa705d7cbefca5b7b4afe28;hp=77464978112a2f353b2563c801b2317d33fb790b;hpb=2c5c76f0a69069ae2a448e9d4e7b46dcc04bf761;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 7746497..32b4793 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.189 2005-09-19 08:20:15 adam Exp $ +/* $Id: zebraapi.c,v 1.198 2005-12-09 10:56:59 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -113,6 +113,7 @@ ZebraHandle zebra_open(ZebraService zs, Res res) zh->res = 0; zh->session_res = res_open(zs->global_res, res); zh->user_perm = 0; + zh->dbaccesslist = 0; zh->reg_name = xstrdup (""); zh->path_reg = 0; @@ -182,6 +183,7 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) { const char *passwd_plain = 0; const char *passwd_encrypt = 0; + const char *dbaccess = 0; ZebraService zh = xmalloc(sizeof(*zh)); if (configName) @@ -195,6 +197,7 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) zebra_mutex_cond_init (&zh->session_lock); passwd_plain = res_get (zh->global_res, "passwd"); passwd_encrypt = res_get (zh->global_res, "passwd.c"); + dbaccess = res_get (zh->global_res, "dbaccess"); if (!passwd_plain && !passwd_encrypt) zh->passwd_db = NULL; @@ -211,6 +214,17 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) passwd_db_file_crypt(zh->passwd_db, passwd_encrypt); } } + + if (!dbaccess) + zh->dbaccess = NULL; + else { + zh->dbaccess = res_open(NULL, NULL); + if (res_read_file(zh->dbaccess, dbaccess) != ZEBRA_OK) { + yaz_log(YLOG_FATAL, "Failed to read %s", dbaccess); + return NULL; + } + } + zh->path_root = res_get (zh->global_res, "root"); zh->nmem = nmem_create(); zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem); @@ -312,14 +326,13 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, reg->key_buf = 0; - reg->keys.buf_max = 0; - reg->keys.buf = 0; - reg->keys.codec_handle = iscz1_start(); + reg->keys = zebra_rec_keys_open(); +#if NATTR + reg->sortKeys = zebra_rec_keys_open(); +#else reg->sortKeys.buf = 0; reg->sortKeys.buf_max = 0; -#if NATTR - reg->sortKeys.codec_handle = iscz1_start(); #endif reg->records = 0; @@ -482,14 +495,13 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg) bfs_destroy (reg->bfs); data1_destroy (reg->dh); - xfree(reg->sortKeys.buf); - xfree(reg->keys.buf); - if (reg->keys.codec_handle) - iscz1_stop(reg->keys.codec_handle); + zebra_rec_keys_close(reg->keys); #if NATTR - if (reg->sortKeys.codec_handle) - iscz1_stop(reg->sortKeys.codec_handle); + zebra_rec_keys_close(reg->sortKeys); +#else + xfree(reg->sortKeys.buf); #endif + xfree(reg->key_buf); xfree(reg->name); xfree(reg); @@ -541,6 +553,8 @@ ZEBRA_RES zebra_close (ZebraHandle zh) xfree(zh->record_encoding); + xfree(zh->dbaccesslist); + for (i = 0; i < zh->num_basenames; i++) xfree(zh->basenames[i]); xfree(zh->basenames); @@ -819,6 +833,32 @@ ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases, zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; return ZEBRA_FAIL; } + + /* Check if the user has access to all databases (Seb) */ + /* You could argue that this should happen later, after we have + * determined that the database(s) exist. */ + if (zh->dbaccesslist) { + for (i = 0; i < num_bases; i++) { + const char *db = basenames[i]; + char *p, *pp; + for (p = zh->dbaccesslist; p && *p; p = pp) { + int len; + if ((pp = strchr(p, '+'))) { + len = pp - p; + pp++; + } + else + len = strlen(p); + if (len == strlen(db) && !strncmp(db, p, len)) + break; + } + if (!p) { + zh->errCode = YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED; + return ZEBRA_FAIL; + } + } + } + for (i = 0; i < zh->num_basenames; i++) xfree(zh->basenames[i]); xfree(zh->basenames); @@ -1059,7 +1099,7 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, assert(is_partial); assert(entries); yaz_log(log_level, "zebra_scan"); - zebra_clearError(zh); + if (zebra_begin_read (zh) == ZEBRA_FAIL) { *entries = 0; @@ -1099,7 +1139,7 @@ ZEBRA_RES zebra_sort (ZebraHandle zh, ODR stream, assert(sort_sequence); assert(sort_status); yaz_log(log_level, "zebra_sort"); - zebra_clearError(zh); + if (zebra_begin_read(zh) == ZEBRA_FAIL) return ZEBRA_FAIL; res = resultSetSort(zh, stream->mem, num_input_setnames, input_setnames, @@ -1179,6 +1219,7 @@ void zebra_clearError(ZebraHandle zh) ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) { const char *p; + const char *astring; char u[40]; ZebraService zs; @@ -1191,6 +1232,13 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) xfree(zh->user_perm); zh->user_perm = xstrdup(p ? p : "r"); + /* Determine database access list */ + astring = res_get(zs->dbaccess, user ? user : "anonymous"); + if (astring) + zh->dbaccesslist = xstrdup(astring); + else + zh->dbaccesslist = 0; + /* users that don't require a password .. */ if (zh->user_perm && strchr(zh->user_perm, 'a')) return ZEBRA_OK; @@ -1276,7 +1324,11 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, zebra_clearError(zh); if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) + { + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "no record ID or empty record ID"); return ZEBRA_FAIL; + } memcpy (recid_z, recid_buf, recid_len); recid_z[recid_len] = 0; @@ -1289,8 +1341,10 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, { if (action == 1) /* fail if insert */ { - zebra_end_trans(zh); - return ZEBRA_FAIL; + zebra_end_trans(zh); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "Cannot insert record: already exist"); + return ZEBRA_FAIL; } memcpy (&sysno, rinfo+1, sizeof(sysno)); @@ -1300,6 +1354,8 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, if (action == 2 || action == 3) /* fail if delete or update */ { zebra_end_trans(zh); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "Cannot delete/update record: does not exist"); return ZEBRA_FAIL; } action = 1; /* make it an insert (if it's an update).. */ @@ -1311,9 +1367,14 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, &sysno, 0, /* match */ 0, /* fname */ - 0, /* force update */ + 0, /* force update */ 1 /* allow update */ ); + if (res == ZEBRA_FAIL) + { + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "Unable to parse record"); + } if (action == 1) { dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno); @@ -1360,7 +1421,6 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) ZEBRA_RES ret = ZEBRA_OK; ASSERTZH; yaz_log(log_level, "zebra_drop_database %s", db); - zebra_clearError(zh); if (zebra_select_database (zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; @@ -1376,6 +1436,8 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) else { yaz_log(YLOG_WARN, "drop database only supported for isam:b"); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "drop database only supported for isam:b"); ret = ZEBRA_FAIL; } zebra_end_trans (zh); @@ -1387,7 +1449,6 @@ ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db) ASSERTZH; yaz_log(log_level, "zebra_create_database %s", db); assert(db); - zebra_clearError(zh); if (zebra_select_database (zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; @@ -1414,7 +1475,7 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, assert(input_str); assert(output_str); yaz_log(log_level, "zebra_string_norm "); - zebra_clearError(zh); + if (!zh->reg->zebra_maps) return -1; wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "", @@ -1437,7 +1498,6 @@ static void zebra_set_state (ZebraHandle zh, int val, int seqno) FILE *f; ASSERTZH; yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno); - zebra_clearError(zh); sprintf (state_fname, "state.%s.LCK", zh->reg_name); fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); @@ -1457,7 +1517,7 @@ static void zebra_get_state (ZebraHandle zh, char *val, int *seqno) ASSERTZH; yaz_log(log_level, "zebra_get_state "); - zebra_clearError(zh); + sprintf (state_fname, "state.%s.LCK", zh->reg_name); fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); f = fopen (fname, "r"); @@ -1563,8 +1623,6 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) } zh->trans_w_no = zh->trans_no; - zebra_clearError(zh); - zh->records_inserted = 0; zh->records_updated = 0; zh->records_deleted = 0; @@ -1658,7 +1716,6 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) zebra_flush_reg (zh); return ZEBRA_OK; } - zebra_clearError(zh); #if HAVE_SYS_TIMES_H times (&zh->tms1); #endif @@ -2096,8 +2153,7 @@ 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) { - SYSNO sysno = 0; - return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0); + return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 0); } ZEBRA_RES zebra_insert_record (ZebraHandle zh, @@ -2138,10 +2194,11 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh, { ZEBRA_RES res; ASSERTZH; - assert(sysno); assert(buf); - yaz_log(log_level, "zebra_update_record sysno=" ZINT_FORMAT, *sysno); + yaz_log(log_level, "zebra_update_record"); + if (sysno) + yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno); if (buf_size < 1) buf_size = strlen(buf);