X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=1d6e6eceaffc4372dc584d7f7bf1c28cf94f01c6;hb=985e74909c7e486edbb5220522796ec66c735504;hp=38b8989af6377d8df7eb9ed6f2d81d59ccae36c0;hpb=c6959870998f868e6a0e9201739fb54aef696bc6;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 38b8989..1d6e6ec 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.196 2005-12-09 10:45:04 adam Exp $
+/* $Id: zebraapi.c,v 1.200 2006-01-19 13:30:02 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -72,7 +72,6 @@ static void zebra_flush_reg (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_flush_reg");
-    zebra_clearError(zh);
     zebraExplain_flush (zh->reg->zei, zh);
     
     extract_flushWriteKeys (zh, 1 /* final */);
@@ -343,7 +342,6 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     reg->isamc = 0;
     reg->isamb = 0;
     reg->zei = 0;
-    reg->matchDict = 0;
     reg->key_file_no = 0;
     reg->ptr_i = 0;
     
@@ -446,7 +444,6 @@ ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_shutdown");
-    zebra_clearError(zh);
 
     zebra_mutex_cond_lock (&zh->service->session_lock);
     zh->service->stop_flag = 1;
@@ -459,7 +456,6 @@ ZEBRA_RES zebra_admin_start (ZebraHandle zh)
     ZebraService zs;
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_start");
-    zebra_clearError(zh);
     zs = zh->service;
     zebra_mutex_cond_lock (&zs->session_lock);
     zebra_mutex_cond_unlock (&zs->session_lock);
@@ -939,7 +935,6 @@ ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,
     assert(hits);
     assert(setname);
     yaz_log(log_level, "zebra_search_rpn");
-    zebra_clearError(zh);
     zh->hits = 0;
     *hits = 0;
 
@@ -971,7 +966,6 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 
     yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs);
 
-    zebra_clearError(zh);
     if (!zh->res)
     {
 	zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
@@ -1099,7 +1093,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;
@@ -1139,7 +1133,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,
@@ -1156,7 +1150,7 @@ int zebra_deleteResultSet(ZebraHandle zh, int function,
     ASSERTZH;
     assert(statuses);
     yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
-    zebra_clearError(zh);;
+
     if (zebra_begin_read(zh))
 	return Z_DeleteStatus_systemProblemAtTarget;
     switch (function)
@@ -1207,15 +1201,6 @@ char *zebra_errAdd (ZebraHandle zh)
     return a;
 }
 
-void zebra_clearError(ZebraHandle zh)
-{
-    if (zh)
-    {
-        zh->errCode = 0;
-        zh->errString = 0;
-    }
-}
-
 ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
 {
     const char *p;
@@ -1224,7 +1209,7 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
     ZebraService zs;
 
     ASSERTZH;
-    zebra_clearError(zh);
+
     zs= zh->service;
     
     sprintf(u, "perm.%.30s", user ? user : "anonymous");
@@ -1254,7 +1239,6 @@ ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database,
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s", 
 		     database, record_type);
-    zebra_clearError(zh);
     if (zebra_select_database(zh, database) == ZEBRA_FAIL)
         return ZEBRA_FAIL;
     return zebra_begin_trans(zh, 1);
@@ -1264,7 +1248,6 @@ ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_end");
-    zebra_clearError(zh);
     return zebra_end_trans(zh);
 }
 
@@ -1275,7 +1258,7 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
     int i;
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_segment");
-    zebra_clearError(zh);
+
     for (i = 0; i<segment->num_segmentRecords; i++)
     {
 	Z_NamePlusRecord *npr = segment->segmentRecords[i];
@@ -1302,11 +1285,11 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
     return res;
 }
 
-ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
-				       const char *rec_buf,
-				       size_t rec_len,
-				       const char *recid_buf, size_t recid_len,
-				       int action)
+ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
+				      const char *rec_buf,
+				      size_t rec_len,
+				      const char *recid_buf, size_t recid_len,
+				      int action)
     /* 1 = insert. Fail it already exists */
     /* 2 = replace. Fail it does not exist */
     /* 3 = delete. Fail if does not exist */
@@ -1321,7 +1304,6 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
     assert(rec_buf);
 
     yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
