X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrav.c;h=49af41ec9e718355922cf96874489521eb94201a;hb=8c63ceb6afdfcea5c1efbd716f75c99f18c77b5c;hp=9f23a6a4cfa2e4b4fbfc3a4050e2103bba64885e;hpb=f4c557cfebb4fa779a858c7d305081d4d92578da;p=idzebra-moved-to-github.git

diff --git a/index/trav.c b/index/trav.c
index 9f23a6a..49af41e 100644
--- a/index/trav.c
+++ b/index/trav.c
@@ -1,10 +1,34 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: trav.c,v $
- * Revision 1.26  1996-06-04 10:19:01  adam
+ * Revision 1.33  1998-01-12 15:04:08  adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.32  1997/09/25 14:56:51  adam
+ * Windows NT interface code to the stat call.
+ *
+ * Revision 1.31  1997/09/17 12:19:17  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.30  1997/09/09 13:38:09  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.29  1997/02/12 20:39:47  adam
+ * Implemented options -f <n> that limits the log to the first <n>
+ * records.
+ * Changed some log messages also.
+ *
+ * Revision 1.28  1996/11/01 08:58:44  adam
+ * Interface to isamc system now includes update and delete.
+ *
+ * Revision 1.27  1996/10/29 14:06:56  adam
+ * Include zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.26  1996/06/04 10:19:01  adam
  * Minor changes - removed include of ctype.h.
  *
  * Revision 1.25  1996/05/01  13:46:37  adam
@@ -98,16 +122,23 @@
  * Split of work into more files.
  *
  */
+
+
 #include <stdio.h>
 #include <assert.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#ifdef WINDOWS
+#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 <time.h>
 
-#include <alexutil.h>
 #include "index.h"
 
 static int repComp (const char *a, const char *b, size_t len)
@@ -127,7 +158,7 @@ static void repositoryExtractR (int deleteFlag, char *rep,
     e = dir_open (rep);
     if (!e)
         return;
-    logf (LOG_LOG, "Dir: %s", rep);
+    logf (LOG_LOG, "dir %s", rep);
     if (rep[rep_len-1] != '/')
         rep[rep_len] = '/';
     else
@@ -190,7 +221,7 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst,
 
     sprintf (tmppath, "%s%s", base, src);
     e_src = dir_open (tmppath);
-    logf (LOG_LOG, "Dir: %s", tmppath);
+    logf (LOG_LOG, "dir %s", tmppath);
 
 #if 0
     if (!dst || repComp (dst->path, src, src_len))
@@ -261,8 +292,8 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst,
                     {
                         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));
+		    logf (LOG_DEBUG, "old: %s", ctime (&dst->mtime));
+                    logf (LOG_DEBUG, "new: %s", ctime (&e_src[i_src].mtime));
                 }
                 dst = dirs_read (di);
                 break;
@@ -339,10 +370,10 @@ void repositoryShow (struct recordGroup *rGroup)
     Dict dict;
     struct dirs_info *di;
     
-    if (!(dict = dict_open (FMATCH_DICT, 50, 1)))
+    if (!(dict = dict_open (rGroup->bfs, FMATCH_DICT, 50, 0)))
     {
         logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
-        exit (1);
+	return;
     }
     
     assert (rGroup->path);    
@@ -355,7 +386,7 @@ void repositoryShow (struct recordGroup *rGroup)
         src[++src_len] = '\0';
     }
     
-    di = dirs_open (dict, src);
+    di = dirs_open (dict, src, rGroup->flagRw);
     
     while ( (dst = dirs_read (di)) )
         logf (LOG_LOG, "%s", dst->path);
@@ -404,14 +435,14 @@ static void fileUpdate (Dict dict, struct recordGroup *rGroup,
             src[src_len] = '/';
             src[++src_len] = '\0';
         }
-        di = dirs_open (dict, src);
+        di = dirs_open (dict, src, rGroup->flagRw);
         *dst = '\0';
         fileUpdateR (di, dirs_read (di), src, dst, rGroup);
         dirs_free (&di);
     }
     else
     {
-        logf (LOG_WARN, "Cannot handle file %s", src);
+        logf (LOG_WARN, "Ignoring path %s", src);
     }
 }
 
@@ -431,7 +462,7 @@ static void repositoryExtract (int deleteFlag, struct recordGroup *rGroup,
     else if (S_ISDIR(sbuf.st_mode))
 	repositoryExtractR (deleteFlag, src, rGroup);
     else
-        logf (LOG_WARN, "Cannot handle file %s", src);
+        logf (LOG_WARN, "Ignoring path %s", src);
 }
 
 static void repositoryExtractG (int deleteFlag, struct recordGroup *rGroup)
@@ -454,10 +485,10 @@ void repositoryUpdate (struct recordGroup *rGroup)
     if (rGroup->recordId && !strcmp (rGroup->recordId, "file"))
     {
         Dict dict;
-        if (!(dict = dict_open (FMATCH_DICT, 50, 1)))
+        if (!(dict = dict_open (rGroup->bfs, FMATCH_DICT, 50, rGroup->flagRw)))
         {
             logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
-            exit (1);
+	    return ;
         }
         if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
         {