X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=6bd19b922e5744c6b8004ba489b89ff861b39cdc;hb=35590968609f84a4ac4f4965c7b359cf06640491;hp=7caf21a3166d9a045fa68ea9e5be42271c30f5c7;hpb=3f45c68ea8b1d3a3e9c5b3a014b3d001e89c46eb;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 7caf21a..6bd19b9 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,10 +1,32 @@
 /*
- * 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.5  1998-06-13 00:14:08  adam
+ * Revision 1.11  1998-10-16 08:14:34  adam
+ * Updated record control system.
+ *
+ * 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-]).
+ *
+ * Revision 1.6  1998/06/22 11:36:47  adam
+ * Added authentication check facility to zebra.
+ *
+ * Revision 1.5  1998/06/13 00:14:08  adam
  * Minor changes.
  *
  * Revision 1.4  1998/06/12 12:22:12  adam
@@ -80,23 +102,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);
 
@@ -147,7 +181,9 @@ ZebraHandle zebra_open (const char *configName)
     zh->sets = NULL;
     zh->registerState = -1;  /* trigger open of registers! */
     zh->registerChange = 0;
-    
+    zh->recTypes = recTypes_init (zh->dh);
+    recTypes_default_handlers (zh->recTypes);
+
     zh->records = NULL;
     zh->zebra_maps = zebra_maps_open (zh->res);
     zh->rank_classes = NULL;
@@ -155,6 +191,17 @@ ZebraHandle zebra_open (const char *configName)
     zh->errString = 0;
     
     zebraRankInstall (zh, rank1_class);
+
+    if (!res_get (zh->res, "passwd"))
+	zh->passwd_db = NULL;
+    else
+    {
+	zh->passwd_db = passwd_db_open ();
+	if (!zh->passwd_db)
+	    logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed");
+	else
+	    passwd_db_file (zh->passwd_db, res_get (zh->res, "passwd"));
+    }
     return zh;
 }
 
@@ -173,17 +220,20 @@ void zebra_close (ZebraHandle zh)
         rec_close (&zh->records);
         zebra_register_unlock (zh);
     }
+    recTypes_destroy (zh->recTypes);
     zebra_maps_close (zh->zebra_maps);
     zebraRankDestroy (zh);
     bfs_destroy (zh->bfs);
     data1_destroy (zh->dh);
     zebra_server_lock_destroy (zh);
 
+    if (zh->passwd_db)
+	passwd_db_close (zh->passwd_db);
     res_close (zh->res);
     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)
 {
@@ -191,7 +241,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);
 }
 
@@ -259,14 +311,14 @@ void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 }
 
 void zebra_sort (ZebraHandle zh, ODR stream,
-		 int num_input_setnames, char **input_setnames,
-		 char *output_setname, Z_SortKeySpecList *sort_sequence,
+		 int num_input_setnames, const char **input_setnames,
+		 const char *output_setname, Z_SortKeySpecList *sort_sequence,
 		 int *sort_status)
 {
     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);
 }
@@ -291,6 +343,13 @@ int zebra_hits (ZebraHandle zh)
     return zh->hits;
 }
 
+int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
+{
+    if (!zh->passwd_db || !passwd_db_auth (zh->passwd_db, user, pass))
+	return 0;
+    return 1;
+}
+
 void zebra_setDB (ZebraHandle zh, int num_bases, char **basenames)
 {