Bump year. Change Aps->ApS
[idzebra-moved-to-github.git] / dict / scan.c
index 3cd77b2..2e300b6 100644 (file)
@@ -1,26 +1,36 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: scan.c,v $
- * Revision 1.2  1995-10-06 10:43:16  adam
- * Minor changes.
- *
- * Revision 1.1  1995/10/06  09:04:18  adam
- * First version of scan.
- *
- */
+/* $Id: scan.c,v 1.19 2005-01-15 19:38:24 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
 
-#include <dict.h>
+#include "dict-p.h"
 
-void dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
-                   int start, int *count,
-                    int (*userfunc)(Dict_char *, const char *, int pos),
+int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
+                   int start, int *count, void *client,
+                    int (*userfunc)(char *, const char *, int, void *),
                    int dir)
 {
     int lo, hi, j;
@@ -30,11 +40,16 @@ void dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
 
     dict_bf_readp (dict->dbf, ptr, &p);
     hi = DICT_nodir(p)-1;
-    if (start == 0 && dir == -1)
-        lo = hi;
-    else
+    if (start != -1)
         lo = start;
-    indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short)); 
+    else
+    {
+        if (dir == -1)
+            lo = hi;
+        else
+            lo = 0;
+    }
+    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); 
 
     while (lo <= hi && lo >= 0 && *count > 0)
     {
@@ -48,7 +63,8 @@ void dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
             for (j = 0; info[j] != DICT_EOS; j++)
                str[pos+j] = info[j];
             str[pos+j] = DICT_EOS;
-            (*userfunc)(str, info+j*sizeof(Dict_char), *count * dir);
+            (*userfunc)((char*) str, info+(j+1)*sizeof(Dict_char),
+                            *count * dir, client);
             --(*count);
         }
         else
@@ -65,24 +81,40 @@ void dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
             memcpy (&dc, info+sizeof(Dict_ptr), sizeof(Dict_char));
             str[pos] = dc;
            memcpy (&subptr, info, sizeof(Dict_ptr));
-           if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+           if (dir>0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+            {
+                 str[pos+1] = DICT_EOS;
+                 if ((*userfunc)((char*) str,
+                                 info+sizeof(Dict_ptr)+sizeof(Dict_char),
+                                 *count * dir, client))
+                     return 1;
+                 --(*count);
+            }
+            if (*count>0 && subptr)
+            {
+               dict_scan_trav (dict, subptr, pos+1, str, -1, count, 
+                                client, userfunc, dir);
+                dict_bf_readp (dict->dbf, ptr, &p);
+                indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); 
+           }
+           if (*count>0 && dir<0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
             {
                  str[pos+1] = DICT_EOS;
-                 (*userfunc)(str, info+sizeof(Dict_ptr)+sizeof(Dict_char),
-                            *count * dir);
+                 if ((*userfunc)((char*) str,
+                                 info+sizeof(Dict_ptr)+sizeof(Dict_char),
+                                 *count * dir, client))
+                     return 1;
                  --(*count);
             }
-            if (*count > 0 && subptr)
-                dict_scan_trav (dict, subptr, pos+1, str, 0, count, 
-                                 userfunc, dir);
         }
         lo += dir;
     }
+    return 0;
 }
-    
+
 int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
-                int *before, int *after,
-                 int (*userfunc)(Dict_char *, const char *, int))
+                int *before, int *after, void *client,
+                 int (*userfunc)(char *, const char *, int, void *))
 {
     int cmp = 0, mid, lo, hi;
     void *p;
@@ -90,9 +122,11 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
     char *info;
 
     dict_bf_readp (dict->dbf, ptr, &p);
+    if (!p)
+        return 0;
     mid = lo = 0;
     hi = DICT_nodir(p)-1;
-    indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));    
+    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
     while (lo <= hi)
     {
         mid = (lo+hi)/2;
@@ -105,8 +139,14 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
            cmp = dict_strcmp ((Dict_char*) info, str + pos);
            if (!cmp)
             {
-                (*userfunc)(str, str, *after);
-                --(*after);
+                if (*after)
+                {
+                    (*userfunc)((char *) str, info+
+                                (dict_strlen((Dict_char*) info)+1)
+                                *sizeof(Dict_char), 
+                                *after, client);
+                    --(*after);
+                }
                 break;
             }
         }
@@ -129,18 +169,26 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                 {
                    if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
                     {
-                        (*userfunc)(str, 
-                                    info+sizeof(Dict_ptr)+sizeof(Dict_char),
-                                   *after);
-                       --(*after);
+                        if (*after)
+                        {
+                            (*userfunc)((char*) str,
+                                        info+sizeof(Dict_ptr)+
+                                        sizeof(Dict_char),
+                                        *after, client);
+                            --(*after);
+                        }
                     }
-                    if (*after > 0 && subptr)
-                       dict_scan_trav (dict, subptr, pos+1, str, 0, 
-                                        after, userfunc, 1);
+                    if (*after && subptr)
+                       if (dict_scan_trav (dict, subptr, pos+1, str, -1, 
+                                            after, client, userfunc, 1))
+                            return 1;
+                }
+               else if (subptr)
+                {
+                    if (dict_scan_r (dict, subptr, pos+1, str, before, after,
+                                     client, userfunc))
+                        return 1;
                 }
-               else if (*after > 0 && subptr)
-                    dict_scan_r (dict, subptr, pos+1, str, before, after,
-                                 userfunc);
                 break;
             }
         }
@@ -152,19 +200,29 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
     if (lo>hi && cmp < 0)
         ++mid;
     if (*after)
-        dict_scan_trav (dict, ptr, pos, str, cmp ? mid : mid+1, after,
-                        userfunc, 1);
-    if (*before && mid > 1)
-        dict_scan_trav (dict, ptr, pos, str, mid-1, before, 
-                        userfunc, -1);
+        if (dict_scan_trav (dict, ptr, pos, str, cmp ? mid : mid+1, after,
+                            client, userfunc, 1))
+            return 1;
+    if (*before && mid > 0)
+        if (dict_scan_trav (dict, ptr, pos, str, mid-1, before, 
+                            client, userfunc, -1))
+            return 1;
     return 0;
 }
 
-int dict_scan (Dict dict, Dict_char *str, int *before, int *after,
-               int (*f)(Dict_char *name, const char *info, int pos))
+int dict_scan (Dict dict, char *str, int *before, int *after, void *client,
+               int (*f)(char *name, const char *info, int pos, void *client))
 {
     int i;
-    i = dict_scan_r (dict, 1, 0, str, before, after, f);
-    return i;
-}
 
+    yaz_log (YLOG_DEBUG, "dict_scan");
+    for (i = 0; str[i]; i++)
+    {
+       yaz_log (YLOG_DEBUG, " %3d  %c", str[i],
+             (str[i] > ' ' && str[i] < 127) ? str[i] : '?');
+    }
+    if (!dict->head.root)
+        return 0;
+    return dict_scan_r (dict, dict->head.root, 0, (Dict_char *) str,
+                       before, after, client, f);
+}