Changeset 268

Timestamp:

09/14/2010 08:22:39 PM (13 years ago)

Author:

marcus

Message:

working on configuration parser

Location:

SHX/trunk/src/SeismicHandler

Files:

• . (modified) (1 prop)
• graphics.conf (added)
• modules/runtime.py (modified) (2 diffs)
• modules/traces.py (modified) (1 diff)
• shx.conf (modified) (3 diffs)

SHX/trunk/src/SeismicHandler

@@ -3 +3 @@
 .pydevproject
 .shx.cfg.swp
+.shx.conf.swp

@@ -3 +3 @@
 .pydevproject
 .shx.cfg.swp
+.shx.conf.swp

SHX/trunk/src/SeismicHandler/modules/runtime.py

@@ -21 +21 @@
 E.g. Echo Channel, Cap Conversion, ...
 """
-import os.path
 
 import sys
 import os
+import ConfigParser
 from SeismicHandler.basics import Property, Singleton, AttribDict
 
@@ -90 +90 @@
         """
 
-        dirs = [
-            "/etc",
-            # some weird fall-back if $HOME does not exists
-            os.getenv("HOME", "/etc"),
-            os.path.join(os.path.split(__file__)[0], ".."),
-        ]
-
-        for d in dirs:
-            if not os.path.exists(os.path.join(d, "shx.conf")):
-                continue
-
-            print "found in", d
-
+        dirs = {
+            "SHX": os.path.abspath(__file__).rsplit(os.path.sep, 2)[0],
+            "ETC": "/etc/SeismicHandler",
+        }
+
+        dir_home = os.getenv("HOME", None)
+
+        if dir_home:
+            dirs["PRIVATE"] = os.path.join(dir_home, ".shx")
+
+        for d in dirs.values():
+            src = os.path.join(d, "shx.conf")
+            if os.path.exists(src):
+                break
+
+        config = ConfigParser.SafeConfigParser()
+        if not config.read(src):
+            raise Exception("configuration file not found!")
+
+        conf = AttribDict()
+        for s in config.sections():
+            conf[s] = AttribDict()
+            for i in config.items(s):
+                conf[s][i[0]] = self.__handlePlaceholders(map(str.strip, \
+                                                         i[1].split(",")), dirs)
+
+            # check for include statement
+            if "include" in conf[s]:
+
+                # include sub configfile if requested
+                extra = ConfigParser.SafeConfigParser()
+                for e in conf[s]["include"]:
+                    extra.read(e)
+
+                    # only include current section
+                    if not extra.has_section(s):
+                        break
+
+                    for ie in extra.items(s):
+                        conf[s][ie[0]] = self.__handlePlaceholders(ie[1].split(","), dirs)
+
+        print conf
+
+    def __handlePlaceholders(self, values, dirs):
+        """
+        Replace placeholders in config file.
+        """
+
+        ret = []
+        for v in values:
+            if v.startswith("["):
+                # replacement requested
+                for d in dirs.keys():
+                    if v.startswith("[%s]" % d):
+                        # do replacement
+                        ret.append(v.replace("[%s]" % d, dirs[d]))
+
+            else:
+                ret.append(v)
+
+        return ret
 
     def __getattr__(self, name):

SHX/trunk/src/SeismicHandler/modules/traces.py

@@ -26 +26 @@
 class Traces(object):
     """
-    Supply access for two stream of traces. One is used for plotting, the other
+    Supply access for two streams of traces. One is used for plotting, the other
     holds hidden traces. This will be enhanced later, but for compatibility
     reasons to existing command procedures it's done that ways first.

SHX/trunk/src/SeismicHandler/shx.conf

@@ -2 +2 @@
 # Main configuration file for Seismic Handler
 #
-# The string [SHX] is replaced by installation directory,
-# [PRIVATE] is replaced by $HOME/.shx/
+# Following replacements are performed:
+#
+# [SHX] is replaced by installation directory,
+# [PRIVATE] is replaced by $HOME/.shx,
+# [ETC] is replaced by /etc/SeismicHandler
 #
 
@@ -9 +12 @@
 scripts = [SHX]/scripts/,[PRIVATE]/scripts/
 filters = [SHX]/filters/,[PRIVATE]/filters/
-stations = [SHX]/stations/,[PRIVATE]/stations/
+stations = [SHX]/stations/,[PRIVATE]/stations/,/mnt/stations/
 
 [miniseed]
@@ -15 +18 @@
 
 [graphics]
-include = [PRIVATE]/graphics.cfg
+height = 768
+width = 1024
+
+# It is possible to include another configuration file. It has to
+# contain the section name to which information should be attached.
+# Any include statement will be treated last regardless of it's position
+# in the section!
+include = [PRIVATE]/graphics.cfg, [PRIVATE]/graphics2.cfg
+# If the included configuration file is not found, the error will be
+# passed silently.

@@ -3 +3 @@
 .pydevproject
 .shx.cfg.swp
+.shx.conf.swp