X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=fabd5e4037ea7bacc54e0fe4ca741ab9a49c97c2;hb=47ea1fc957c7b97bb30a26698f072109cae275e4;hp=f9effec399652869232f6a0b8ea34b5eb0808d93;hpb=81a75ae20b5b250309a70de51bfdf8de0019f882;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index f9effec..fabd5e4 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2002, Index Data
  * All rights reserved.
  *
- * $Id: zebraapi.c,v 1.53 2002-04-05 08:46:26 adam Exp $
+ * $Id: zebraapi.c,v 1.63 2002-07-25 13:06:43 adam Exp $
  */
 
 #include <assert.h>
@@ -37,7 +37,7 @@ static void zebra_chdir (ZebraService zh)
 
 static void zebra_flush_reg (ZebraHandle zh)
 {
-    zebraExplain_flush (zh->reg->zei, 1, zh);
+    zebraExplain_flush (zh->reg->zei, zh);
     
     extract_flushWriteKeys (zh);
     zebra_index_merge (zh);
@@ -50,12 +50,10 @@ static struct zebra_register *zebra_register_open (ZebraService zs,
                                                    const char *reg_path);
 static void zebra_register_close (ZebraService zs, struct zebra_register *reg);
 
-static int zebra_begin_read (ZebraHandle zh);
-static void zebra_end_read (ZebraHandle zh);
-
 ZebraHandle zebra_open (ZebraService zs)
 {
     ZebraHandle zh;
+    const char *default_encoding;
 
     if (!zs)
         return 0;
@@ -83,6 +81,23 @@ ZebraHandle zebra_open (ZebraService zs)
 
     zh->admin_databaseName = 0;
 
+    zh->shadow_enable = 1;
+
+    default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1");
+    zh->record_encoding = xstrdup (default_encoding);
+#if HAVE_ICONV_H
+    zh->iconv_to_utf8 =
+        iconv_open ("UTF-8", default_encoding);
+    if (zh->iconv_to_utf8 == (iconv_t)(-1))
+        yaz_log (LOG_WARN, "iconv: %s to UTF-8 unsupported",
+           default_encoding);
+    zh->iconv_from_utf8 =
+        iconv_open (default_encoding, "UTF-8");
+    if (zh->iconv_to_utf8 == (iconv_t)(-1))
+        yaz_log (LOG_WARN, "iconv: UTF-8 to %s unsupported",
+           default_encoding);
+#endif
+
     zebra_mutex_cond_lock (&zs->session_lock);
 
     zh->next = zs->sessions;
@@ -185,6 +200,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     reg->isam = 0;
     reg->isamc = 0;
     reg->isamd = 0;
+    reg->isamb = 0;
     reg->zei = 0;
     reg->matchDict = 0;
     
@@ -225,7 +241,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	    return 0;
 	}
     }
-    else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
+    if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
     {
 	if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,
 				  sizeof (struct it_key), res)))
@@ -234,7 +250,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	    return 0;
 	}
     }
-    else if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
+    if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
     {
 	struct ISAMC_M_s isamc_m;
 	if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC,
@@ -244,7 +260,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	    return 0;
 	}
     }
-    else if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
+    if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
     {
 	struct ISAMD_M_s isamd_m;
 	
@@ -255,6 +271,39 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	    return 0;
 	}
     }
+    if (res_get_match (res, "isam", "b", ISAM_DEFAULT))
+    {
+	struct ISAMC_M_s isamc_m;
+	
+	if (!(reg->isamb = isamb_open (reg->bfs, "isamb",
+                                       rw, key_isamc_m(res, &isamc_m), 0)))
+	{
+	    logf (LOG_WARN, "isamb_open");
+	    return 0;
+	}
+    }
+    if (res_get_match (res, "isam", "bc", ISAM_DEFAULT))
+    {
+	struct ISAMC_M_s isamc_m;
+	
+	if (!(reg->isamb = isamb_open (reg->bfs, "isamb",
+                                       rw, key_isamc_m(res, &isamc_m), 1)))
+	{
+	    logf (LOG_WARN, "isamb_open");
+	    return 0;
+	}
+    }
+    if (res_get_match (res, "isam", "null", ISAM_DEFAULT))
+    {
+	struct ISAMC_M_s isamc_m;
+	
+	if (!(reg->isamb = isamb_open (reg->bfs, "isamb",
+                                       rw, key_isamc_m(res, &isamc_m), -1)))
+	{
+	    logf (LOG_WARN, "isamb_open");
+	    return 0;
+	}
+    }
     reg->zei = zebraExplain_open (reg->records, reg->dh,
                                   res, rw, reg,
                                   explain_extract);
@@ -290,7 +339,7 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
     zebra_chdir (zs);
     if (reg->records)
     {
-        zebraExplain_close (reg->zei, 0);
+        zebraExplain_close (reg->zei);
         dict_close (reg->dict);
         if (reg->matchDict)
             dict_close (reg->matchDict);
@@ -303,6 +352,8 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
             isc_close (reg->isamc);
         if (reg->isamd)
             isamd_close (reg->isamd);
+        if (reg->isamb)
+            isamb_close (reg->isamb);
         rec_close (&reg->records);
     }
 
@@ -362,6 +413,14 @@ void zebra_close (ZebraHandle zh)
         zebra_register_close (zh->service, zh->reg);
     zebra_close_res (zh);
 
