Changed project.

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

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 30e84a7..848e24e 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (C) 1995-1998, Index Data ApS
+ * Copyright (C) 1995-1998, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraapi.c,v $
- * Revision 1.8  1998-08-24 17:29:23  adam
+ * Revision 1.12  1998-11-16 10:18:10  adam
+ * Better error reporting for result sets.
+ *
+ * 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
@@ -169,7 +184,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;
@@ -206,6 +223,7 @@ 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);
@@ -218,7 +236,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)
 {
@@ -226,7 +244,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);
 }
 
@@ -250,7 +270,8 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream,
     if (!poset)
     {
         logf (LOG_DEBUG, "zebraPosSetCreate error");
-        zh->errCode = 13;
+        zh->errCode = 30;
+        zh->errString = nmem_strdup (stream->mem, setname);
     }
     else
     {
@@ -258,8 +279,12 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream,
        {
            if (!poset[i].sysno)
            {
+               char num_str[20];
+
+               sprintf (num_str, "%d", pos_array[i]);  
                zh->errCode = 13;
-               logf (LOG_DEBUG, "Out of range. pos=%d", pos_array[i]);
+                zh->errString = nmem_strdup (stream->mem, num_str);
+                break;
            }
            else
            {
@@ -301,7 +326,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);
 }