X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrav.c;h=36b72a78b1fe63d3068369c076cb87fd6b389460;hb=0c9fdce49848132a12807f8dc9706b382274f1df;hp=6894ca571df4552c64395c8b0caf2596225e662c;hpb=5a47fb16ab0fc9574660a0ed04151f359c826cbf;p=idzebra-moved-to-github.git

diff --git a/index/trav.c b/index/trav.c
index 6894ca5..36b72a7 100644
--- a/index/trav.c
+++ b/index/trav.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: trav.c,v $
- * Revision 1.18  1996-03-19 12:43:27  adam
+ * Revision 1.23  1996-04-12 07:02:25  adam
+ * File update of single files.
+ *
+ * Revision 1.22  1996/04/09 06:50:50  adam
+ * Bug fix: bad reference in function fileUpdateR.
+ *
+ * Revision 1.21  1996/03/22 15:34:18  quinn
+ * Fixed bad reference
+ *
+ * Revision 1.20  1996/03/21  14:50:10  adam
+ * File update uses modify-time instead of change-time.
+ *
+ * Revision 1.19  1996/03/20  16:16:55  quinn
+ * Added diagnostic output
+ *
+ * Revision 1.18  1996/03/19  12:43:27  adam
  * Bug fix: File update traversal didn't handle trailing slashes correctly.
  * Bug fix: Update of sub directory groups wasn't handled correctly.
  *
@@ -80,6 +95,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <time.h>
 
 #include <alexutil.h>
 #include "index.h"
@@ -190,9 +206,8 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst,
             src[++src_len] = '\0';
         }
         dirs_mkdir (di, src, 0);
-#if 0
-        dst = NULL;
-#endif
+        if (dst && repComp (dst->path, src, src_len))
+            dst = NULL;
     }
     else if (!e_src)
     {
@@ -239,12 +254,14 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst,
             switch (e_src[i_src].kind)
             {
             case dirs_file:
-                if (e_src[i_src].ctime > dst->ctime)
+                if (e_src[i_src].mtime > dst->mtime)
                 {
                     if (fileExtract (&dst->sysno, tmppath, rGroup, 0))
                     {
-                        dirs_add (di, src, dst->sysno, e_src[i_src].ctime);
+                        dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
                     }
+		    logf (LOG_LOG, "old: %s", ctime (&dst->mtime));
+                    logf (LOG_LOG, "new: %s", ctime (&e_src[i_src].mtime));
                 }
                 dst = dirs_read (di);
                 break;
@@ -268,7 +285,7 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst,
             {
             case dirs_file:
                 if (fileExtract (&sysno, tmppath, rGroup, 0))
-                    dirs_add (di, src, sysno, e_src[i_src].ctime);            
+                    dirs_add (di, src, sysno, e_src[i_src].mtime);            
                 break;
             case dirs_dir:
                 fileUpdateR (di, dst, base, src, rGroup);
@@ -346,43 +363,87 @@ void repositoryShow (struct recordGroup *rGroup)
     dict_close (dict);
 }
 
-void repositoryUpdate (struct recordGroup *rGroup)
+static void fileUpdate (Dict dict, struct recordGroup *rGroup,
+                        const char *path)
 {
+    struct dirs_info *di;
+    struct stat sbuf;
     char src[1024];
     char dst[1024];
     int src_len;
 
-    groupRes (rGroup);
-    if (rGroup->recordId && !strcmp (rGroup->recordId, "file"))
+    assert (path);
+    strcpy (src, path);
+    src_len = strlen (src);
+
+    stat (src, &sbuf);
+    if (S_ISREG(sbuf.st_mode))
     {
-        Dict dict;
-        struct dirs_info *di;
+        struct dirs_entry *e_dst;
+        di = dirs_fopen (dict, src);
 
-        if (!(dict = dict_open (FMATCH_DICT, 50, 1)))
+        logf (LOG_WARN, "Handle file %s", src);
+        e_dst = dirs_read (di);
+        if (e_dst)
         {
-            logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
-            exit (1);
+            logf (LOG_WARN, "Update Handle file %s", src);
+            if (sbuf.st_mtime > e_dst->mtime)
+                if (fileExtract (&e_dst->sysno, src, rGroup, 0))
+                    dirs_add (di, src, e_dst->sysno, sbuf.st_mtime);
         }
-        assert (rGroup->path);
-
-        strcpy (src, rGroup->path);
-        src_len = strlen (src);
-
+        else
+        {
+            SYSNO sysno = 0;
+            logf (LOG_WARN, "New Handle file %s", src);
+            if (fileExtract (&sysno, src, rGroup, 0))
+                 dirs_add (di, src, sysno, sbuf.st_mtime);
+        }
+        dirs_free (&di);
+    }
+    else if (S_ISDIR(sbuf.st_mode))
+    {
         if (src_len && src[src_len-1] != '/')
         {
             src[src_len] = '/';
             src[++src_len] = '\0';
         }
-
         di = dirs_open (dict, src);
-
         *dst = '\0';
         fileUpdateR (di, dirs_read (di), src, dst, rGroup);
         dirs_free (&di);
+    }
+    else
+    {
+        logf (LOG_WARN, "Cannot handle file %s", src);
+    }
+}
+
+void repositoryUpdate (struct recordGroup *rGroup)
+{
+    groupRes (rGroup);
+    assert (rGroup->path);
+    if (rGroup->recordId && !strcmp (rGroup->recordId, "file"))
+    {
+        Dict dict;
+        if (!(dict = dict_open (FMATCH_DICT, 50, 1)))
+        {
+            logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+            exit (1);
+        }
+        if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
+        {
+            char src[1024];
+            while (scanf ("%s", src) == 1)
+                fileUpdate (dict, rGroup, src);
+        }
+        else
+            fileUpdate (dict, rGroup, rGroup->path);
         dict_close (dict);
     }
     else 
     {
+        char src[1024];
+
         strcpy (src, rGroup->path);
         if (*src == '\0' || !strcmp (src, "-"))
             stdinExtractR (0, rGroup);