Changeset 1152

Timestamp:

Jun 7, 2013, 4:56:02 PM (12 years ago)

Author:

joergs

Message:

start adapting to Bareos

File:

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

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

@@ -79 +79 @@
 
 RXP_STRUCT_ITEM = re.compile(r'''
-    ^\s+{"(?P<name>[^"]+)"\s*,
+    ^\s+{\s*"(?P<name>[^"]+)"\s*,
     \s*(?P<resitem>[^,]+)\s*(,
     \s*(?P<rcode>[^}]+))?},?\s*(/\*.*\*/)?
@@ -122 +122 @@
 
 RXP_COMMAND_ENTRY = re.compile(r'''
-^\s+{\s+NT_\("(?P<cmdtext>[^"]+)"\),
-\s*(?P<cmd>[^"]+),
-\s*_\("(?P<usage>[^"]*)"\),
-\s+NT_\("(?P<help>[^)]*)"\),
-\s*(?P<inrunscript>\w+)} 
+^\s*{\s*NT_\("(?P<cmdtext>[^"]+)"\),
+\s*(?P<cmd>[^,]+),
+\s*_\("(?P<usage>[^"]*)"\),\s*\n*
+\s*NT_\("(?P<help>[^"]*)"\),
+\s*(?P<inrunscript>\w+)\s*}
 ''', re.X|re.M|re.S)
 
@@ -302 +302 @@
             #bl[item["resitem"]].append(item["name"])
             #item.pop('rcode')
-            bl[item["resitem"]].append(PrettyNames[item.pop('name')])
+            bl[item["resitem"]].append(prettyName(item.pop('name')))
             
             #print " appended to bl[" ,  item["resitem"] , "]" , item