X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=a1bb61dddf4a577efa23161513c42961da59961e;hb=4e67b823f05b521f193af096a40c0f64758c5fc1;hp=091fbf8c2070447f85cfb5428eea3084034fd62e;hpb=e1352999e1be86b0ce5c2698bb62f9fc7d598a4f;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 091fbf8..a1bb61d 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.244 2007-01-16 15:31:23 adam Exp $
+/* $Id: zebraapi.c,v 1.252 2007-03-19 21:50:39 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -143,6 +143,9 @@ ZebraHandle zebra_open(ZebraService zs, Res res)
     zh->m_staticrank = 0;
     zh->m_segment_indexing = 0;
 
+    zh->break_handler_func = 0;
+    zh->break_handler_data = 0;
+
     default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1");
 
     zh->iconv_to_utf8 =
@@ -1020,6 +1023,16 @@ void zebra_set_partial_result(ZebraHandle zh)
     zh->partial_result = 1;
 }
 
+
+ZEBRA_RES zebra_set_break_handler(ZebraHandle zh,
+                                  int (*f)(void *client_data),
+                                  void *client_data)
+{
+    zh->break_handler_func = f;
+    zh->break_handler_data = client_data;
+    return ZEBRA_OK;
+}
+
 ZEBRA_RES zebra_search_RPN_x(ZebraHandle zh, ODR o, Z_RPNQuery *query,
                              const char *setname, zint *hits,
                              int *estimated_hit_count,
@@ -1387,13 +1400,14 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
 		Odr_oct *oct = fragment->u.notExternallyTagged;
 		sysno = 0;
 		
-		if (zebra_update_record(zh, 
-					0, /* record Type */
-					&sysno,
-					0, /* match */
-					0, /* fname */
-					(const char *) oct->buf, oct->len,
-					0) == ZEBRA_FAIL)
+		if (zebra_update_record(
+                        zh, 
+                        action_update,
+                        0, /* record Type */
+                        &sysno,
+                        0, /* match */
+                        0, /* fname */
+                        (const char *) oct->buf, oct->len) == ZEBRA_FAIL)
 		    res = ZEBRA_FAIL;
 	    }
 	}
@@ -1401,99 +1415,6 @@ 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)
-    /* 1 = insert. Fail it already exists */
-    /* 2 = replace. Fail it does not exist */
-    /* 3 = delete. Fail if does not exist */
-    /* 4 = update. Insert/replace */
-{
-    ZEBRA_RES res;
-    zint sysno = 0;
-    char *rinfo = 0;
-    char recid_z[256];
-    int db_ord;
-    ZEBRA_CHECK_HANDLE(zh);
-    assert(action>0 && action <=4);
-    assert(rec_buf);
-
-    yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
-
-    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;
-
-    if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
-	return ZEBRA_FAIL;
-
-    db_ord = zebraExplain_get_database_ord(zh->reg->zei);
-    rinfo = dict_lookup_ord(zh->reg->matchDict, db_ord, recid_z);
-    if (rinfo)
-    {
-        if (action == 1)  /* fail if insert */
-        {
-	    if (zebra_end_trans(zh) != ZEBRA_OK)
-		yaz_log(YLOG_WARN, "zebra_end_trans failed");
-	    zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
-			   "Cannot insert record: already exist");
-	    return ZEBRA_FAIL;
-	}
-
-        memcpy (&sysno, rinfo+1, sizeof(sysno));
-    }
-    else
-    {
-        if (action == 2 || action == 3) /* fail if delete or update */
-        {
-	    if (zebra_end_trans(zh) != ZEBRA_OK)
-		yaz_log(YLOG_WARN, "zebra_end_trans failed");
-	    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).. */
-    }
-    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)
-    {
-	zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
-		       "Unable to parse record");
-    }
-    if (action == 1)
-    {
-        dict_insert_ord(zh->reg->matchDict, db_ord, recid_z,
-			sizeof(sysno), &sysno);
-    }
-    else if (action == 3)
-    {
-        dict_delete_ord(zh->reg->matchDict, db_ord, recid_z);
-    }
-    if (zebra_end_trans(zh) != ZEBRA_OK)
-    {
-	yaz_log(YLOG_WARN, "zebra_end_trans failed");
-	res = ZEBRA_FAIL;
-    }
-    return res;
-}
-
 int delete_w_handle(const char *info, void *handle)
 {
     ZebraHandle zh = (ZebraHandle) handle;
@@ -1592,9 +1513,9 @@ ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
     return zebra_end_trans (zh);
 }
 
