zebrasrv: sortkeys args are optional

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

diff --git a/index/update_file.c b/index/update_file.c
index 5a50d04..072444a 100644 (file)
--- a/index/update_file.c
+++ b/index/update_file.c
@@ -1,8 +1,5 @@
-/* $Id: update_file.c,v 1.6 2007-10-29 09:25:41 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <sys/types.h>
@@ -75,8 +75,7 @@ static void fileDelete_r(ZebraHandle zh,
         {
         case dirs_file:
             sprintf(tmppath, "%s%s", base, dst->path);
-            zebra_extract_file(zh, &dst->sysno, tmppath, 1);
-             
+            zebra_extract_file(zh, &dst->sysno, tmppath, action_delete);
             strcpy(tmppath, dst->path);
             dst = dirs_read(di); 
             dirs_del(di, tmppath);
@@ -172,7 +171,7 @@ static void file_update_r(ZebraHandle zh,
             case dirs_file:
                 if (e_src[i_src].mtime > dst->mtime)
                 {
-                    if (zebra_extract_file(zh, &dst->sysno, tmppath, 0) == ZEBRA_OK)
+                    if (zebra_extract_file(zh, &dst->sysno, tmppath, action_update) == ZEBRA_OK)
                     {
                         dirs_add(di, src, dst->sysno, e_src[i_src].mtime);
                     }
@@ -200,7 +199,7 @@ static void file_update_r(ZebraHandle zh,
             switch (e_src[i_src].kind)
             {
             case dirs_file:
-                if (zebra_extract_file(zh, &sysno, tmppath, 0) == ZEBRA_OK)
+                if (zebra_extract_file(zh, &sysno, tmppath, action_update) == ZEBRA_OK)
                     dirs_add(di, src, sysno, e_src[i_src].mtime);            
                 break;
             case dirs_dir:
@@ -219,7 +218,7 @@ static void file_update_r(ZebraHandle zh,
             switch (dst->kind)
             {
             case dirs_file:
-                zebra_extract_file(zh, &dst->sysno, tmppath, 1);
+                zebra_extract_file(zh, &dst->sysno, tmppath, action_delete);
                 dirs_del(di, dst->path);
                 dst = dirs_read(di);
                 break;
@@ -268,13 +267,13 @@ static void file_update_top(ZebraHandle zh, Dict dict, const char *path)
         if (e_dst)
         {
             if (sbuf.st_mtime > e_dst->mtime)
-                if (zebra_extract_file(zh, &e_dst->sysno, src, 0) == ZEBRA_OK)
+                if (zebra_extract_file(zh, &e_dst->sysno, src, action_update) == ZEBRA_OK)
                     dirs_add(di, src, e_dst->sysno, sbuf.st_mtime);
         }
         else
         {
             zint sysno = 0;
-            if (zebra_extract_file(zh, &sysno, src, 0) == ZEBRA_OK)
+            if (zebra_extract_file(zh, &sysno, src, action_update) == ZEBRA_OK)
                  dirs_add(di, src, sysno, sbuf.st_mtime);
         }
         dirs_free(&di);
@@ -357,6 +356,7 @@ ZEBRA_RES zebra_update_file_match(ZebraHandle zh, const char *path)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab