X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fdirs.c;h=b51704ba8b1bea0c1dc8f3f48f1f341f559ed496;hp=d4460ba99178eea2b48048aafea69accebfc6b1c;hb=e4c6861efeeea654bfb00c5f0239ee258629d77f;hpb=1891a7ab41007b52166ac5027389f0191193f997

diff --git a/index/dirs.c b/index/dirs.c
index d4460ba..b51704b 100644
--- a/index/dirs.c
+++ b/index/dirs.c
@@ -1,139 +1,233 @@
-/*
- * Copyright (C) 1994-1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: dirs.c,v $
- * Revision 1.1  1995-11-17 15:54:42  adam
- * Started work on virtual directory structure.
- *
- * Revision 1.9  1995/10/30  13:42:12  adam
- * Added errno.h
- *
- * Revision 1.8  1995/10/10  13:59:23  adam
- * Function rset_open changed its wflag parameter to general flags.
- *
- * Revision 1.7  1995/09/28  09:19:40  adam
- * xfree/xmalloc used everywhere.
- * Extract/retrieve method seems to work for text records.
- *
- * Revision 1.6  1995/09/08  14:52:26  adam
- * Minor changes. Dictionary is lower case now.
- *
- * Revision 1.5  1995/09/06  16:11:16  adam
- * Option: only one word key per file.
- *
- * Revision 1.4  1995/09/04  12:33:41  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.3  1995/09/01  14:06:35  adam
- * Split of work into more files.
- *
- * Revision 1.2  1995/09/01  10:57:07  adam
- * Minor changes.
- *
- * Revision 1.1  1995/09/01  10:34:51  adam
- * Added dir.c
- *
- */
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 Index Data
+
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
+#include <string.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <ctype.h>
 
-#include <alexutil.h>
 #include "index.h"
 
-struct dirs_entry {
-    char path[160];
-    int sysno;
-};
+#define DIRS_MAX_PATH 1024
 
 struct dirs_info {
-    int no;
-    struct dirs_entry *entries;
-};
-
-struct dirs_client_info {
-    struct dirs_info *di;
+    Dict dict;
+    int rw;
+    int no_read;
+    int no_cur;
     int no_max;
-    char *prefix;
+    struct dirs_entry *entries;
+    char nextpath[DIRS_MAX_PATH];
+    char prefix[DIRS_MAX_PATH];
     int prelen;
+    struct dirs_entry *last_entry;
+    int nextpath_deleted;
 };
 
