Removed zebra_search_rpn. Updated a few tests

[idzebra-moved-to-github.git] / index / zebraapi.c

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 4362409..b3c650f 100644 (file)
--- 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.101 2003-05-20 13:52:41 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
@@ -196,9 +196,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",
+    yaz_log (LOG_LOG, "zebra_register_open rw = %d useshadow=%d p=%p",
              rw, useshadow, reg);
-
+    
     reg->dh = data1_createx (DATA1_FLAG_XML);
     if (!reg->dh)
         return 0;
@@ -377,7 +377,7 @@ void zebra_admin_start (ZebraHandle zh)
 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, "zebra_register_close p=%p", reg);
     reg->stop_flag = 0;
     zebra_chdir (zs);
     if (reg->records)
@@ -744,7 +744,7 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
     return 0;
 }
 
-void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
+void zebra_search_RPN (ZebraHandle zh,
                       Z_RPNQuery *query, const char *setname, int *hits)
 {
     ASSERTZH;
@@ -757,7 +757,7 @@ void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
 
     zebra_livcode_transform(zh, query);
 
-    resultSetAddRPN (zh, decode, stream, query, 
+    resultSetAddRPN (zh, query, 
                      zh->num_basenames, zh->basenames, setname);
 
     zebra_end_read (zh);
@@ -1032,7 +1032,7 @@ int zebra_admin_exchange_record (ZebraHandle zh,
     return 0;
 }
 
-void zebra_admin_create (ZebraHandle zh, const char *database)
+void zebra_create_database (ZebraHandle zh, const char *database)
 {
     ZebraService zs;
     ASSERTZH;
@@ -1152,6 +1152,9 @@ 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)
+            zebra_register_close (zh->service, zh->reg);
+        
         zh->trans_w_no = zh->trans_no;
 
         zh->errCode=0;
@@ -1344,6 +1347,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;
         
@@ -1889,43 +1894,23 @@ int zebra_delete_record (ZebraHandle zh,
   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)
-{
-    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,
+int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
                      const char *setname)
-    
 {
-    int hits;
+    int hits = 0;
     Z_RPNQuery *query;
-    query = p_query_rpn (odr_input, PROTO_Z3950, pqf_query);
+    ODR odr = odr_createmem(ODR_ENCODE);
     
-    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
+        zebra_search_RPN (zh, query, setname, &hits);
     
-    return(hits);
+    odr_destroy(odr);
+
+    return hits;
 }
 
 /* ---------------------------------------------------------------------------