C++ compilation.

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

diff --git a/index/zsets.c b/index/zsets.c
index 0935fe1..6394f3d 100644 (file)
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1994-1998, Index Data
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zsets.c,v $
- * Revision 1.19  1998-09-22 10:48:22  adam
+ * 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
+ * Moved loggin utilities to Yaz. Was implemented in file zlogs.c.
+ *
+ * Revision 1.20  1998/11/16 10:10:53  adam
+ * Fixed problem with zebraPosSetCreate that occurred when positions were
+ * less than 1.
+ *
+ * Revision 1.19  1998/09/22 10:48:22  adam
  * Minor changes in search API.
  *
  * Revision 1.18  1998/09/22 10:03:45  adam
@@ -75,7 +88,7 @@
  */
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -118,8 +131,6 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
 {
     ZebraSet zebraSet;
 
-    zlog_rpn (rpn);
-
     zh->errCode = 0;
     zh->errString = NULL;
     zh->hits = 0;
@@ -163,18 +174,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++)
@@ -241,7 +253,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;
@@ -255,7 +267,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
        for (i = 0; i<num; i++)
        {
            position = positions[i];
-           if (position <= sort_info->num_entries)
+           if (position > 0 && position <= sort_info->num_entries)
            {
                logf (LOG_DEBUG, "got pos=%d (sorted)", position);
                sr[i].sysno = sort_info->entries[position-1]->sysno;
@@ -634,8 +646,8 @@ ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name)
 
 void zebraRankInstall (ZebraHandle 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;