-    zebra_clearError(zh);
 
     if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
     {
@@ -1421,7 +1403,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;
@@ -1437,6 +1418,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);
@@ -1448,7 +1431,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;
@@ -1475,7 +1457,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, "",
@@ -1498,7 +1480,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);
@@ -1518,7 +1499,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");
@@ -1624,8 +1605,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;
@@ -1719,7 +1698,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
@@ -1885,20 +1863,18 @@ int zebra_repository_update (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     assert(path);
-    zebra_clearError(zh);
     yaz_log (log_level, "updating %s", path);
     repositoryUpdate (zh, path);
-    return zh->errCode;
+    return 0;
 }
 
 int zebra_repository_delete (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     assert(path);
-    zebra_clearError(zh);
     yaz_log (log_level, "deleting %s", path);
     repositoryDelete (zh, path);
-    return zh->errCode;
+    return 0;
 }
 
 int zebra_repository_show (ZebraHandle zh, const char *path)
@@ -1906,31 +1882,29 @@ int zebra_repository_show (ZebraHandle zh, const char *path)
     ASSERTZH;
     assert(path);
     yaz_log(log_level, "zebra_repository_show");
-    zebra_clearError(zh);
     repositoryShow (zh, path);
-    return zh->errCode;
+    return 0;
 }
 
-static int zebra_commit_ex(ZebraHandle zh, int clean_only)
+static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
 {
     int seqno;
     char val;
     const char *rval;
     BFiles bfs;
     ASSERTZH;
-    zebra_clearError(zh);
 
     zebra_select_default_database(zh);
     if (!zh->res)
     {
         zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
-        return -1;
+        return ZEBRA_FAIL;
     }
     rval = res_get (zh->res, "shadow");    
     if (!rval)
     {
         yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined");
-        return 0;
+        return ZEBRA_OK;
     }
 
     zebra_lock_w (zh->lock_normal);
@@ -1969,7 +1943,7 @@ static int zebra_commit_ex(ZebraHandle zh, int clean_only)
 
     zebra_unlock (zh->lock_shadow);
     zebra_unlock (zh->lock_normal);
-    return 0;
+    return ZEBRA_OK;
 }
 
 ZEBRA_RES zebra_clean(ZebraHandle zh)
@@ -1992,7 +1966,6 @@ ZEBRA_RES zebra_init(ZebraHandle zh)
     BFiles bfs = 0;
     ASSERTZH;
     yaz_log(log_level, "zebra_init");
-    zebra_clearError(zh);
 
     zebra_select_default_database(zh);
     if (!zh->res)
@@ -2023,7 +1996,6 @@ ZEBRA_RES zebra_compact(ZebraHandle zh)
     BFiles bfs;
     ASSERTZH;
     yaz_log(log_level, "zebra_compact");
-    zebra_clearError(zh);
     if (!zh->res)
     {
         zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
@@ -2047,7 +2019,6 @@ void zebra_shadow_enable(ZebraHandle zh, int value)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_shadow_enable");
-    zebra_clearError(zh);
     zh->shadow_enable = value;
 }
 
@@ -2056,7 +2027,6 @@ ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
     ASSERTZH;
     assert(encoding);
     yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
-    zebra_clearError(zh);
 
     if (zh->iconv_to_utf8 != 0)
         yaz_iconv_close(zh->iconv_to_utf8);
@@ -2079,7 +2049,6 @@ ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_record_encoding");
-    zebra_clearError(zh);
     xfree(zh->record_encoding);
     zh->record_encoding = 0;
     if (encoding)
@@ -2093,7 +2062,6 @@ void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
     assert(name);
     assert(value);
     yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
-    zebra_clearError(zh);
     res_set(zh->res, name, value);
 }
 
@@ -2104,7 +2072,6 @@ const char *zebra_get_resource(ZebraHandle zh,
     ASSERTZH;
     assert(name);
     v = res_get_def (zh->res, name, (char *)defaultvalue);
-    zebra_clearError(zh);
     yaz_log(log_level, "zebra_get_resource %s:%s", name, v);
     return v;
 }
@@ -2200,8 +2167,9 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh,
     ASSERTZH;
     assert(buf);
 
-    yaz_log(log_level, "zebra_update_record sysno=" ZINT_FORMAT, 
-	    sysno ? *sysno : "none");
+    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);