Smallish.

[idzebra-moved-to-github.git] / index / trav.c

diff --git a/index/trav.c b/index/trav.c
index 78746c4..4d087bd 100644 (file)
--- a/index/trav.c
+++ b/index/trav.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: trav.c,v $
- * Revision 1.15  1995-12-07 17:38:48  adam
+ * Revision 1.17  1996-02-12 18:45:17  adam
+ * Changed naming of some functions.
+ *
+ * Revision 1.16  1996/02/05  12:30:02  adam
+ * Logging reduced a bit.
+ * The remaining running time is estimated during register merge.
+ *
+ * Revision 1.15  1995/12/07  17:38:48  adam
  * Work locking mechanisms for concurrent updates/commit.
  *
  * Revision 1.14  1995/12/06  12:41:26  adam
@@ -90,6 +97,7 @@ static void repositoryExtractR (int deleteFlag, char *rep,
     e = dir_open (rep);
     if (!e)
         return;
+    logf (LOG_LOG, "Dir: %s", rep);
     if (rep[rep_len-1] != '/')
         rep[rep_len] = '/';
     else
@@ -113,18 +121,18 @@ static void repositoryExtractR (int deleteFlag, char *rep,
 
 static void stdinExtractR (int deleteFlag, struct recordGroup *rGroup)
 {
-    char tmppath[256];
+    char tmppath[1024];
 
     logf (LOG_LOG, "stdinExtractR");
     while (scanf ("%s", tmppath) == 1)
         fileExtract (NULL, tmppath, rGroup, deleteFlag);
 }
 
-static void repositoryDeleteR (struct dirs_info *di, struct dirs_entry *dst,
+static void fileDeleteR (struct dirs_info *di, struct dirs_entry *dst,
                               const char *base, char *src,
                               struct recordGroup *rGroup)
 {
-    char tmppath[256];
+    char tmppath[1024];
     size_t src_len = strlen (src);
 
     while (dst && !repComp (dst->path, src, src_len+1))
@@ -150,18 +158,18 @@ static void repositoryDeleteR (struct dirs_info *di, struct dirs_entry *dst,
     }
 }
 
-static void repositoryUpdateR (struct dirs_info *di, struct dirs_entry *dst,
+static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst,
                                const char *base, char *src, 
                                struct recordGroup *rGroup)
 {
     struct dir_entry *e_src;
     int i_src = 0;
-    static char tmppath[256];
+    static char tmppath[1024];
     size_t src_len = strlen (src);
 
     sprintf (tmppath, "%s%s", base, src);
     e_src = dir_open (tmppath);
-
+    logf (LOG_LOG, "Dir: %s", tmppath);
 #if 1
     if (!dst || repComp (dst->path, src, src_len))
 #else
@@ -181,7 +189,7 @@ static void repositoryUpdateR (struct dirs_info *di, struct dirs_entry *dst,
     else if (!e_src)
     {
         strcpy (src, dst->path);
-        repositoryDeleteR (di, dst, base, src, rGroup);
+        fileDeleteR (di, dst, base, src, rGroup);
         return;
     }
     else
@@ -227,14 +235,13 @@ static void repositoryUpdateR (struct dirs_info *di, struct dirs_entry *dst,
                 {
                     if (fileExtract (&dst->sysno, tmppath, rGroup, 0))
                     {
-                        logf (LOG_LOG, "dirs_add");
                         dirs_add (di, src, dst->sysno, e_src[i_src].ctime);
                     }
                 }
                 dst = dirs_read (di);
                 break;
             case dirs_dir:
-                repositoryUpdateR (di, dst, base, src, rGroup);
+                fileUpdateR (di, dst, base, src, rGroup);
                 dst = dirs_last (di);
                 logf (LOG_DEBUG, "last is %s", dst ? dst->path : "null");
                 break;
@@ -256,7 +263,7 @@ static void repositoryUpdateR (struct dirs_info *di, struct dirs_entry *dst,
                     dirs_add (di, src, sysno, e_src[i_src].ctime);            
                 break;
             case dirs_dir:
-                repositoryUpdateR (di, dst, base, src, rGroup);
+                fileUpdateR (di, dst, base, src, rGroup);
                 if (dst)
                     dst = dirs_last (di);
                 break;
@@ -276,7 +283,7 @@ static void repositoryUpdateR (struct dirs_info *di, struct dirs_entry *dst,
                 dst = dirs_read (di);
                 break;
             case dirs_dir:
-                repositoryDeleteR (di, dst, base, src, rGroup);
+                fileDeleteR (di, dst, base, src, rGroup);
                 dst = dirs_last (di);
             }
         }
@@ -316,7 +323,7 @@ void repositoryUpdate (struct recordGroup *rGroup)
         assert (rGroup->path);
         di = dirs_open (dict, rGroup->path);
         strcpy (src, "");
-        repositoryUpdateR (di, dirs_read (di), rGroup->path, src, rGroup);
+        fileUpdateR (di, dirs_read (di), rGroup->path, src, rGroup);
         dirs_free (&di);
         dict_close (dict);
     }