From: Sebastian Hammer <quinn@indexdata.com>
Date: Fri, 13 Apr 2007 01:48:22 +0000 (+0000)
Subject: Modified settings system to read single file or directory, depending on settings
X-Git-Tag: PAZPAR2.1.0.0~309
X-Git-Url: http://git.indexdata.com/?p=pazpar2-moved-to-github.git;a=commitdiff_plain;h=aad5d6d6c585ae79be5fb542fe7ead4d4383b5bd

Modified settings system to read single file or directory, depending on settings
node in config or -t override. Use, e.g. to start with -t testserver.xml which
contains complete configuration for local yaz-ztest
---

diff --git a/src/settings.c b/src/settings.c
index c3f8eaa..6212162 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1,4 +1,4 @@
-/* $Id: settings.c,v 1.15 2007-04-12 11:35:08 marc Exp $
+/* $Id: settings.c,v 1.16 2007-04-13 01:48:22 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -214,35 +214,34 @@ static void read_settings_file(const char *path,
     xmlFreeDoc(doc);
 }
  
-// Recursively read files in a directory structure, calling 
+// Recursively read files or directories, invoking a 
 // callback for each one
 static void read_settings(const char *path,
 		void (*fun)(struct setting *set))
 {
     DIR *d;
     struct dirent *de;
+    char *dot;
 
-    if (!(d = opendir(path)))
+    if (isdir(path))
     {
-        yaz_log(YLOG_FATAL|YLOG_ERRNO, "%s", path);
-        exit(1);
-    }
-    while ((de = readdir(d)))
-    {
-        char tmp[1024];
-        if (*de->d_name == '.' || !strcmp(de->d_name, "CVS"))
-            continue;
-        sprintf(tmp, "%s/%s", path, de->d_name);
-        if (isdir(tmp))
-            read_settings(tmp, fun);
-        else
+        if (!(d = opendir(path)))
         {
-            char *dot;
-            if ((dot = rindex(de->d_name, '.')) && !strcmp(dot + 1, "xml"))
-                read_settings_file(tmp, fun);
+            yaz_log(YLOG_FATAL|YLOG_ERRNO, "%s", path);
+            exit(1);
+        }
+        while ((de = readdir(d)))
+        {
+            char tmp[1024];
+            if (*de->d_name == '.' || !strcmp(de->d_name, "CVS"))
+                continue;
+            sprintf(tmp, "%s/%s", path, de->d_name);
+            read_settings(tmp, fun);
         }
+        closedir(d);
     }
-    closedir(d);
+    else if ((dot = rindex(path, '.')) && !strcmp(dot + 1, "xml"))
+        read_settings_file(path, fun);
 }
 
 // Callback. Adds a new entry to the dictionary if necessary