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

diff --git a/index/dirs.c b/index/dirs.c
index ce6da3f..b51704b 100644
--- a/index/dirs.c
+++ b/index/dirs.c
@@ -1,179 +1,233 @@
-/*
- * Copyright (C) 1994-1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: dirs.c,v $
- * Revision 1.2  1995-11-20 11:56:23  adam
- * Work on new traversal.
- *
- * Revision 1.1  1995/11/17  15:54:42  adam
- * Started work on virtual directory structure.
- */
+/* 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"
 
+#define DIRS_MAX_PATH 1024
+
 struct dirs_info {
     Dict dict;
+    int rw;
     int no_read;
     int no_cur;
     int no_max;
     struct dirs_entry *entries;
-    char nextpath[256];
-    char prefix[256];
+    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_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->no_cur < 0)
     {
         ci->no_cur = 0;
         return 0;
     }
-    if (ci->no_cur == ci->no_max)
-    {
-        assert (0);
-    }
+    assert(ci->no_cur < ci->no_max);
     entry = ci->entries + ci->no_cur;
-    if (info[0] == sizeof(entry->sysno)+sizeof(entry->ctime))
+    if (info[0] == sizeof(entry->sysno)+sizeof(entry->mtime))
     {
-        strcpy (entry->path, name + ci->prelen); 
+        strcpy(entry->path, name + ci->prelen);
         entry->kind = dirs_file;
-        memcpy (&entry->sysno, info+1, sizeof(entry->sysno));
-        memcpy (&entry->ctime, info+1+sizeof(entry->sysno), 
-                sizeof(entry->ctime));
+        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->ctime))
+    }
+    else if (info[0] == sizeof(entry->mtime))
     {
-        strcpy (entry->path, name + ci->prelen);
+        strcpy(entry->path, name + ci->prelen);
         entry->kind = dirs_dir;
-        memcpy (&entry->ctime, info+1, sizeof(entry->ctime));
+        memcpy(&entry->mtime, info+1, sizeof(entry->mtime));
         ci->no_cur++;
     }
     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;
 
-    logf (LOG_DEBUG, "dirs_open %s", rep);
-    if (!(p = malloc (sizeof (*p))))
-    {
-        logf (LOG_FATAL|LOG_ERRNO, "malloc");
-        exit (1);
-    }
+    yaz_log(YLOG_DEBUG, "dirs_open %s", rep);
+    p = (struct dirs_info *) xmalloc(sizeof(*p));
     p->dict = dict;
-    strcpy (p->prefix, rep);
+    p->rw = rw;
+    strcpy(p->prefix, rep);
     p->prelen = strlen(p->prefix);
-    strcpy (p->nextpath, rep);
+    strcpy(p->nextpath, rep);
+    p->nextpath_deleted = 0;
     p->no_read = p->no_cur = 0;
-    after = p->no_max = 400;
-    if (!(p->entries = malloc (sizeof(*p->entries) * (p->no_max))))
+    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)
+{
+    struct dirs_info *p;
+    struct dirs_entry *entry;
+    char *info;
+
+    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++;
     }
-    logf (LOG_DEBUG, "dirs_open first scan");
-    dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
     return p;
 }
 
-struct dirs_entry *dirs_read (struct dirs_info *p)
+struct dirs_entry *dirs_read(struct dirs_info *p)
 {
-    int before = 0, after = p->no_max;
+    int before = 0, after = p->no_max+1;
 
     if (p->no_read < p->no_cur)
     {
-        logf (LOG_DEBUG, "dirs_read %d. returns %s", p->no_read,
+        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 0
-    strcpy (p->nextpath, p->prefix);
-    strcat (p->nextpath, (p->entries + p->no_max-1)->path);
-#endif
-    p->no_cur = -1;
-    logf (LOG_DEBUG, "dirs_read rescan");
-    dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
+    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;
-    if (p->no_read < p->no_cur)
+    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)
+struct dirs_entry *dirs_last(struct dirs_info *p)
 {
     return p->last_entry;
 }
 
-void dirs_mkdir (struct dirs_info *p, const char *src, int ctime)
+void dirs_mkdir(struct dirs_info *p, const char *src, time_t mtime)
 {
-    char path[256];
+    char path[DIRS_MAX_PATH];
 
-    sprintf (path, "%s%s", p->prefix, src);
-    logf (LOG_DEBUG, "dirs_mkdir %s", path);
-    dict_insert (p->dict, path, sizeof(ctime), &ctime);
+    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)
+void dirs_rmdir(struct dirs_info *p, const char *src)
 {
-    char path[256];
-    char info[2];
+    char path[DIRS_MAX_PATH];
 
-    sprintf (path, "%s%s", p->prefix, src);
-    logf (LOG_DEBUG, "dirs_rmdir %s", path);
-    info[0] = 'r';
-    dict_insert (p->dict, path, 1, info);
+    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, int sysno, int ctime)
+void dirs_add(struct dirs_info *p, const char *src, zint sysno, time_t mtime)
 {
-    char path[256];
+    char path[DIRS_MAX_PATH];
     char info[16];
 
-    sprintf (path, "%s%s", p->prefix, src);
-    logf (LOG_DEBUG, "dirs_add %s", path);
-    memcpy (info, &sysno, sizeof(sysno));
-    memcpy (info+sizeof(sysno), &ctime, sizeof(ctime));
-    dict_insert (p->dict, path, sizeof(sysno)+sizeof(ctime), info);
+    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)
+void dirs_del(struct dirs_info *p, const char *src)
 {
-    char path[256];
-    char info[2];
+    char path[DIRS_MAX_PATH];
 
-    sprintf (path, "%s%s", p->prefix, src);
-    logf (LOG_DEBUG, "dirs_del %s", path);
-    info[0] = 'r';
-    dict_insert (p->dict, path, 1, info);
+    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)
+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
+ */
+