X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=6bd19b922e5744c6b8004ba489b89ff861b39cdc;hb=d0fa45cf0b317b7332a097928dc3c8827536a97d;hp=54e01a5861896fb6cb5a216ccb894fc5f53b2908;hpb=0df6c383d656dba662eb9d9acafed01a0973fcff;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 54e01a5..6bd19b9 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -4,7 +4,15 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraapi.c,v $
- * Revision 1.9  1998-09-02 13:53:17  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.
  *
@@ -173,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;
@@ -210,6 +220,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);
@@ -230,7 +241,9 @@ void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode,
     zh->errCode = 0;
     zh->errString = NULL;
     zh->hits = 0;
-    rpn_search (zh, stream, decode, query, num_bases, basenames, setname);
+
+    resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname);
+
     zebra_register_unlock (zh);
 }
 
@@ -305,7 +318,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);
 }