X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=343c89d55d062b122e2b1ed7c6f1523112c8800a;hb=ce0c8ffd1c3471504b638f6b47a0e85bf1b6f24f;hp=b4cade11ab5c928df8f3436a3c8db822aa25b965;hpb=6a0f9234f945bc4956e2bcef75f715661a9eba9a;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index b4cade1..343c89d 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -61,9 +61,10 @@ static ZEBRA_RES zebra_check_handle(ZebraHandle zh)
 
 #define ZEBRA_CHECK_HANDLE(zh) if (zebra_check_handle(zh) != ZEBRA_OK) return ZEBRA_FAIL
 
-static void zebra_chdir(ZebraService zs)
+static int zebra_chdir(ZebraService zs)
 {
     const char *dir ;
+    int r;
     ASSERTZS;
     yaz_log(log_level, "zebra_chdir");
     dir = res_get(zs->global_res, "chdir");
@@ -71,10 +72,13 @@ static void zebra_chdir(ZebraService zs)
 	return;
     yaz_log(YLOG_DEBUG, "chdir %s", dir);
 #ifdef WIN32
-    _chdir(dir);
+    r = _chdir(dir);
 #else
-    chdir(dir);
+    r = chdir(dir);
 #endif
+    if (r)
+        yaz_log(YLOG_FATAL|YLOG_ERRNO, "chdir %s", dir);
+    return r;
 }
 
 static ZEBRA_RES zebra_flush_reg(ZebraHandle zh)
@@ -199,11 +203,14 @@ ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res)
         log_level = yaz_log_module_level("zebraapi");
         log_level_initialized = 1;
     }
-    
+
+    *system_str = '\0';
+    *version_str = '\0';
     zebra_get_version(version_str, system_str);
 
-    yaz_log(YLOG_LOG, "zebra_start %s %s", version_str,
-	    configName ? configName : "");
+    yaz_log(YLOG_LOG, "zebra_start %s %s", version_str, system_str);
+    if (configName)
+        yaz_log(YLOG_LOG, "config %s", configName);
 
     if ((res = res_open(def_res, over_res)))
     {
@@ -236,7 +243,11 @@ ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res)
         zh->global_res = res;
         zh->sessions = 0;
         
-        zebra_chdir(zh);
+        if (zebra_chdir(zh))
+        {
+            xfree(zh);
+            return 0;
+        }
         
         zebra_mutex_cond_init(&zh->session_lock);
 	passwd_plain = res_get(zh->global_res, "passwd");
@@ -325,7 +336,6 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     int record_compression = REC_COMPRESS_NONE;
     const char *recordCompression = 0;
     const char *profilePath;
-    char cwd[1024];
     int sort_type = ZEBRA_SORT_TYPE_FLAT;
     ZEBRA_RES ret = ZEBRA_OK;
 
@@ -371,7 +381,6 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
 	}
     }
 
-    getcwd(cwd, sizeof(cwd)-1);
     profilePath = res_get_def(res, "profilePath", 0);
 
     data1_set_tabpath(reg->dh, profilePath);
@@ -407,6 +416,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     
     /* installing rank classes */
     zebraRankInstall(reg, rank_1_class);
+    zebraRankInstall(reg, rank_2_class);
     zebraRankInstall(reg, rank_similarity_class);
     zebraRankInstall(reg, rank_static_class);
 
@@ -1624,7 +1634,11 @@ static void zebra_get_state(ZebraHandle zh, char *val, int *seqno)
 
     if (f)
     {
-        fscanf(f, "%c %d", val, seqno);
+        if (fscanf(f, "%c %d", val, seqno) != 2)
+        {
+            yaz_log(YLOG_ERRNO|YLOG_WARN, "fscan fail %s",
+                    state_fname);
+        }
         fclose(f);
     }
     xfree(fname);