X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Ftrav.c;h=6ff72497d44bb131fdcd961a7d6cb76e7b175d8c;hp=27a803c3cbe20b2495848809c52253056e03a618;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=51a52e1b014d5237581f74379916b8ce92cafef7

diff --git a/index/trav.c b/index/trav.c
index 27a803c..6ff7249 100644
--- a/index/trav.c
+++ b/index/trav.c
@@ -1,292 +1,426 @@
-/*
- * Copyright (C) 1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: trav.c,v $
- * Revision 1.1  1995-09-01 14:06:36  adam
- * Split of work into more files.
- *
- */
+/* $Id: trav.c,v 1.47 2005-01-15 19:38:27 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 <stdio.h>
 #include <assert.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#ifdef WIN32
+#include <io.h>
+#define S_ISREG(x) (x & _S_IFREG)
+#define S_ISDIR(x) (x & _S_IFDIR)
+#else
+#include <unistd.h>
+#endif
+#include <direntz.h>
 #include <fcntl.h>
-#include <ctype.h>
+#include <time.h>
 
-#include <util.h>
 #include "index.h"
 
-static void repository_extract_r (int cmd, char *rep)
+static int repComp (const char *a, const char *b, size_t len)
+{
+    if (!len)
+        return 0;
+    return memcmp (a, b, len);
+}
+
+static void repositoryExtractR (ZebraHandle zh, int deleteFlag, char *rep,
+				int level)
 {
     struct dir_entry *e;
     int i;
-    struct stat fs;
     size_t rep_len = strlen (rep);
 
-    e = dir_open (rep);
+    e = dir_open (rep, zh->path_reg, zh->m_follow_links);
     if (!e)
         return;
+    yaz_log (YLOG_LOG, "dir %s", rep);
     if (rep[rep_len-1] != '/')
         rep[rep_len] = '/';
     else
         --rep_len;
+    
     for (i=0; e[i].name; i++)
     {
+	char *ecp;
         strcpy (rep +rep_len+1, e[i].name);
-        stat (rep, &fs);
-        switch (fs.st_mode & S_IFMT)
+	if ((ecp = strrchr (e[i].name, '/')))
+	    *ecp = '\0';
+
+        switch (e[i].kind)
         {
-        case S_IFREG:
-            file_extract (cmd, rep, rep);
+        case dirs_file:
+            fileExtract (zh, NULL, rep, deleteFlag);
             break;
-        case S_IFDIR:
-            repository_extract_r (cmd, rep);
+        case dirs_dir:
+            repositoryExtractR (zh, deleteFlag, rep, level+1);
             break;
         }
     }
     dir_free (&e);
-}
-
-void copy_file (const char *dst, const char *src)
-{
-    int d_fd = open (dst, O_WRONLY|O_CREAT, 0666);
-    int s_fd = open (src, O_RDONLY);
-    char *buf;
-    size_t i, r, w;
-
-    if (d_fd == -1)
-    {
-        log (LOG_FATAL|LOG_ERRNO, "Cannot create %s", dst);
-        exit (1);
-    }
-    if (s_fd == -1)
-    {
-        log (LOG_FATAL|LOG_ERRNO, "Cannot open %s", src);
-        exit (1);
-    }
-    if (!(buf = malloc (4096)))
-    {
-        log (LOG_FATAL|LOG_ERRNO, "malloc");
-        exit (1);
-    }
-    while ((r=read (s_fd, buf, 4096))>0)
-        for (w = 0; w < r; w += i)
-        {
-            i = write (d_fd, buf + w, r - w);
-            if (i == -1)
-            {
-                log (LOG_FATAL|LOG_ERRNO, "write");
-                exit (1);
-            }
-        }
-    if (r)
-    {
-        log (LOG_FATAL|LOG_ERRNO, "read");
-        exit (1);
-    }
-    free (buf);
-    close (d_fd);
-    close (s_fd);
-}
-
-void del_file (const char *dst)
-{
-    unlink (dst);
-}
-
-void del_dir (const char *dst)
-{
-    log (LOG_DEBUG, "rmdir of %s", dst);
-    if (rmdir (dst) == -1)
-        log (LOG_ERRNO|LOG_WARN, "rmdir");
-}
 
-void repository_update_r (int cmd, char *dst, char *src);
-
-void repository_add_tree (int cmd, char *dst, char *src)
-{
-    mkdir (dst, 0755);
-    repository_update_r (cmd, dst, src);
 }
 
-void repository_del_tree (int cmd, char *dst, char *src)
+static void fileDeleteR (ZebraHandle zh,
+                         struct dirs_info *di, struct dirs_entry *dst,
+                         const char *base, char *src)
 {
-    size_t dst_len = strlen (dst);
+    char tmppath[1024];
     size_t src_len = strlen (src);
-    struct dir_entry *e_dst;
-    int i_dst = 0;
-    struct stat fs_dst;
 
-    e_dst = dir_open (dst);
-
-    dir_sort (e_dst);
-
-    if (src[src_len-1] != '/')
-        src[src_len] = '/';
-    else
-        --src_len;
-    if (dst[dst_len-1] != '/')
-        dst[dst_len] = '/';
-    else
-        --dst_len;
-    while (e_dst[i_dst].name)
+    while (dst && !repComp (dst->path, src, src_len+1))
     {
-        strcpy (dst +dst_len+1, e_dst[i_dst].name);
-        strcpy (src +src_len+1, e_dst[i_dst].name);
-        
-        stat (dst, &fs_dst);
-        switch (fs_dst.st_mode & S_IFMT)
+        switch (dst->kind)
         {
-        case S_IFREG:
-            file_extract ('d', dst, dst);
-            del_file (dst);
+        case dirs_file:
+            sprintf (tmppath, "%s%s", base, dst->path);
+            fileExtract (zh, &dst->sysno, tmppath, 1);
+             
+            strcpy (tmppath, dst->path);
+            dst = dirs_read (di); 
+            dirs_del (di, tmppath);
             break;
-        case S_IFDIR:
-            repository_del_tree (cmd, dst, src);
+        case dirs_dir:
+            strcpy (tmppath, dst->path);
+            dst = dirs_read (di);
+            dirs_rmdir (di, tmppath);
             break;
+        default:
+            dst = dirs_read (di);
         }
-        i_dst++;
-    }
-    dir_free (&e_dst);
-    if (dst_len > 0)
-    {
-        dst[dst_len] = '\0';
-        del_dir (dst);
     }
 }
 
-void repository_update_r (int cmd, char *dst, char *src)
+static void fileUpdateR (ZebraHandle zh,
+                         struct dirs_info *di, struct dirs_entry *dst,
+			 const char *base, char *src, 
+			 int level)
 {
-    struct dir_entry *e_dst, *e_src;
-    int i_dst = 0, i_src = 0;
-    struct stat fs_dst, fs_src;
-    size_t dst_len = strlen (dst);
+    struct dir_entry *e_src;
+    int i_src = 0;
+    static char tmppath[1024];
     size_t src_len = strlen (src);
 
-    e_dst = dir_open (dst);
-    e_src = dir_open (src);
+    sprintf (tmppath, "%s%s", base, src);
+    e_src = dir_open (tmppath, zh->path_reg, zh->m_follow_links);
+    yaz_log (YLOG_LOG, "dir %s", tmppath);
 
-    if (!e_dst && !e_src)
-        return;
-    if (!e_dst)
+#if 0
+    if (!dst || repComp (dst->path, src, src_len))
+#else
+    if (!dst || strcmp (dst->path, src))
+#endif
     {
-        dir_free (&e_src);
-        repository_add_tree (cmd, dst, src);
-        return;
+        if (!e_src)
+            return;
+
+        if (src_len && src[src_len-1] != '/')
+        {
+            src[src_len] = '/';
+            src[++src_len] = '\0';
+        }
+        dirs_mkdir (di, src, 0);
+        if (dst && repComp (dst->path, src, src_len))
+            dst = NULL;
     }
     else if (!e_src)
     {
-        dir_free (&e_dst);
-        repository_del_tree (cmd, dst, src);
+        strcpy (src, dst->path);
+        fileDeleteR (zh, di, dst, base, src);
         return;
     }
-
+    else
+    {
+        if (src_len && src[src_len-1] != '/')
+        {
+            src[src_len] = '/';
+            src[++src_len] = '\0';
+        }
+        dst = dirs_read (di); 
+    }
     dir_sort (e_src);
-    dir_sort (e_dst);
 
-    if (src[src_len-1] != '/')
-        src[src_len] = '/';
-    else
-        --src_len;
-    if (dst[dst_len-1] != '/')
-        dst[dst_len] = '/';
-    else
-        --dst_len;
-    while (e_dst[i_dst].name || e_src[i_src].name)
+    while (1)
     {
         int sd;
 
-        if (e_dst[i_dst].name && e_src[i_src].name)
-            sd = strcmp (e_dst[i_dst].name, e_src[i_src].name);
+        if (dst && !repComp (dst->path, src, src_len))
+        {
+            if (e_src[i_src].name)
+            {
+                yaz_log (YLOG_DEBUG, "dst=%s src=%s", dst->path + src_len,
+		      e_src[i_src].name);
+                sd = strcmp (dst->path + src_len, e_src[i_src].name);
+            }
+            else
+                sd = -1;
+        }
         else if (e_src[i_src].name)
             sd = 1;
         else
-            sd = -1;
-                
+            break;
+        yaz_log (YLOG_DEBUG, "trav sd=%d", sd);
+
         if (sd == 0)
         {
-            strcpy (dst +dst_len+1, e_dst[i_dst].name);
-            strcpy (src +src_len+1, e_src[i_src].name);
+            strcpy (src + src_len, e_src[i_src].name);
+            sprintf (tmppath, "%s%s", base, src);
             
-            /* check type, date, length */
-
-            stat (dst, &fs_dst);
-            stat (src, &fs_src);
-                
-            switch (fs_dst.st_mode & S_IFMT)
+            switch (e_src[i_src].kind)
             {
-            case S_IFREG:
-                if (fs_src.st_ctime > fs_dst.st_ctime)
+            case dirs_file:
+                if (e_src[i_src].mtime > dst->mtime)
                 {
-                    file_extract ('d', dst, dst);
-                    file_extract ('a', src, dst);
-                    copy_file (dst, src);
+                    if (fileExtract (zh, &dst->sysno, tmppath, 0))
+                    {
+                        dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
+                    }
+		    yaz_log (YLOG_DEBUG, "old: %s", ctime (&dst->mtime));
+                    yaz_log (YLOG_DEBUG, "new: %s", ctime (&e_src[i_src].mtime));
                 }
+                dst = dirs_read (di);
                 break;
-            case S_IFDIR:
-                repository_update_r (cmd, dst, src);
+            case dirs_dir:
+                fileUpdateR (zh, di, dst, base, src, level+1);
+                dst = dirs_last (di);
+                yaz_log (YLOG_DEBUG, "last is %s", dst ? dst->path : "null");
                 break;
+            default:
+                dst = dirs_read (di); 
             }
             i_src++;
