X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrav.c;h=3dff5f56940901387af81224607eac509bacfaa7;hb=6b1dece7410af50ba077381066c10c44f0188868;hp=e5d39d7a796f5f2cbae677966592196e20c579dd;hpb=8f7cd01d361d4c2ebb375b05c98eb9e82cae4a43;p=idzebra-moved-to-github.git

diff --git a/index/trav.c b/index/trav.c
index e5d39d7..3dff5f5 100644
--- a/index/trav.c
+++ b/index/trav.c
@@ -1,6 +1,6 @@
-/* $Id: trav.c,v 1.42 2003-03-25 19:56:01 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: trav.c,v 1.49 2005-06-14 20:28:54 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>
@@ -44,17 +45,16 @@ static int repComp (const char *a, const char *b, size_t len)
 }
 
 static void repositoryExtractR (ZebraHandle zh, int deleteFlag, char *rep,
-                                struct recordGroup *rGroup,
 				int level)
 {
     struct dir_entry *e;
     int i;
     size_t rep_len = strlen (rep);
 
-    e = dir_open (rep, zh->path_reg, rGroup->followLinks);
+    e = dir_open (rep, zh->path_reg, zh->m_follow_links);
     if (!e)
         return;
-    logf (LOG_LOG, "dir %s", rep);
+    yaz_log (YLOG_LOG, "dir %s", rep);
     if (rep[rep_len-1] != '/')
         rep[rep_len] = '/';
     else
@@ -66,16 +66,14 @@ static void repositoryExtractR (ZebraHandle zh, int deleteFlag, char *rep,
         strcpy (rep +rep_len+1, e[i].name);
 	if ((ecp = strrchr (e[i].name, '/')))
 	    *ecp = '\0';
-	if (level == 0 && rGroup->databaseNamePath)
-	    rGroup->databaseName = e[i].name;
 
         switch (e[i].kind)
         {
         case dirs_file:
-            fileExtract (zh, NULL, rep, rGroup, deleteFlag);
+            fileExtract (zh, NULL, rep, deleteFlag);
             break;
         case dirs_dir:
-            repositoryExtractR (zh, deleteFlag, rep, rGroup, level+1);
+            repositoryExtractR (zh, deleteFlag, rep, level+1);
             break;
         }
     }
@@ -85,8 +83,7 @@ static void repositoryExtractR (ZebraHandle zh, int deleteFlag, char *rep,
 
 static void fileDeleteR (ZebraHandle zh,
                          struct dirs_info *di, struct dirs_entry *dst,
-                         const char *base, char *src,
-                         struct recordGroup *rGroup)
+                         const char *base, char *src)
 {
     char tmppath[1024];
     size_t src_len = strlen (src);
@@ -97,7 +94,7 @@ static void fileDeleteR (ZebraHandle zh,
         {
         case dirs_file:
             sprintf (tmppath, "%s%s", base, dst->path);
-            fileExtract (zh, &dst->sysno, tmppath, rGroup, 1);
+            fileExtract (zh, &dst->sysno, tmppath, 1);
              
             strcpy (tmppath, dst->path);
             dst = dirs_read (di); 
@@ -117,7 +114,6 @@ static void fileDeleteR (ZebraHandle zh,
 static void fileUpdateR (ZebraHandle zh,
                          struct dirs_info *di, struct dirs_entry *dst,
 			 const char *base, char *src, 
-			 struct recordGroup *rGroup,
 			 int level)
 {
     struct dir_entry *e_src;
@@ -126,8 +122,8 @@ static void fileUpdateR (ZebraHandle zh,
     size_t src_len = strlen (src);
 
     sprintf (tmppath, "%s%s", base, src);
-    e_src = dir_open (tmppath, zh->path_reg, rGroup->followLinks);
-    logf (LOG_LOG, "dir %s", tmppath);
+    e_src = dir_open (tmppath, zh->path_reg, zh->m_follow_links);
+    yaz_log (YLOG_LOG, "dir %s", tmppath);
 
 #if 0
     if (!dst || repComp (dst->path, src, src_len))
@@ -150,7 +146,7 @@ static void fileUpdateR (ZebraHandle zh,
     else if (!e_src)
     {
         strcpy (src, dst->path);
-        fileDeleteR (zh, di, dst, base, src, rGroup);
+        fileDeleteR (zh, di, dst, base, src);
         return;
     }
     else
@@ -172,7 +168,7 @@ static void fileUpdateR (ZebraHandle zh,
         {
             if (e_src[i_src].name)
             {
-                logf (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);
             }
@@ -183,10 +179,8 @@ static void fileUpdateR (ZebraHandle zh,
             sd = 1;
         else
             break;
-        logf (LOG_DEBUG, "trav sd=%d", sd);
+        yaz_log (YLOG_DEBUG, "trav sd=%d", sd);
 
-	if (level == 0 && rGroup->databaseNamePath)
-	    rGroup->databaseName = e_src[i_src].name;
         if (sd == 0)
         {
             strcpy (src + src_len, e_src[i_src].name);
@@ -197,19 +191,19 @@ static void fileUpdateR (ZebraHandle zh,
             case dirs_file:
                 if (e_src[i_src].mtime > dst->mtime)
                 {
-                    if (fileExtract (zh, &dst->sysno, tmppath, rGroup, 0))
+                    if (fileExtract (zh, &dst->sysno, tmppath, 0))
                     {
                         dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
                     }
-		    logf (LOG_DEBUG, "old: %s", ctime (&dst->mtime));
-                    logf (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, rGroup, level+1);
+                fileUpdateR (zh, di, dst, base, src, level+1);
                 dst = dirs_last (di);
-                logf (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); 
@@ -225,11 +219,11 @@ static void fileUpdateR (ZebraHandle zh,
             switch (e_src[i_src].kind)
             {
             case dirs_file:
-                if (fileExtract (zh, &sysno, tmppath, rGroup, 0))
+                if (fileExtract (zh, &sysno, tmppath, 0))
                     dirs_add (di, src, sysno, e_src[i_src].mtime);            
                 break;
             case dirs_dir:
-                fileUpdateR (zh, di, dst, base, src, rGroup, level+1);
+                fileUpdateR (zh, di, dst, base, src, level+1);
                 if (dst)
                     dst = dirs_last (di);
                 break;
@@ -244,12 +238,12 @@ static void fileUpdateR (ZebraHandle zh,
             switch (dst->kind)
             {
             case dirs_file:
-                fileExtract (zh, &dst->sysno, tmppath, rGroup, 1);
+                fileExtract (zh, &dst->sysno, tmppath, 1);
                 dirs_del (di, dst->path);
                 dst = dirs_read (di);
                 break;
             case dirs_dir:
-                fileDeleteR (zh, di, dst, base, src, rGroup);
+                fileDeleteR (zh, di, dst, base, src);
                 dst = dirs_last (di);
             }
         }
@@ -257,51 +251,22 @@ static void fileUpdateR (ZebraHandle zh,
     dir_free (&e_src);
 }
 
-static void groupRes (ZebraHandle zh, struct recordGroup *rGroup)
+void repositoryShow (ZebraHandle zh, const char *path)
 {
-    char resStr[256];
-    char gPrefix[256];
-
-    if (!rGroup->groupName || !*rGroup->groupName)
-        *gPrefix = '\0';
-    else
-        sprintf (gPrefix, "%s.", rGroup->groupName);
-
-    sprintf (resStr, "%srecordId", gPrefix);
-    rGroup->recordId = res_get (zh->res, resStr);
-    sprintf (resStr, "%sdatabasePath", gPrefix);
-    rGroup->databaseNamePath =
-	atoi (res_get_def (zh->res, resStr, "0"));
-
-    rGroup->databaseNamePath =
-	atoi (res_get_def (zh->res, resStr, "0"));
-
-    if (rGroup->followLinks == -1)
-    {
-        sprintf (resStr, "%sfollowLinks", gPrefix);
-        rGroup->followLinks = 
-            atoi (res_get_def (zh->res, resStr, "1"));
-    }
-}
-
-void repositoryShow (ZebraHandle zh)
-                     
-{
-    struct recordGroup *rGroup = &zh->rGroup;
     char src[1024];
     int src_len;
     struct dirs_entry *dst;
     Dict dict;
     struct dirs_info *di;
-    
-    if (!(dict = dict_open (zh->reg->bfs, FMATCH_DICT, 50, 0, 0)))
+
+    if (!(dict = dict_open_res (zh->reg->bfs, FMATCH_DICT, 50, 0, 0, zh->res)))
     {
-        logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+        yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
 	return;
     }
     
-    assert (rGroup->path);    
-    strcpy (src, rGroup->path);
+    strncpy(src, path, sizeof(src)-1);
+    src[sizeof(src)-1]='\0';
     src_len = strlen (src);
     
     if (src_len && src[src_len-1] != '/')
@@ -310,23 +275,21 @@ void repositoryShow (ZebraHandle zh)
         src[++src_len] = '\0';
     }
     
-    di = dirs_open (dict, src, rGroup->flagRw);
+    di = dirs_open (dict, src, zh->m_flag_rw);
     
     while ( (dst = dirs_read (di)) )
-        logf (LOG_LOG, "%s", dst->path);
+        yaz_log (YLOG_LOG, "%s", dst->path);
     dirs_free (&di);
     dict_close (dict);
 }
 
-static void fileUpdate (ZebraHandle zh,
-                        Dict dict, struct recordGroup *rGroup,
-                        const char *path)
+static void fileUpdate (ZebraHandle zh, Dict dict, const char *path)
 {
     struct dirs_info *di;
     struct stat sbuf;
     char src[1024];
     char dst[1024];
-    int src_len;
+    int src_len, ret;
 
     assert (path);
 
@@ -338,27 +301,31 @@ static void fileUpdate (ZebraHandle zh,
     else
         *src = '\0';
     strcat (src, path);
-    zebra_file_stat (src, &sbuf, rGroup->followLinks);
+    ret = zebra_file_stat (src, &sbuf, zh->m_follow_links);
 
     strcpy (src, path);
     src_len = strlen (src);
 
-    if (S_ISREG(sbuf.st_mode))
+    if (ret == -1)
+    {
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot access path %s", src);
+    } 
+    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, rGroup, 0))
+                if (fileExtract (zh, &e_dst->sysno, src, 0))
                     dirs_add (di, src, e_dst->sysno, sbuf.st_mtime);
         }
         else
         {
             SYSNO sysno = 0;
-            if (fileExtract (zh, &sysno, src, rGroup, 0))
+            if (fileExtract (zh, &sysno, src, 0))
                  dirs_add (di, src, sysno, sbuf.st_mtime);
         }
         dirs_free (&di);
@@ -370,24 +337,23 @@ static void fileUpdate (ZebraHandle zh,
             src[src_len] = '/';
             src[++src_len] = '\0';
         }
-        di = dirs_open (dict, src, rGroup->flagRw);
+        di = dirs_open (dict, src, zh->m_flag_rw);
         *dst = '\0';
-        fileUpdateR (zh, di, dirs_read (di), src, dst, rGroup, 0);
+        fileUpdateR (zh, di, dirs_read (di), src, dst, 0);
         dirs_free (&di);
     }
     else
     {
-        logf (LOG_WARN, "Ignoring path %s", src);
+        yaz_log (YLOG_WARN, "Skipping path %s", src);
     }
 }
 
-
 static void repositoryExtract (ZebraHandle zh,
-                               int deleteFlag, struct recordGroup *rGroup,
-                               const char *path)
+                               int deleteFlag, const char *path)
 {
     struct stat sbuf;
     char src[1024];
+    int ret;
 
     assert (path);
 
@@ -399,65 +365,85 @@ static void repositoryExtract (ZebraHandle zh,
     else
         *src = '\0';
     strcat (src, path);
-    zebra_file_stat (src, &sbuf, rGroup->followLinks);
+    ret = zebra_file_stat (src, &sbuf, zh->m_follow_links);
 
     strcpy (src, path);
 
-    if (S_ISREG(sbuf.st_mode))
-        fileExtract (zh, NULL, src, rGroup, deleteFlag);
+    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);
     else if (S_ISDIR(sbuf.st_mode))
-	repositoryExtractR (zh, deleteFlag, src, rGroup, 0);
+	repositoryExtractR (zh, deleteFlag, src, 0);
     else
-        logf (LOG_WARN, "Ignoring path %s", src);
+        yaz_log (YLOG_WARN, "Skipping path %s", src);
 }
 
-static void repositoryExtractG (ZebraHandle zh,
-                                int deleteFlag, struct recordGroup *rGroup)
+static void repositoryExtractG (ZebraHandle zh, const char *path, 
+				int deleteFlag)
 {
-    if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
+    if (!strcmp(path, "") || !strcmp(path, "-"))
     {
         char src[1024];
-
+	
         while (scanf ("%1020s", src) == 1)
-            repositoryExtract (zh, deleteFlag, rGroup, src);
+            repositoryExtract (zh, deleteFlag, src);
     }
     else
-        repositoryExtract (zh, deleteFlag, rGroup, rGroup->path);
+        repositoryExtract (zh, deleteFlag, path);
 }
 
-void repositoryUpdate (ZebraHandle zh)
+#if 0
+static int dump_file_dict_func(char *name, const char *info, int pos,
+				void *client)
 {
-    struct recordGroup *rGroup = &zh->rGroup;
-    groupRes (zh, rGroup);
-    assert (rGroup->path);
-    if (rGroup->recordId && !strcmp (rGroup->recordId, "file"))
+    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);
+    if (zh->m_record_id && !strcmp (zh->m_record_id, "file"))
     {
         Dict dict;
-        if (!(dict = dict_open (zh->reg->bfs, FMATCH_DICT, 50,
-				rGroup->flagRw, 0)))
+        if (!(dict = dict_open_res (zh->reg->bfs, FMATCH_DICT, 50,
+				    zh->m_flag_rw, 0, zh->res)))
         {
-            logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+            yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
 	    return ;
         }
-        if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
+        if (!strcmp(path, "") || !strcmp(path, "-"))
         {
             char src[1024];
             while (scanf ("%s", src) == 1)
-                fileUpdate (zh, dict, rGroup, src);
+                fileUpdate (zh, dict, src);
         }
         else
-            fileUpdate (zh, dict, rGroup, rGroup->path);
+            fileUpdate (zh, dict, path);
+#if 0
+	dump_file_dict(dict);
+#endif
         dict_close (dict);
+	
     }
     else 
-        repositoryExtractG (zh, 0, rGroup);
+        repositoryExtractG (zh, path, 0);
 }
 
-void repositoryDelete (ZebraHandle zh)
+void repositoryDelete (ZebraHandle zh, const char *path)
 {
-    struct recordGroup *rGroup = &zh->rGroup;
-    groupRes (zh, rGroup);
-    assert (rGroup->path);
-    repositoryExtractG (zh, 1, rGroup);
+    assert (path);
+    repositoryExtractG (zh, path, 1);
 }