Put local variables footer in all c, h files.

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

diff --git a/index/trav.c b/index/trav.c
index 4c5d666..17f961d 100644 (file)
--- a/index/trav.c
+++ b/index/trav.c
@@ -1,6 +1,6 @@
-/* $Id: trav.c,v 1.46 2004-11-19 10:27:03 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: trav.c,v 1.51 2006-05-10 08:13:22 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -27,7 +27,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <io.h>
 #define S_ISREG(x) (x & _S_IFREG)
 #define S_ISDIR(x) (x & _S_IFDIR)
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <direntz.h>
@@ -69,7 +70,7 @@ static void repositoryExtractR (ZebraHandle zh, int deleteFlag, char *rep,
         switch (e[i].kind)
         {
         case dirs_file:
-            fileExtract (zh, NULL, rep, deleteFlag);
+            zebra_extract_file (zh, NULL, rep, deleteFlag);
             break;
         case dirs_dir:
             repositoryExtractR (zh, deleteFlag, rep, level+1);
@@ -93,7 +94,7 @@ static void fileDeleteR (ZebraHandle zh,
         {
         case dirs_file:
             sprintf (tmppath, "%s%s", base, dst->path);
-            fileExtract (zh, &dst->sysno, tmppath, 1);
+            zebra_extract_file (zh, &dst->sysno, tmppath, 1);
              
             strcpy (tmppath, dst->path);
             dst = dirs_read (di); 
@@ -190,7 +191,7 @@ static void fileUpdateR (ZebraHandle zh,
             case dirs_file:
                 if (e_src[i_src].mtime > dst->mtime)
                 {
-                    if (fileExtract (zh, &dst->sysno, tmppath, 0))
+                    if (zebra_extract_file (zh, &dst->sysno, tmppath, 0) == ZEBRA_OK)
                     {
                         dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
                     }
@@ -218,7 +219,7 @@ static void fileUpdateR (ZebraHandle zh,
             switch (e_src[i_src].kind)
             {
             case dirs_file:
-                if (fileExtract (zh, &sysno, tmppath, 0))
+                if (zebra_extract_file (zh, &sysno, tmppath, 0) == ZEBRA_OK)
                     dirs_add (di, src, sysno, e_src[i_src].mtime);            
                 break;
             case dirs_dir:
@@ -237,7 +238,7 @@ static void fileUpdateR (ZebraHandle zh,
             switch (dst->kind)
             {
             case dirs_file:
-                fileExtract (zh, &dst->sysno, tmppath, 1);
+                zebra_extract_file (zh, &dst->sysno, tmppath, 1);
                 dirs_del (di, dst->path);
                 dst = dirs_read (di);
                 break;
@@ -312,19 +313,19 @@ static void fileUpdate (ZebraHandle zh, Dict dict, const char *path)
     else if (S_ISREG(sbuf.st_mode))
     {
         struct dirs_entry *e_dst;
-        di = dirs_fopen (dict, src);
+        di = dirs_fopen (dict, src, zh->m_flag_rw);
 
         e_dst = dirs_read (di);
         if (e_dst)
         {
             if (sbuf.st_mtime > e_dst->mtime)
-                if (fileExtract (zh, &e_dst->sysno, src, 0))
+                if (zebra_extract_file (zh, &e_dst->sysno, src, 0) == ZEBRA_OK)
                     dirs_add (di, src, e_dst->sysno, sbuf.st_mtime);
         }
         else
         {
             SYSNO sysno = 0;
-            if (fileExtract (zh, &sysno, src, 0))
+            if (zebra_extract_file (zh, &sysno, src, 0) == ZEBRA_OK)
                  dirs_add (di, src, sysno, sbuf.st_mtime);
         }
         dirs_free (&di);
@@ -371,7 +372,7 @@ static void repositoryExtract (ZebraHandle zh,
     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);
+        zebra_extract_file (zh, NULL, src, deleteFlag);
     else if (S_ISDIR(sbuf.st_mode))
        repositoryExtractR (zh, deleteFlag, src, 0);
     else
@@ -392,6 +393,24 @@ static void repositoryExtractG (ZebraHandle zh, const char *path,
         repositoryExtract (zh, deleteFlag, path);
 }
 
+#if 0
+static int dump_file_dict_func(char *name, const char *info, int pos,
+                               void *client)
+{
+    yaz_log(YLOG_LOG, "%s", name);
+    return 0;
+}
+static void dump_file_dict(Dict dict)
+{
+    int before = 10;
+    int after = 1000;
+    char term[1000];
+    
+    strcpy(term, "0");
+    dict_scan (dict, term, &before, &after, 0, dump_file_dict_func);
+}
+#endif
+
 void repositoryUpdate (ZebraHandle zh, const char *path)
 {
     assert (path);
@@ -412,7 +431,11 @@ void repositoryUpdate (ZebraHandle zh, const char *path)
         }
         else
             fileUpdate (zh, dict, path);
+#if 0
+       dump_file_dict(dict);
+#endif
         dict_close (dict);
+       
     }
     else 
         repositoryExtractG (zh, path, 0);
@@ -424,3 +447,11 @@ void repositoryDelete (ZebraHandle zh, const char *path)
     repositoryExtractG (zh, path, 1);
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+