X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=46c4d76bb181a83bdbdbdaaef0f4487db3c766aa;hb=25c9afa691b8f62c2a17150cf1febd1f61755b12;hp=983929cfafde629375ed3eaa19e1f2d426be97ab;hpb=461e9d67822f7f6ae72a0522cb6e9960dedae501;p=idzebra-moved-to-github.git

diff --git a/bfile/bfile.c b/bfile/bfile.c
index 983929c..46c4d76 100644
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -4,37 +4,157 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: bfile.c,v $
- * Revision 1.1  1994-08-17 13:55:08  quinn
- * Deleted
+ * Revision 1.15  1995-12-01 16:24:28  adam
+ * Commit files use separate meta file area.
+ *
+ * Revision 1.14  1995/12/01  11:37:21  adam
+ * Cached/commit files implemented as meta-files.
+ *
+ * Revision 1.13  1995/11/30  17:00:49  adam
+ * Several bug fixes. Commit system runs now.
+ *
+ * Revision 1.12  1995/11/30  08:33:10  adam
+ * Started work on commit facility.
+ *
+ * Revision 1.11  1995/09/04  12:33:21  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.10  1994/08/25  10:15:54  quinn
+ * Trivial
+ *
+ * Revision 1.9  1994/08/24  08:45:48  quinn
+ * Using mfile.
+ *
+ * Revision 1.8  1994/08/23  15:03:34  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.7  1994/08/23  14:25:45  quinn
+ * Added O_CREAT because some geek wanted it. Sheesh.
+ *
+ * Revision 1.6  1994/08/23  14:21:38  quinn
+ * Fixed call to log
+ *
+ * Revision 1.5  1994/08/18  08:10:08  quinn
+ * Minimal changes
+ *
+ * Revision 1.4  1994/08/17  14:27:32  quinn
+ * last mods
+ *
+ * Revision 1.2  1994/08/17  14:09:32  quinn
+ * Compiles cleanly (still only dummy).
+ *
+ * Revision 1.1  1994/08/17  13:55:08  quinn
+ * New blocksystem. dummy only
  *
  */
 
-#include <util.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+#include <alexutil.h>
+#include <bfile.h>
+#include "cfile.h"
+
+static MFile_area commit_area = NULL;
+
+void bf_cache (void)
+{
+    if (!commit_area)
+        if (res_get (common_resource, "commit"))
+            commit_area = mf_init ("commit");
+        else
+        {
+            logf (LOG_FATAL, "Commit area must be defined if commit"
+                  "is to be enabled");
+            exit (1);
+        }
+}
 
 int bf_close (BFile bf)
 {
-    close(bf->fd);
-    xfree(bf);
-    return(0);
+    if (bf->cf)
+        cf_close (bf->cf);
+    mf_close (bf->mf);
+    xfree (bf);
+    return 0;
 }
 
-BFile bf_open (const char *name, int block_size, int cache, wflag)
+BFile bf_open (const char *name, int block_size, int wflag)
 {
     BFile tmp = xmalloc(sizeof(BFile_struct));
 
-    if ((tmp->fd = open(name, wflag ? O_RDWR : O_RDONLY, 0666)) < 0)
+    if (commit_area)
+    {
+        FILE *outf;
+        int first_time;
+
+        logf (LOG_LOG, "cf,mf_open %s", name);
+        tmp->mf = mf_open (0, name, block_size, 0);
+        tmp->cf = cf_open (tmp->mf, commit_area, name, block_size,
+                           wflag, &first_time);
+
+        if (first_time)
+        {
+            outf = fopen ("cache", "a");
+            fprintf (outf, "%s %d\n", name, block_size);
+            fclose (outf);
+        }
+    }
+    else
+    {
+        tmp->mf = mf_open(0, name, block_size, wflag);
+        tmp->cf = NULL;
+    }
+    if (!tmp->mf)
     {
-        log(LOG_FATAL, "open: %s"); 
-	return(-1);
+        logf (LOG_FATAL, "mf_open failed for %s", name);
+        xfree (tmp);
+        return 0;
     }
     return(tmp);
 }
 
-int bf_read (BFile bf, int no, int offset, int no, void *buf);
+int bf_read (BFile bf, int no, int offset, int num, void *buf)
 {
-    if (seek
+    int r;
+
+    if (bf->cf && (r=cf_read (bf->cf, no, offset, num, buf)) != -1)
+        return r;
+    return mf_read (bf->mf, no, offset, num, buf);
+}
+
+int bf_write (BFile bf, int no, int offset, int num, const void *buf)
+{
+    if (bf->cf)
+        return cf_write (bf->cf, no, offset, num, buf);
+    return mf_write (bf->mf, no, offset, num, buf);
+}
+
+void bf_commit (void)
+{
+    FILE *inf;
+    int block_size;
+    char path[256];
+    MFile mf;
+    CFile cf;
+    int first_time;
+
+    assert (commit_area);
+    if (!(inf = fopen ("cache", "r")))
+    {
+        logf (LOG_FATAL|LOG_ERRNO, "cannot open commit %s", "cache");
+        exit (1);
+    }
+    while (fscanf (inf, "%s %d", path, &block_size) == 2)
+    {
+        mf = mf_open (0, path, block_size, 1);
+        cf = cf_open (mf, commit_area, path, block_size, 0, &first_time);
+
+        cf_commit (cf);
+
+        cf_close (cf);
+        mf_close (mf);
+    }
+    fclose (inf);
 }
-int bf_write (BFile bf, int no, int offset, int no, const void *buf);