X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=91b5ddb0ac84980a3548e5e5fb43dbc050623e0d;hb=9cf5dedda26c0ebaf38daa6fa3f15a763d6b2fcb;hp=dad7181121fa3471d99ba14702458dff21a0b56d;hpb=4ec5e11d0e4db05000b47db4c681d570431c1818;p=idzebra-moved-to-github.git

diff --git a/index/lockidx.c b/index/lockidx.c
index dad7181..91b5ddb 100644
--- a/index/lockidx.c
+++ b/index/lockidx.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockidx.c,v $
- * Revision 1.5  1995-12-13 08:46:09  adam
+ * Revision 1.7  1996-10-29 14:08:13  adam
+ * Uses resource lockDir instead of lockPath.
+ *
+ * Revision 1.6  1996/03/26 16:01:13  adam
+ * New setting lockPath: directory of various lock files.
+ *
+ * Revision 1.5  1995/12/13  08:46:09  adam
  * Locking uses F_WRLCK and F_RDLCK again!
  *
  * Revision 1.4  1995/12/12  16:00:57  adam
@@ -33,7 +39,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include <alexutil.h>
 #include "index.h"
 
 static int lock_fd = -1;
@@ -50,7 +55,7 @@ int zebraIndexWait (int commitPhase)
 
     if (server_lock_cmt == -1)
     {
-        sprintf (path, "%s%s", FNAME_COMMIT_LOCK, pathPrefix);
+        sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK);
         if ((server_lock_cmt = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
             == -1)
         {
@@ -62,7 +67,7 @@ int zebraIndexWait (int commitPhase)
         zebraUnlock (server_lock_cmt);
     if (server_lock_org == -1)
     {
-        sprintf (path, "%s%s", FNAME_ORG_LOCK, pathPrefix);
+        sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK);
         if ((server_lock_org = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
             == -1)
         {