-            i_dst++;
         }
         else if (sd > 0)
         {
-            strcpy (dst +dst_len+1, e_src[i_src].name);
-            strcpy (src +src_len+1, e_src[i_src].name);
-            
-            stat (src, &fs_src);
-            switch (fs_src.st_mode & S_IFMT)
+            SYSNO sysno = 0;
+            strcpy (src + src_len, e_src[i_src].name);
+            sprintf (tmppath, "%s%s", base, src);
+
+            switch (e_src[i_src].kind)
             {
-            case S_IFREG:
-                file_extract ('a', src, dst);
-                copy_file (dst, src);
+            case dirs_file:
+                if (fileExtract (zh, &sysno, tmppath, 0))
+                    dirs_add (di, src, sysno, e_src[i_src].mtime);            
                 break;
-            case S_IFDIR:
-                repository_add_tree (cmd, dst, src);
+            case dirs_dir:
+                fileUpdateR (zh, di, dst, base, src, level+1);
+                if (dst)
+                    dst = dirs_last (di);
                 break;
             }
             i_src++;
         }
-        else 
+        else  /* sd < 0 */
         {
-            strcpy (dst +dst_len+1, e_dst[i_dst].name);
-            strcpy (src +src_len+1, e_dst[i_dst].name);
-            
-            stat (dst, &fs_dst);
-            switch (fs_dst.st_mode & S_IFMT)
+            strcpy (src, dst->path);
+            sprintf (tmppath, "%s%s", base, dst->path);
+
+            switch (dst->kind)
             {
-            case S_IFREG:
-                file_extract ('d', dst, dst);
-                del_file (dst);
-                break;
-            case S_IFDIR:
-                repository_del_tree (cmd, dst, src);
+            case dirs_file:
+                fileExtract (zh, &dst->sysno, tmppath, 1);
+                dirs_del (di, dst->path);
+                dst = dirs_read (di);
                 break;
+            case dirs_dir:
+                fileDeleteR (zh, di, dst, base, src);
+                dst = dirs_last (di);
             }
-            i_dst++;
         }
     }
