X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdirs.c;h=186f4776d0395049b4d6d400c0a75ae30673e4ca;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=67ddca9102f2d89004b9e10f33e2b20beb18f9f4;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/index/dirs.c b/index/dirs.c
index 67ddca9..186f477 100644
--- a/index/dirs.c
+++ b/index/dirs.c
@@ -1,6 +1,6 @@
-/* $Id: dirs.c,v 1.18 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: dirs.c,v 1.25 2006-08-14 10:40:15 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,9 +15,9 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -42,6 +42,7 @@ struct dirs_info {
     char prefix[DIRS_MAX_PATH];
     int prelen;
     struct dirs_entry *last_entry;
+    int nextpath_deleted;
 };
 
 static int dirs_client_proc (char *name, const char *info, int pos,
@@ -57,10 +58,7 @@ static int dirs_client_proc (char *name, const char *info, int pos,
         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->mtime))
     {
@@ -86,23 +84,24 @@ 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);
+    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));
-    logf (LOG_DEBUG, "dirs_open first scan");
+    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)
+struct dirs_info *dirs_fopen (Dict dict, const char *path, int rw)
 {
     struct dirs_info *p;
     struct dirs_entry *entry;
@@ -110,6 +109,7 @@ struct dirs_info *dirs_fopen (Dict dict, const char *path)
 
     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;
@@ -136,16 +136,26 @@ struct dirs_entry *dirs_read (struct dirs_info *p)
 
     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;
-    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;
+    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;
@@ -161,7 +171,7 @@ 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);
-    logf (LOG_DEBUG, "dirs_mkdir %s", path);
+    yaz_log (YLOG_DEBUG, "dirs_mkdir %s", path);
     if (p->rw)
 	dict_insert (p->dict, path, sizeof(mtime), &mtime);
 }
@@ -171,18 +181,18 @@ void dirs_rmdir (struct dirs_info *p, const char *src)
     char path[DIRS_MAX_PATH];
 
     sprintf (path, "%s%s", p->prefix, src);
-    logf (LOG_DEBUG, "dirs_rmdir %s", path);
+    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, time_t mtime)
+void dirs_add (struct dirs_info *p, const char *src, SYSNO sysno, time_t mtime)
 {
     char path[DIRS_MAX_PATH];
     char info[16];
 
     sprintf (path, "%s%s", p->prefix, src);
-    logf (LOG_DEBUG, "dirs_add %s", path);
+    yaz_log (YLOG_DEBUG, "dirs_add %s", path);
     memcpy (info, &sysno, sizeof(sysno));
     memcpy (info+sizeof(sysno), &mtime, sizeof(mtime));
     if (p->rw)
@@ -194,9 +204,13 @@ void dirs_del (struct dirs_info *p, const char *src)
     char path[DIRS_MAX_PATH];
 
     sprintf (path, "%s%s", p->prefix, src);
-    logf (LOG_DEBUG, "dirs_del %s", path);
+    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)
@@ -208,3 +222,11 @@ void dirs_free (struct dirs_info **pp)
     *pp = NULL;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+