-int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
-		       const char *input_str, int input_len,
-		       char *output_str, int output_len)
+int zebra_string_norm(ZebraHandle zh, unsigned reg_id,
+		      const char *input_str, int input_len,
+		      char *output_str, int output_len)
 {
     WRBUF wrbuf;
     ASSERTZH;
@@ -1622,9 +1543,9 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
     \param seqno sequence number
     
     val is one of:
-    d=writing to shadow(dirty)
-    o=no writing, 
-    c=commit
+    d=writing to shadow(shadow enabled); writing to register (shadow disabled)
+    o=reading only
+    c=commit (writing to register, reading from shadow, shadow mode only)
 */
 static void zebra_set_state (ZebraHandle zh, int val, int seqno)
 {
@@ -1703,7 +1624,7 @@ static void read_res_for_transaction(ZebraHandle zh)
     v = res_get_prefix(zh->res, "openRW", group, "1");
     zh->m_flag_rw = atoi(v);
 
-    v = res_get_prefix(zh->res, "fileVerboseLimit", group, "100000");
+    v = res_get_prefix(zh->res, "fileVerboseLimit", group, "1000");
     zh->m_file_verbose_limit = atoi(v);
 }
 
@@ -1762,6 +1683,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
         zh->records_updated = 0;
         zh->records_deleted = 0;
         zh->records_processed = 0;
+        zh->records_skipped = 0;
         
 #if HAVE_SYS_TIMES_H
         times (&zh->tms1);
@@ -1784,6 +1706,11 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
         if (val != 'o')
         {
             /* either we didn't finish commit or shadow is dirty */
+            if (!rval)
+            {
+                yaz_log(YLOG_WARN, "previous transaction did not finish "
+                        "(shadow disabled)");
+            }
             zebra_unlock (zh->lock_shadow);
             zebra_unlock (zh->lock_normal);
             if (zebra_commit (zh))
@@ -2069,6 +1996,7 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
 
     if (val == 'd')
     {
+        /* shadow area is dirty and so we must throw it away */
         yaz_log(YLOG_WARN, "previous transaction didn't reach commit");
         clean_only = 1;
     }
@@ -2285,48 +2213,20 @@ void zebra_set_shadow_enable (ZebraHandle zh, int value)
 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,
-			      zint *sysno, const char *match,
-			      const char *fname,
-			      const char *buf, int buf_size, int force_update)
-{
-    ZEBRA_RES res;
-    ASSERTZH;
-    assert(sysno);
-    assert(buf);
-    yaz_log(log_level, "zebra_insert_record sysno=" ZINT_FORMAT, *sysno);
-
-    if (buf_size < 1)
-	buf_size = strlen(buf);
-
-    if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
-	return ZEBRA_FAIL;
-    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");
-	res = ZEBRA_FAIL;
-    }
-    return res; 
+    return zebra_update_record(zh, action_update, 
+                               0 /* record type */,
+                               0 /* sysno */ ,
+                               0 /* match */, 
+                               0 /* fname */,
+                               buf, buf_size);
 }
 
 ZEBRA_RES zebra_update_record(ZebraHandle zh, 
+                              enum zebra_recctrl_action_t action,
                               const char *recordType,
                               zint *sysno, const char *match,
                               const char *fname,
-                              const char *buf, int buf_size,
-                              int force_update)
+                              const char *buf, int buf_size)
 {
     ZEBRA_RES res;
 
@@ -2338,18 +2238,18 @@ ZEBRA_RES zebra_update_record(ZebraHandle zh,
     if (sysno)
 	yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
 
-    if (buf_size < 1) buf_size = strlen(buf);
+    if (buf_size < 1)
+        buf_size = strlen(buf);
 
     if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
 	return ZEBRA_FAIL;
     res = zebra_buffer_extract_record(zh, buf, buf_size, 
-                                      0, /* delete_flag */
+                                      action,
                                       0, /* test_mode */
                                       recordType,
                                       sysno,   
-                                      match, fname,
-                                      force_update, 
-                                      1); /* allow_update */
+                                      match, 
+                                      fname);
     if (zebra_end_trans(zh) != ZEBRA_OK)
     {
 	yaz_log(YLOG_WARN, "zebra_end_trans failed");
@@ -2358,42 +2258,6 @@ ZEBRA_RES zebra_update_record(ZebraHandle zh,
     return res; 
 }
 
-ZEBRA_RES zebra_delete_record(ZebraHandle zh, 
-                              const char *recordType,
-                              zint *sysno, const char *match,
-                              const char *fname,
-                              const char *buf, int buf_size,
-                              int force_update) 
-{
-    ZEBRA_RES res;
-
-    ZEBRA_CHECK_HANDLE(zh);
-
-    assert(buf);
-    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 = 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");
-	res = ZEBRA_FAIL;
-    }
-    return res;
-}
-
 /* ---------------------------------------------------------------------------
   Searching 
 */