Changeset 984 for dassmodus/trunk

Timestamp:

Mar 29, 2012, 2:44:10 PM (13 years ago)

Author:

pstorz

Message:

fixed problen with default values

File:

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

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

@@ -163 +163 @@
 
 def defvalue(type, name, value):
+  print  "-> type=%s, name=%s, value=%s" % (type,name,value)
   if type == 'store_opts':
     if name in BOOL_FILESET_OPTIONS:
@@ -173 +174 @@
       
   elif type == 'store_bool' or type == 'store_bit':
-    if value == 0:
+    if value == 0 or value == '0' or value == 'false' or value == None:
       defval =  False
     else:
@@ -179 +180 @@
   else:
     defval = CONF2VALUE.get(value,value)
+  print "<- type=%s, name=%s, defaultvalue=%s" % (type,name,defval)
   return defval
 
@@ -227 +229 @@
           pass
         for i in keys:
-        #for i, v in conf[r].iteritems():
+         #for i, v in conf[r].iteritems():
             name = i
             v = conf[r][i]
-            type = v["handler"]        
+            type = v["handler"]
             required = v["flags"] == "ITEM_REQUIRED"
             default = v["flags"] == "ITEM_DEFAULT"
             defaultvalue = defvalue(type, name,  v["default_value"])
             #defaultvalue = CONF2VALUE.get(v["default_value"],v["default_value"])
-            if default: 
+            if default:
               value = defaultvalue
             else:
               value = defvalue(type, name, None)
+            print "name:%s value:%s defval: %s" % (name,value,defaultvalue)
             s += "  %s,\n" % repr(Item(name, value, defaultvalue, default, type, required))
         s += "]\n"