X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=4fce68e06e3489d79893a60c9133d0a63c3246bc;hb=ba572d8e1de44023f355c09c4250328aba0e9a47;hp=684d6b063ef250a050b2af653b3851c4db92ebd0;hpb=eb2b742588ce07fb4516bbca22c93b938b13e433;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 684d6b0..4fce68e 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.37  2000-03-15 15:00:30  adam
+ * Revision 1.41  2000-11-29 14:24:01  adam
+ * Script configure uses yaz pthreads options. Added locking for
+ * zebra_register_{lock,unlock}.
+ *
+ * Revision 1.40  2000/10/17 12:37:09  adam
+ * Fixed notification of live-updates. Fixed minor problem with mf_init
+ * where it didn't handle shadow area file names correctly.
+ *
+ * Revision 1.39  2000/05/05 13:48:03  adam
+ * Fixed locking for metafiles.
+ *
+ * Revision 1.38  2000/03/20 19:08:35  adam
+ * Added remote record import using Z39.50 extended services and Segment
+ * Requests.
+ *
+ * Revision 1.37  2000/03/15 15:00:30  adam
  * First work on threaded version.
  *
  * Revision 1.36  1999/12/08 15:03:11  adam
@@ -300,13 +315,16 @@ MFile_area mf_init(const char *name, const char *spec)
 	/* look at each file */
 	while ((dent = readdir(dd)))
 	{
-	    if (*dent->d_name == '.')
-	    	continue;
-	    if (sscanf(dent->d_name, "%[^-]-%d.mf", metaname, &number) != 2)
-	    {
-	    	logf (LOG_DEBUG, "bf: %s is not a part-file.", dent->d_name);
-	    	continue;
-	    }
+	    int len = strlen(dent->d_name);
+	    const char *cp = strrchr (dent->d_name, '-');
+	    if (strchr (".-", *dent->d_name))
+		continue;
+	    if (len < 5 || !cp || strcmp (dent->d_name + len - 3, ".mf"))
+		continue;
+	    number = atoi(cp+1);
+	    memcpy (metaname, dent->d_name, cp - dent->d_name);
+	    metaname[ cp - dent->d_name] = '\0';
+
 	    for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next)
 	    {
 	    	/* known metafile */
@@ -320,6 +338,7 @@ MFile_area mf_init(const char *name, const char *spec)
 	    if (!meta_f)
 	    {
 	    	meta_f = (meta_file *) xmalloc(sizeof(*meta_f));
+        	zebra_mutex_init (&meta_f->mutex);
 	    	meta_f->ma = ma;
 	    	meta_f->next = ma->mfiles;
 	    	meta_f->open = 0;
@@ -527,7 +546,10 @@ int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
     if ((rd = file_position(mf, no, offset)) < 0)
     {
         if (rd == -2)
+	{
+	    zebra_mutex_unlock (&mf->mutex);
             return 0;
+	}
         else
             exit(1);
     }