-static int dirs_client_proc (Dict_char *name, const char *info, int pos,
+static int dirs_client_proc(char *name, const char *info, int pos,
                              void *client)
 {
-    struct dirs_client_info *ci = client;
+    struct dirs_info *ci = (struct dirs_info *) client;
+    struct dirs_entry *entry;
 
-    if (memcmp (name, ci->prefix, ci->prelen))
+    if (memcmp(name, ci->prefix, ci->prelen))
         return 1;
-    if (ci->di->no == ci->no_max)
+    if (ci->no_cur < 0)
+    {
+        ci->no_cur = 0;
+        return 0;
+    }
+    assert(ci->no_cur < ci->no_max);
+    entry = ci->entries + ci->no_cur;
+    if (info[0] == sizeof(entry->sysno)+sizeof(entry->mtime))
     {
-        if (ci->no_max > 0)
-        {
-            struct dirs_entry *arn;
-
-            ci->no_max += 1000;
-            arn = malloc (sizeof(*arn) * (ci->no_max));
-            if (!arn)
-            {
-                logf (LOG_FATAL|LOG_ERRNO, "malloc");
-                exit (1);
-            }
-            memcpy (arn, ci->di->entries, ci->di->no * sizeof(*arn));
-            free (ci->di->entries);
-            ci->di->entries = arn;
-        }
+        strcpy(entry->path, name + ci->prelen);
+        entry->kind = dirs_file;
+        memcpy(&entry->sysno, info+1, sizeof(entry->sysno));
+        memcpy(&entry->mtime, info+1+sizeof(entry->sysno),
+                sizeof(entry->mtime));
+        ci->no_cur++;
+    }
+    else if (info[0] == sizeof(entry->mtime))
+    {
+        strcpy(entry->path, name + ci->prelen);
+        entry->kind = dirs_dir;
+        memcpy(&entry->mtime, info+1, sizeof(entry->mtime));
+        ci->no_cur++;
     }
-    strcpy ((ci->di->entries + ci->di->no)->path, name); 
-    memcpy (&(ci->di->entries + ci->di->no)->sysno, info+1, *info);
-    assert (*info == sizeof(ci->di->entries->sysno));
-    ++(ci->di->no);
     return 0;
 }
 
-struct dirs_info *dirs_open (Dict dict, const char *rep)
+struct dirs_info *dirs_open(Dict dict, const char *rep, int rw)
+{
+    struct dirs_info *p;
+    int before = 0, after;
+
+    yaz_log(YLOG_DEBUG, "dirs_open %s", rep);
+    p = (struct dirs_info *) xmalloc(sizeof(*p));
+    p->dict = dict;
+    p->rw = rw;
+    strcpy(p->prefix, rep);
+    p->prelen = strlen(p->prefix);
+    strcpy(p->nextpath, rep);
+    p->nextpath_deleted = 0;
+    p->no_read = p->no_cur = 0;
+    after = p->no_max = 100;
+    p->entries = (struct dirs_entry *)
+	xmalloc(sizeof(*p->entries) * (p->no_max));
+    yaz_log(YLOG_DEBUG, "dirs_open first scan");
+    dict_scan(p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
+    return p;
+}
+
+struct dirs_info *dirs_fopen(Dict dict, const char *path, int rw)
 {
-    static char wname[200];
-    static char pname[200];
-    int dirid;
-    char *dinfo;
-    struct dirs_client_info dirs_client_info;
     struct dirs_info *p;
-    int before, after;
+    struct dirs_entry *entry;
+    char *info;
 
-    sprintf (wname, "d%s", rep);
-    dinfo = dict_lookup (dict, wname);
-    if (!dinfo)
-        return NULL;
-    if (!(p = malloc (sizeof (*p))))
+    p = (struct dirs_info *) xmalloc(sizeof(*p));
+    p->dict = dict;
+    p->rw = rw;
+    *p->prefix = '\0';
+    p->entries = (struct dirs_entry *) xmalloc(sizeof(*p->entries));
+    p->no_read = 0;
+    p->no_cur = 0;
+    p->no_max = 2;
+
+    entry = p->entries;
+    info = dict_lookup(dict, path);
+    if (info && info[0] == sizeof(entry->sysno)+sizeof(entry->mtime))
     {
-        logf (LOG_FATAL|LOG_ERRNO, "malloc");
-        exit (1);
+        strcpy(entry->path, path);
+        entry->kind = dirs_file;
+        memcpy(&entry->sysno, info+1, sizeof(entry->sysno));
+        memcpy(&entry->mtime, info+1+sizeof(entry->sysno),
+                sizeof(entry->mtime));
+        p->no_cur++;
     }
-    memcpy (&dirid, dinfo+1, sizeof(dirid));
-    sprintf (wname, "%d.", dirid);
-    strcpy (pname, wname);
-
-    p->no = 0;
-    dirs_client_info.di = p;
-    dirs_client_info.no_max = 0;
-    dirs_client_info.prefix = wname;
-    dirs_client_info.prelen = strlen(wname);
-    strcpy (pname, wname);
-    dict_scan (dict, pname, &before, &after, &dirs_client_info,
-               dirs_client_proc);
-
     return p;
 }
 
-void dirs_free (struct dirs_info **pp)
+struct dirs_entry *dirs_read(struct dirs_info *p)
+{
+    int before = 0, after = p->no_max+1;
+
+    if (p->no_read < p->no_cur)
+    {
+        yaz_log(YLOG_DEBUG, "dirs_read %d. returns %s", p->no_read,
+              (p->entries + p->no_read)->path);
+        return p->last_entry = p->entries + (p->no_read++);
+    }
+    if (p->no_cur < p->no_max)
+        return p->last_entry = NULL;
+    if (p->nextpath_deleted)
+    {
+        p->no_cur = 0;
+	after = p->no_max;
+    }
+    else
+    {
+        p->no_cur = -1;
+	after = p->no_max + 1;
+    }
+    p->no_read = 1;
+    p->nextpath_deleted = 0;
+    yaz_log(YLOG_DEBUG, "dirs_read rescan %s", p->nextpath);
+    dict_scan(p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
+    if (p->no_read <= p->no_cur)
+        return p->last_entry = p->entries;
+    return p->last_entry = NULL;
+}
+
+struct dirs_entry *dirs_last(struct dirs_info *p)
+{
+    return p->last_entry;
+}
+
+void dirs_mkdir(struct dirs_info *p, const char *src, time_t mtime)
+{
+    char path[DIRS_MAX_PATH];
+
+    sprintf(path, "%s%s", p->prefix, src);
+    yaz_log(YLOG_DEBUG, "dirs_mkdir %s", path);
+    if (p->rw)
+	dict_insert(p->dict, path, sizeof(mtime), &mtime);
+}
+
+void dirs_rmdir(struct dirs_info *p, const char *src)
+{
+    char path[DIRS_MAX_PATH];
+
+    sprintf(path, "%s%s", p->prefix, src);
+    yaz_log(YLOG_DEBUG, "dirs_rmdir %s", path);
+    if (p->rw)
+	dict_delete(p->dict, path);
+}
+
+void dirs_add(struct dirs_info *p, const char *src, zint sysno, time_t mtime)
+{
+    char path[DIRS_MAX_PATH];
+    char info[16];
+
+    sprintf(path, "%s%s", p->prefix, src);
+    yaz_log(YLOG_DEBUG, "dirs_add %s", path);
+    memcpy(info, &sysno, sizeof(sysno));
+    memcpy(info+sizeof(sysno), &mtime, sizeof(mtime));
+    if (p->rw)
+	dict_insert(p->dict, path, sizeof(sysno)+sizeof(mtime), info);
+}
+
+void dirs_del(struct dirs_info *p, const char *src)
+{
+    char path[DIRS_MAX_PATH];
+
+    sprintf(path, "%s%s", p->prefix, src);
+    yaz_log(YLOG_DEBUG, "dirs_del %s", path);
+    if (p->rw)
+    {
+        if (!strcmp(path, p->nextpath))
+             p->nextpath_deleted = 1;
+	dict_delete(p->dict, path);
+    }
+}
+
+void dirs_free(struct dirs_info **pp)
 {
     struct dirs_info *p = *pp;
 
-    free (p->entries);
-    free (p);
+    xfree(p->entries);
+    xfree(p);
     *pp = NULL;
 }
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+