X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzsets.c;h=c6a03c25f63e559a45054115ef7e0bb6176be9b0;hb=eb2b742588ce07fb4516bbca22c93b938b13e433;hp=5deef633dc7515fe5eee23c4d3f7fac1541a0fb5;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858;p=idzebra-moved-to-github.git

diff --git a/index/zsets.c b/index/zsets.c
index 5deef63..c6a03c2 100644
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zsets.c,v $
- * Revision 1.22  1999-02-02 14:51:15  adam
+ * Revision 1.25  2000-03-15 15:00:31  adam
+ * First work on threaded version.
+ *
+ * Revision 1.24  1999/11/04 15:00:45  adam
+ * Implemented delete result set(s).
+ *
+ * Revision 1.23  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.22  1999/02/02 14:51:15  adam
  * Updated WIN32 code specific sections. Changed header.
  *
  * Revision 1.21  1998/11/16 16:03:46  adam
@@ -171,18 +180,19 @@ ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov)
     else
     {
 	logf (LOG_DEBUG, "adding result set %s", name);
-	s = xmalloc (sizeof(*s));
+	s = (ZebraSet) xmalloc (sizeof(*s));
 	s->next = zh->sets;
 	zh->sets = s;
-	s->name = xmalloc (strlen(name)+1);
+	s->name = (char *) xmalloc (strlen(name)+1);
 	strcpy (s->name, name);
 
-	s->sort_info = xmalloc (sizeof(*s->sort_info));
+	s->sort_info = (struct zset_sort_info *)
+	    xmalloc (sizeof(*s->sort_info));
 	s->sort_info->max_entries = 1000;
-	s->sort_info->entries =
+	s->sort_info->entries = (struct zset_sort_entry **)
 	    xmalloc (sizeof(*s->sort_info->entries) *
 		     s->sort_info->max_entries);
-	s->sort_info->all_entries =
+	s->sort_info->all_entries = (struct zset_sort_entry *)
 	    xmalloc (sizeof(*s->sort_info->all_entries) *
 		     s->sort_info->max_entries);
 	for (i = 0; i < s->sort_info->max_entries; i++)
@@ -214,26 +224,48 @@ ZebraSet resultSetGet (ZebraHandle zh, const char *name)
     return NULL;
 }
 
-    
-void resultSetDestroy (ZebraHandle zh)
+void resultSetDestroy (ZebraHandle zh, int num, char **names,int *statuses)
 {
-    ZebraSet s, s1;
-
-    for (s = zh->sets; s; s = s1)
+    ZebraSet *ss = &zh->sets;
+    int i;
+    
+    if (statuses)
+	for (i = 0; i<num; i++)
+	    statuses[i] = Z_DeleteStatus_resultSetDidNotExist;
+    zh->errCode = 0;
+    zh->errString = NULL;
+    while (*ss)
     {
-        s1 = s->next;
-
-	xfree (s->sort_info->all_entries);
-	xfree (s->sort_info->entries);
-	xfree (s->sort_info);
-
-        if (s->nmem)
-            nmem_destroy (s->nmem);
-        rset_delete (s->rset);
-        xfree (s->name);
-        xfree (s);
+	int i = -1;
+	ZebraSet s = *ss;
+	if (num >= 0)
+	{
+	    for (i = 0; i<num; i++)
+		if (!strcmp (s->name, names[i]))
+		{
+		    if (statuses)
+			statuses[i] = Z_DeleteStatus_success;
+		    i = -1;
+		    break;
+		}
+	}
+	if (i < 0)
+	{
+	    *ss = s->next;
+	    
+	    xfree (s->sort_info->all_entries);
+	    xfree (s->sort_info->entries);
+	    xfree (s->sort_info);
+	    
+	    if (s->nmem)
+		nmem_destroy (s->nmem);
+	    rset_delete (s->rset);
+	    xfree (s->name);
+	    xfree (s);
+	}
+	else
+	    ss = &s->next;
     }
-    zh->sets = NULL;
 }
 
 ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name, 
@@ -249,7 +281,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
         return NULL;
     if (!(rset = sset->rset))
         return NULL;
-    sr = xmalloc (sizeof(*sr) * num);
+    sr = (ZebraPosSet) xmalloc (sizeof(*sr) * num);
     for (i = 0; i<num; i++)
     {
 	sr[i].sysno = 0;
@@ -340,11 +372,11 @@ void resultSetInsertSort (ZebraHandle zh, ZebraSet sset,
     struct zset_sort_info *sort_info = sset->sort_info;
     int i, j;
 
-    sortIdx_sysno (zh->sortIdx, sysno);
+    sortIdx_sysno (zh->service->sortIdx, sysno);
     for (i = 0; i<num_criteria; i++)
     {
-	sortIdx_type (zh->sortIdx, criteria[i].attrUse);
-	sortIdx_read (zh->sortIdx, this_entry.buf[i]);
+	sortIdx_type (zh->service->sortIdx, criteria[i].attrUse);
+	sortIdx_read (zh->service->sortIdx, this_entry.buf[i]);
     }
     i = sort_info->num_entries;
     while (--i >= 0)
@@ -530,14 +562,15 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
 	case Z_SortKey_sortAttributes:
 	    logf (LOG_DEBUG, "Sort: key %d is of type sortAttributes", i+1);
 	    sort_criteria[i].attrUse =
-		zebra_maps_sort (zh->zebra_maps, sk->u.sortAttributes);
+		zebra_maps_sort (zh->service->zebra_maps,
+				 sk->u.sortAttributes);
 	    logf (LOG_DEBUG, "use value = %d", sort_criteria[i].attrUse);
 	    if (sort_criteria[i].attrUse == -1)
 	    {
 		zh->errCode = 116;
 		return;
 	    }
-	    if (sortIdx_type (zh->sortIdx, sort_criteria[i].attrUse))
+	    if (sortIdx_type (zh->service->sortIdx, sort_criteria[i].attrUse))
 	    {
 		zh->errCode = 207;
 		return;
@@ -628,22 +661,22 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
 
 ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name)
 {
-    ZebraRankClass p = zh->rank_classes;
+    ZebraRankClass p = zh->service->rank_classes;
     while (p && strcmp (p->control->name, name))
 	p = p->next;
     if (p && !p->init_flag)
     {
 	if (p->control->create)
-	    p->class_handle = (*p->control->create)(zh);
+	    p->class_handle = (*p->control->create)(zh->service);
 	p->init_flag = 1;
     }
     return p;
 }
 
-void zebraRankInstall (ZebraHandle zh, struct rank_control *ctrl)
+void zebraRankInstall (ZebraService zh, struct rank_control *ctrl)
 {
-    ZebraRankClass p = xmalloc (sizeof(*p));
-    p->control = xmalloc (sizeof(*p->control));
+    ZebraRankClass p = (ZebraRankClass) xmalloc (sizeof(*p));
+    p->control = (struct rank_control *) xmalloc (sizeof(*p->control));
     memcpy (p->control, ctrl, sizeof(*p->control));
     p->control->name = xstrdup (ctrl->name);
     p->init_flag = 0;
@@ -651,7 +684,7 @@ void zebraRankInstall (ZebraHandle zh, struct rank_control *ctrl)
     zh->rank_classes = p;
 }
 
-void zebraRankDestroy (ZebraHandle zh)
+void zebraRankDestroy (ZebraService zh)
 {
     ZebraRankClass p = zh->rank_classes;
     while (p)