+    xfree (zh->record_encoding);
+#if HAVE_ICONV_H
+    if (zh->iconv_to_utf8 != (iconv_t) (-1))
+        iconv_close (zh->iconv_to_utf8);
+    if (zh->iconv_from_utf8 != (iconv_t) (-1))
+        iconv_close (zh->iconv_from_utf8);
+#endif
+
     xfree (zh->admin_databaseName);
     zebra_mutex_cond_lock (&zs->session_lock);
     zebra_lock_destroy (zh->lock_normal);
@@ -382,7 +441,7 @@ void zebra_close (ZebraHandle zh)
     zebra_mutex_cond_unlock (&zs->session_lock);
     xfree (zh->reg_name);
     xfree (zh);
-    yaz_log (LOG_LOG, "zebra_close zh=%p end", zh);}
+}
 
 struct map_baseinfo {
     ZebraHandle zh;
@@ -556,7 +615,7 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
 {
     int i;
     const char *cp;
-    size_t len = 0;
+    int len = 0;
     char *new_reg = 0;
     
     if (num_bases < 1)
@@ -595,7 +654,7 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
                 zh->errCode = 23;
                 return -1;
             }
-            if (len != cp - basenames[i] ||
+            if (len != cp1 - basenames[i] ||
                 memcmp (basenames[i], new_reg, len))
             {
                 zh->errCode = 23;
@@ -651,6 +710,8 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream,
         zh->errString = odr_strdup (stream, setname);
         return;
     }
+    
+    zh->errCode = 0;
 
     if (zebra_begin_read (zh))
 	return;
@@ -906,7 +967,7 @@ void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
     xfree (fname);
 }
 
-static int zebra_begin_read (ZebraHandle zh)
+int zebra_begin_read (ZebraHandle zh)
 {
     int dirty = 0;
     char val;
@@ -921,6 +982,9 @@ static int zebra_begin_read (ZebraHandle zh)
         zebra_flush_reg (zh);
         return 0;
     }
+#if HAVE_SYS_TIMES_H
+    times (&zh->tms1);
+#endif
     if (!zh->res)
     {
         (zh->trans_no)--;
@@ -969,13 +1033,21 @@ static int zebra_begin_read (ZebraHandle zh)
     return 0;
 }
 
-static void zebra_end_read (ZebraHandle zh)
+void zebra_end_read (ZebraHandle zh)
 {
     (zh->trans_no)--;
 
     if (zh->trans_no != 0)
         return;
 
+#if HAVE_SYS_TIMES_H
+    times (&zh->tms2);
+    logf (LOG_LOG, "user/system: %ld/%ld",
+                    (long) (zh->tms2.tms_utime - zh->tms1.tms_utime),
+                    (long) (zh->tms2.tms_stime - zh->tms1.tms_stime));
+
+#endif
+
     zebra_unlock (zh->lock_normal);
     zebra_unlock (zh->lock_shadow);
 }
@@ -985,7 +1057,7 @@ void zebra_begin_trans (ZebraHandle zh)
     int pass;
     int seqno = 0;
     char val = '?';
-    const char *rval;
+    const char *rval = 0;
 
     assert (zh->res);
 
@@ -996,12 +1068,19 @@ void zebra_begin_trans (ZebraHandle zh)
     }
     
     yaz_log (LOG_LOG, "zebra_begin_trans");
+
+    zh->records_inserted = 0;
+    zh->records_updated = 0;
+    zh->records_deleted = 0;
+    zh->records_processed = 0;
+
 #if HAVE_SYS_TIMES_H
     times (&zh->tms1);
 #endif
     
     /* lock */
-    rval = res_get (zh->res, "shadow");
+    if (zh->shadow_enable)
+        rval = res_get (zh->res, "shadow");
 
     for (pass = 0; pass < 2; pass++)
     {
@@ -1070,11 +1149,18 @@ void zebra_end_trans (ZebraHandle zh)
     yaz_log (LOG_LOG, "zebra_end_trans");
     rval = res_get (zh->res, "shadow");
 
+    zebraExplain_runNumberIncrement (zh->reg->zei, 1);
+
     zebra_flush_reg (zh);
 
     zebra_register_close (zh->service, zh->reg);
     zh->reg = 0;
 
+    
+    yaz_log (LOG_LOG, "Records: %7d i/u/d %d/%d/%d", 
+             zh->records_processed, zh->records_inserted,
+             zh->records_updated, zh->records_deleted);
+
     zebra_get_state (zh, &val, &seqno);
     if (val != 'd')
     {
@@ -1152,7 +1238,6 @@ int zebra_commit (ZebraHandle zh)
         zebra_set_state (zh, 'c', seqno);
 
         logf (LOG_LOG, "commit start");
-        sleep (2);
         bf_commitExec (bfs);
 #ifndef WIN32
         sync ();
@@ -1238,3 +1323,14 @@ void zebra_result (ZebraHandle zh, int *code, char **addinfo)
     *addinfo = zh->errString;
 }
 
+void zebra_shadow_enable (ZebraHandle zh, int value)
+{
+    zh->shadow_enable = value;
+}
+
+int zebra_record_encoding (ZebraHandle zh, const char *encoding)
+{
+    xfree (zh->record_encoding);
+    zh->record_encoding = xstrdup (encoding);
+    return 0;
+}