X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=6f56a0519d8dc8da7eb79d4a4e45c27f3ad9baa1;hb=5260b5390d8a1a36c66e52083e8ebb9d26b49f01;hp=4e5d2fdeca61be0c4e614bd123f8e2dbdb8d9842;hpb=55a5cde7eb23fb9aa5a8386d34bb1b6e131c19d8;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 4e5d2fd..6f56a05 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1995-1998, Index Data I/S 
+ * Copyright (C) 1995-1998, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraapi.c,v $
- * Revision 1.7  1998-06-24 12:16:13  adam
+ * Revision 1.10  1998-09-22 10:03:42  adam
+ * Changed result sets to be persistent in the sense that they can
+ * be re-searched if needed.
+ * Fixed memory leak in rsm_or.
+ *
+ * Revision 1.9  1998/09/02 13:53:17  adam
+ * Extra parameter decode added to search routines to implement
+ * persistent queries.
+ *
+ * Revision 1.8  1998/08/24 17:29:23  adam
+ * Minor changes.
+ *
+ * Revision 1.7  1998/06/24 12:16:13  adam
  * Support for relations on text operands. Open range support in
  * DFA module (i.e. [-j], [g-]).
  *
@@ -87,23 +99,35 @@ static int zebra_register_lock (ZebraHandle zh)
     zh->registerState = state;
     zh->records = rec_open (zh->bfs, 0);
     if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 40, 0)))
+    {
+	logf (LOG_WARN, "dict_open");
         return -1;
+    }
     if (!(zh->sortIdx = sortIdx_open (zh->bfs, 0)))
+    {
+	logf (LOG_WARN, "sortIdx_open");
 	return -1;
+    }
     zh->isam = NULL;
     zh->isamc = NULL;
     if (!res_get_match (zh->res, "isam", "i", NULL))
     {
         if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC,
 				    0, key_isamc_m(zh->res))))
+	{
+	    logf (LOG_WARN, "isc_open");
             return -1;
+	}
 
     }
     else
     {
         if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0,
                                   sizeof (struct it_key), zh->res)))
+	{
+	    logf (LOG_WARN, "is_open");
             return -1;
+	}
     }
     zh->zei = zebraExplain_open (zh->records, zh->dh, zh->res, 0, 0, 0);
 
@@ -173,10 +197,6 @@ ZebraHandle zebra_open (const char *configName)
 	else
 	    passwd_db_file (zh->passwd_db, res_get (zh->res, "passwd"));
     }
-    zh->bfs = bfs_create (res_get (zh->res, "register"));
-    bf_lockDir (zh->bfs, res_get (zh->res, "lockDir"));
-    data1_set_tabpath (zh->dh, res_get(zh->res, "profilePath"));
-
     return zh;
 }
 
@@ -207,7 +227,7 @@ void zebra_close (ZebraHandle zh)
     xfree (zh);
 }
 
-void zebra_search_rpn (ZebraHandle zh, ODR stream,
+void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode,
 		       Z_RPNQuery *query, int num_bases, char **basenames, 
 		       const char *setname)
 {
@@ -215,7 +235,9 @@ void zebra_search_rpn (ZebraHandle zh, ODR stream,
     zh->errCode = 0;
     zh->errString = NULL;
     zh->hits = 0;
-    rpn_search (zh, stream, query, num_bases, basenames, setname);
+
+    resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname);
+
     zebra_register_unlock (zh);
 }
 
@@ -290,7 +312,7 @@ void zebra_sort (ZebraHandle zh, ODR stream,
     zh->errCode = 0;
     zh->errString = NULL;
     zebra_register_lock (zh);
-    resultSetSort (zh, stream, num_input_setnames, input_setnames,
+    resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
 		   output_setname, sort_sequence, sort_status);
     zebra_register_unlock (zh);
 }