-    dir_free (&e_dst);
     dir_free (&e_src);
 }
 
-void repository (int cmd, const char *rep, const char *base_path)
+void repositoryShow (ZebraHandle zh, const char *path)
+{
+    char src[1024];
+    int src_len;
+    struct dirs_entry *dst;
+    Dict dict;
+    struct dirs_info *di;
+
+    if (!(dict = dict_open_res (zh->reg->bfs, FMATCH_DICT, 50, 0, 0, zh->res)))
+    {
+        yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+	return;
+    }
+    
+    strncpy(src, path, sizeof(src)-1);
+    src[sizeof(src)-1]='\0';
+    src_len = strlen (src);
+    
+    if (src_len && src[src_len-1] != '/')
+    {
+        src[src_len] = '/';
+        src[++src_len] = '\0';
+    }
+    
+    di = dirs_open (dict, src, zh->m_flag_rw);
+    
+    while ( (dst = dirs_read (di)) )
+        yaz_log (YLOG_LOG, "%s", dst->path);
+    dirs_free (&di);
+    dict_close (dict);
+}
+
+static void fileUpdate (ZebraHandle zh, Dict dict, const char *path)
 {
-    char rep_tmp1[2048];
-    char rep_tmp2[2048];
+    struct dirs_info *di;
+    struct stat sbuf;
+    char src[1024];
+    char dst[1024];
+    int src_len, ret;
+
+    assert (path);
+
+    if (zh->path_reg && !yaz_is_abspath(path))
+    {
+        strcpy (src, zh->path_reg);
+        strcat (src, "/");
+    }
+    else
+        *src = '\0';
+    strcat (src, path);
+    ret = zebra_file_stat (src, &sbuf, zh->m_follow_links);
+
+    strcpy (src, path);
+    src_len = strlen (src);
 
-    strcpy (rep_tmp1, rep);
-    if (base_path)
+    if (ret == -1)
+    {
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot access path %s", src);
+    } 
+    else if (S_ISREG(sbuf.st_mode))
+    {
+        struct dirs_entry *e_dst;
+        di = dirs_fopen (dict, src);
+
+        e_dst = dirs_read (di);
+        if (e_dst)
+        {
+            if (sbuf.st_mtime > e_dst->mtime)
+                if (fileExtract (zh, &e_dst->sysno, src, 0))
+                    dirs_add (di, src, e_dst->sysno, sbuf.st_mtime);
+        }
+        else
+        {
+            SYSNO sysno = 0;
+            if (fileExtract (zh, &sysno, src, 0))
+                 dirs_add (di, src, sysno, sbuf.st_mtime);
+        }
+        dirs_free (&di);
+    }
+    else if (S_ISDIR(sbuf.st_mode))
     {
-        strcpy (rep_tmp2, base_path);
-        repository_update_r (cmd, rep_tmp2, rep_tmp1);
+        if (src_len && src[src_len-1] != '/')
+        {
+            src[src_len] = '/';
+            src[++src_len] = '\0';
+        }
+        di = dirs_open (dict, src, zh->m_flag_rw);
+        *dst = '\0';
+        fileUpdateR (zh, di, dirs_read (di), src, dst, 0);
+        dirs_free (&di);
     }
     else
-        repository_extract_r (cmd, rep_tmp1);
+    {
+        yaz_log (YLOG_WARN, "Skipping path %s", src);
+    }
+}
+
+static void repositoryExtract (ZebraHandle zh,
+                               int deleteFlag, const char *path)
+{
+    struct stat sbuf;
+    char src[1024];
+    int ret;
+
+    assert (path);
+
+    if (zh->path_reg && !yaz_is_abspath(path))
+    {
+        strcpy (src, zh->path_reg);
+        strcat (src, "/");
+    }
+    else
+        *src = '\0';
+    strcat (src, path);
+    ret = zebra_file_stat (src, &sbuf, zh->m_follow_links);
+
+    strcpy (src, path);
+
+    if (ret == -1)
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot access path %s", src);
+    else if (S_ISREG(sbuf.st_mode))
+        fileExtract (zh, NULL, src, deleteFlag);
+    else if (S_ISDIR(sbuf.st_mode))
+	repositoryExtractR (zh, deleteFlag, src, 0);
+    else
+        yaz_log (YLOG_WARN, "Skipping path %s", src);
+}
+
+static void repositoryExtractG (ZebraHandle zh, const char *path, 
+				int deleteFlag)
+{
+    if (!strcmp(path, "") || !strcmp(path, "-"))
+    {
+        char src[1024];
+	
+        while (scanf ("%1020s", src) == 1)
+            repositoryExtract (zh, deleteFlag, src);
+    }
+    else
+        repositoryExtract (zh, deleteFlag, path);
+}
+
+void repositoryUpdate (ZebraHandle zh, const char *path)
+{
+    assert (path);
+    if (zh->m_record_id && !strcmp (zh->m_record_id, "file"))
+    {
+        Dict dict;
+        if (!(dict = dict_open_res (zh->reg->bfs, FMATCH_DICT, 50,
+				    zh->m_flag_rw, 0, zh->res)))
+        {
+            yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+	    return ;
+        }
+        if (!strcmp(path, "") || !strcmp(path, "-"))
+        {
+            char src[1024];
+            while (scanf ("%s", src) == 1)
+                fileUpdate (zh, dict, src);
+        }
+        else
+            fileUpdate (zh, dict, path);
+        dict_close (dict);
+    }
+    else 
+        repositoryExtractG (zh, path, 0);
+}
+
+void repositoryDelete (ZebraHandle zh, const char *path)
+{
+    assert (path);
+    repositoryExtractG (zh, path, 1);
 }