Changeset 1155 for dassmodus/trunk

Timestamp:

Jun 14, 2013, 12:37:05 PM (11 years ago)

Author:

joergs

Message:

adaptions for bareos

File:

• dassmodus/trunk/dassmodus/nosferatu/nosferatu/tools/bacsource2configrules.py (modified) (6 diffs)

dassmodus/trunk/dassmodus/nosferatu/nosferatu/tools/bacsource2configrules.py

@@ -39 +39 @@
 RXP_RESOURCE = re.compile(r'''
     ^(?:static\s+)?RES_ITEM(2)?\s+
-    (?P<name>[^[]+)\[\]\s+=\s+\{\s*\n # First line with starting brace
+    (?P<name>[^[]+)\[\]\s*=\s*\{\s*\n # First line with starting brace
     (?P<items>.*?)                    # Non greedy search
-    \n}\s*;
+    \n\s*}\s*;
 ''', re.M|re.X|re.S)
 
 
 RXP_ITEM = re.compile(r'''
-    ^\s+{"(?P<name>[^"]+)"\s*,
+    ^\s*{\s*"(?P<name>[^"]+)"\s*,
     \s*(?P<handler>[^,]+)\s*,
     \s*(?P<value>[^,]+)\s*,
     \s*(?P<code>[^,]+)\s*,
     \s*(?P<flags>[^,]+)\s*,
-    \s*(?P<default_value>[^}]+)},?\s* 
+    \s*(?P<default_value>("[^"]+"|[^ ]+))\s+},.*
 ''', re.X)
 
@@ -163 +163 @@
 
 def defvalue(type, name, value):
-  if type == 'store_opts':
-    if name in BOOL_FILESET_OPTIONS:
-      if value == 0:
-        defval =  False
-      else:
-        defval = True
-    else: 
-      defval = value
-      
-  elif type == 'store_bool' or type == 'store_bit':
-    if value == 0 or value == '0' or value == 'false' or value == None:
-      defval =  False
+  if value == "NULL":
+    defval = None
+  else:
+    if type == 'store_opts':
+        if name in BOOL_FILESET_OPTIONS:
+            if value == 0:
+                defval =  False
+            else:
+                defval = True
+        else:
+            defval = value
+    elif type == 'store_bool' or type == 'store_bit':
+        if value == 0 or value == '0' or value == 'false' or value == None:
+            defval = False
+        else:
+            defval = True
+    elif type == 'store_name' or type == 'store_str':
+        #print "value:[" + value + "]"
+        if value == "NULL":
+            defval = None
+        else:
+            defval = CONF2VALUE.get(value,value)
     else:
-      defval = True    
-  else:
-    defval = CONF2VALUE.get(value,value)
+        defval = CONF2VALUE.get(value,value)
   return defval
 
@@ -215 +223 @@
 
 def directives(daemon, conf):
+    #print "directives:", daemon, conf
     res = conf.keys()
     res.sort()
@@ -229 +238 @@
          #for i, v in conf[r].iteritems():
             name = i
+            #print "  ", name,
             v = conf[r][i]
             type = v["handler"]
+            #print "(type:", type, ")",
             required = v["flags"] == "ITEM_REQUIRED"
             default = v["flags"] == "ITEM_DEFAULT"
-            defaultvalue = defvalue(type, name,  v["default_value"])
+            defaultvalue = defvalue(type, name, v["default_value"])
+            #print "(default:", defaultvalue, ")",
             #defaultvalue = CONF2VALUE.get(v["default_value"],v["default_value"])
             if default:
-              value = defaultvalue
+                #print "default"
+                value = defaultvalue
             else:
-              value = defvalue(type, name, None)
+                value = defvalue(type, name, None)
+                #print "no default, value:", value
             #if type=='store_bool':
             #  print "Bool"
@@ -440 +454 @@
     cf = open(filename).read()
     for entry in RXP_DOT_COMMAND_ENTRY.finditer(cf):
-  #print entry.groups()
-      commands[entry.group("cmdtext")]= command(entry.group("cmdtext"),
+        #print entry.groups()
+        commands[entry.group("cmdtext")]= command(entry.group("cmdtext"),
                           entry.group("cmd"),
                           '',
@@ -477 +491 @@
           daemon = 'inc'
         directives(daemon, parse_conf_c(filename))
- 
         
-    inc = False   
+    inc = False
     for daemon, conf in C_CONFS:
         if daemon == 'inc':