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

diff --git a/index/trav.c b/index/trav.c
index 6b876b3..6ff7249 100644
--- a/index/trav.c
+++ b/index/trav.c
@@ -1,6 +1,6 @@
-/* $Id: trav.c,v 1.45 2004-09-09 09:07:12 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $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.
 
@@ -53,7 +53,7 @@ static void repositoryExtractR (ZebraHandle zh, int deleteFlag, char *rep,
     e = dir_open (rep, zh->path_reg, zh->m_follow_links);
     if (!e)
         return;
-    yaz_log (LOG_LOG, "dir %s", rep);
+    yaz_log (YLOG_LOG, "dir %s", rep);
     if (rep[rep_len-1] != '/')
         rep[rep_len] = '/';
     else
@@ -122,7 +122,7 @@ static void fileUpdateR (ZebraHandle zh,
 
     sprintf (tmppath, "%s%s", base, src);
     e_src = dir_open (tmppath, zh->path_reg, zh->m_follow_links);
-    yaz_log (LOG_LOG, "dir %s", tmppath);
+    yaz_log (YLOG_LOG, "dir %s", tmppath);
 
 #if 0
     if (!dst || repComp (dst->path, src, src_len))
@@ -167,7 +167,7 @@ static void fileUpdateR (ZebraHandle zh,
         {
             if (e_src[i_src].name)
             {
-                yaz_log (LOG_DEBUG, "dst=%s src=%s", dst->path + src_len,
+                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);
             }
@@ -178,7 +178,7 @@ static void fileUpdateR (ZebraHandle zh,
             sd = 1;
         else
             break;
-        yaz_log (LOG_DEBUG, "trav sd=%d", sd);
+        yaz_log (YLOG_DEBUG, "trav sd=%d", sd);
 
         if (sd == 0)
         {
@@ -194,15 +194,15 @@ static void fileUpdateR (ZebraHandle zh,
                     {
                         dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
                     }
-		    yaz_log (LOG_DEBUG, "old: %s", ctime (&dst->mtime));
-                    yaz_log (LOG_DEBUG, "new: %s", ctime (&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 dirs_dir:
                 fileUpdateR (zh, di, dst, base, src, level+1);
                 dst = dirs_last (di);
-                yaz_log (LOG_DEBUG, "last is %s", dst ? dst->path : "null");
+                yaz_log (YLOG_DEBUG, "last is %s", dst ? dst->path : "null");
                 break;
             default:
                 dst = dirs_read (di); 
@@ -260,7 +260,7 @@ void repositoryShow (ZebraHandle zh, const char *path)
 
     if (!(dict = dict_open_res (zh->reg->bfs, FMATCH_DICT, 50, 0, 0, zh->res)))
     {
-        yaz_log (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+        yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
 	return;
     }
     
@@ -277,7 +277,7 @@ void repositoryShow (ZebraHandle zh, const char *path)
     di = dirs_open (dict, src, zh->m_flag_rw);
     
     while ( (dst = dirs_read (di)) )
-        yaz_log (LOG_LOG, "%s", dst->path);
+        yaz_log (YLOG_LOG, "%s", dst->path);
     dirs_free (&di);
     dict_close (dict);
 }
@@ -307,7 +307,7 @@ static void fileUpdate (ZebraHandle zh, Dict dict, const char *path)
 
     if (ret == -1)
     {
-        yaz_log (LOG_WARN|LOG_ERRNO, "Cannot access path %s", src);
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot access path %s", src);
     } 
     else if (S_ISREG(sbuf.st_mode))
     {
@@ -343,7 +343,7 @@ static void fileUpdate (ZebraHandle zh, Dict dict, const char *path)
     }
     else
     {
-        yaz_log (LOG_WARN, "Skipping path %s", src);
+        yaz_log (YLOG_WARN, "Skipping path %s", src);
     }
 }
 
@@ -369,13 +369,13 @@ static void repositoryExtract (ZebraHandle zh,
     strcpy (src, path);
 
     if (ret == -1)
-        yaz_log (LOG_WARN|LOG_ERRNO, "Cannot access path %s", src);
+        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 (LOG_WARN, "Skipping path %s", src);
+        yaz_log (YLOG_WARN, "Skipping path %s", src);
 }
 
 static void repositoryExtractG (ZebraHandle zh, const char *path, 
@@ -401,7 +401,7 @@ void repositoryUpdate (ZebraHandle zh, const char *path)
         if (!(dict = dict_open_res (zh->reg->bfs, FMATCH_DICT, 50,
 				    zh->m_flag_rw, 0, zh->res)))
         {
-            yaz_log (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+            yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
 	    return ;
         }
         if (!strcmp(path, "") || !strcmp(path, "-"))