X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrav.c;h=2d888c902a1e247e2f791ac50cd051904dd276de;hb=9fe3bf8d659adc5c0623185779272d933fc51d15;hp=4accc882638042d62975f74ab4e33296d9c14ef2;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89;p=idzebra-moved-to-github.git diff --git a/index/trav.c b/index/trav.c index 4accc88..2d888c9 100644 --- a/index/trav.c +++ b/index/trav.c @@ -1,10 +1,20 @@ /* - * Copyright (C) 1995, Index Data I/S + * Copyright (C) 1994-1995, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: trav.c,v $ - * Revision 1.2 1995-09-04 12:33:43 adam + * Revision 1.5 1995-10-17 18:02:09 adam + * New feature: databases. Implemented as prefix to words in dictionary. + * + * Revision 1.4 1995/09/28 09:19:46 adam + * xfree/xmalloc used everywhere. + * Extract/retrieve method seems to work for text records. + * + * Revision 1.3 1995/09/06 16:11:18 adam + * Option: only one word key per file. + * + * Revision 1.2 1995/09/04 12:33:43 adam * Various cleanup. YAZ util used instead. * * Revision 1.1 1995/09/01 14:06:36 adam @@ -23,7 +33,7 @@ #include #include "index.h" -static void repository_extract_r (int cmd, char *rep) +static void repository_extract_r (int cmd, char *rep, char *databaseName) { struct dir_entry *e; int i; @@ -44,10 +54,10 @@ static void repository_extract_r (int cmd, char *rep) switch (fs.st_mode & S_IFMT) { case S_IFREG: - file_extract (cmd, rep, rep); + file_extract (cmd, rep, rep, databaseName); break; case S_IFDIR: - repository_extract_r (cmd, rep); + repository_extract_r (cmd, rep, databaseName); break; } } @@ -71,11 +81,7 @@ void copy_file (const char *dst, const char *src) logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", src); exit (1); } - if (!(buf = malloc (4096))) - { - logf (LOG_FATAL|LOG_ERRNO, "malloc"); - exit (1); - } + buf = xmalloc (4096); while ((r=read (s_fd, buf, 4096))>0) for (w = 0; w < r; w += i) { @@ -91,7 +97,7 @@ void copy_file (const char *dst, const char *src) logf (LOG_FATAL|LOG_ERRNO, "read"); exit (1); } - free (buf); + xfree (buf); close (d_fd); close (s_fd); } @@ -108,15 +114,15 @@ void del_dir (const char *dst) logf (LOG_ERRNO|LOG_WARN, "rmdir"); } -void repository_update_r (int cmd, char *dst, char *src); +void repository_update_r (int cmd, char *dst, char *src, char *databaseName); -void repository_add_tree (int cmd, char *dst, char *src) +void repository_add_tree (int cmd, char *dst, char *src, char *databaseName) { mkdir (dst, 0755); - repository_update_r (cmd, dst, src); + repository_update_r (cmd, dst, src, databaseName); } -void repository_del_tree (int cmd, char *dst, char *src) +void repository_del_tree (int cmd, char *dst, char *src, char *databaseName) { size_t dst_len = strlen (dst); size_t src_len = strlen (src); @@ -145,11 +151,11 @@ void repository_del_tree (int cmd, char *dst, char *src) switch (fs_dst.st_mode & S_IFMT) { case S_IFREG: - file_extract ('d', dst, dst); + file_extract ('d', dst, dst, databaseName); del_file (dst); break; case S_IFDIR: - repository_del_tree (cmd, dst, src); + repository_del_tree (cmd, dst, src, databaseName); break; } i_dst++; @@ -162,7 +168,7 @@ void repository_del_tree (int cmd, char *dst, char *src) } } -void repository_update_r (int cmd, char *dst, char *src) +void repository_update_r (int cmd, char *dst, char *src, char *databaseName) { struct dir_entry *e_dst, *e_src; int i_dst = 0, i_src = 0; @@ -178,13 +184,13 @@ void repository_update_r (int cmd, char *dst, char *src) if (!e_dst) { dir_free (&e_src); - repository_add_tree (cmd, dst, src); + repository_add_tree (cmd, dst, src, databaseName); return; } else if (!e_src) { dir_free (&e_dst); - repository_del_tree (cmd, dst, src); + repository_del_tree (cmd, dst, src, databaseName); return; } @@ -225,13 +231,13 @@ void repository_update_r (int cmd, char *dst, char *src) case S_IFREG: if (fs_src.st_ctime > fs_dst.st_ctime) { - file_extract ('d', dst, dst); - file_extract ('a', src, dst); + file_extract ('d', dst, dst, databaseName); + file_extract ('a', src, dst, databaseName); copy_file (dst, src); } break; case S_IFDIR: - repository_update_r (cmd, dst, src); + repository_update_r (cmd, dst, src, databaseName); break; } i_src++; @@ -246,11 +252,11 @@ void repository_update_r (int cmd, char *dst, char *src) switch (fs_src.st_mode & S_IFMT) { case S_IFREG: - file_extract ('a', src, dst); + file_extract ('a', src, dst, databaseName); copy_file (dst, src); break; case S_IFDIR: - repository_add_tree (cmd, dst, src); + repository_add_tree (cmd, dst, src, databaseName); break; } i_src++; @@ -264,11 +270,11 @@ void repository_update_r (int cmd, char *dst, char *src) switch (fs_dst.st_mode & S_IFMT) { case S_IFREG: - file_extract ('d', dst, dst); + file_extract ('d', dst, dst, databaseName); del_file (dst); break; case S_IFDIR: - repository_del_tree (cmd, dst, src); + repository_del_tree (cmd, dst, src, databaseName); break; } i_dst++; @@ -278,7 +284,8 @@ void repository_update_r (int cmd, char *dst, char *src) dir_free (&e_src); } -void repository (int cmd, const char *rep, const char *base_path) +void repository (int cmd, const char *rep, const char *base_path, + char *databaseName) { char rep_tmp1[2048]; char rep_tmp2[2048]; @@ -287,9 +294,9 @@ void repository (int cmd, const char *rep, const char *base_path) if (base_path) { strcpy (rep_tmp2, base_path); - repository_update_r (cmd, rep_tmp2, rep_tmp1); + repository_update_r (cmd, rep_tmp2, rep_tmp1, databaseName); } else - repository_extract_r (cmd, rep_tmp1); + repository_extract_r (cmd, rep_tmp1, databaseName); }