Index: dassmodus/trunk/dassmodus/nosferatu/nosferatu/auto_types.py
===================================================================
--- dassmodus/trunk/dassmodus/nosferatu/nosferatu/auto_types.py	(revision 953)
+++ dassmodus/trunk/dassmodus/nosferatu/nosferatu/auto_types.py	(revision 990)
@@ -6,15 +6,13 @@
 # This file is autogenerated from the bacula sources.
 # 
-#from auto_types import *
-# $Id: auto_types.py 12290 2011-02-10 14:02:38Z pstorz $
+from auto_types import *
 from command import *
 
     
 msg_types = [ 'info',  'all',  'skipped',  'notsaved',  'saved',  'mount',  'terminate',  'alert',  'abort',  'error',  'debug',  'security',  'fatal',  'warning',  'restored',  'volmgmt',  ]
-jobtypes = [ 'restore',  'admin',  'verify',  'migrate',  'copy',  'backup',  ]
+jobtypes = [ 'Restore',  'Admin',  'Verify',  'Migrate',  'Copy',  'Backup',  ]
 joblevels = [ 'Volume To Catalog',  'Full',  'Incremental',  'Since',  'Disk To Catalog',  'Init Catalog',  'Catalog',  'Base',  'Differential',  'Virtual Full',  'Data',  ]
-#joblevels = [ 'volumetocatalog',  'full',  'incremental',  'since',  'disktocatalog',  'initcatalog',  'catalog',  'base',  'differential',  'virtualfull',  'data',  ]
-migtypes = [ 'sqlquery',  'pooltime',  'oldestvolume',  'smallestvolume',  'volume',  'job',  'client',  'pooluncopiedjobs',  'pooloccupancy',  ]
-ReplaceOptions = [ 'always',  'ifolder',  'ifnewer',  'never',  ]
+migtypes = [ 'SQL Query',  'Pool Time',  'Oldest Volume',  'Smallest Volume',  'Volume',  'Job',  'Client',  'Pool Uncopied Jobs',  'Pool Occupancy',  ]
+ReplaceOptions = [ 'Always',  'If Older',  'If Newer',  'never',  ]
 FS_option_kw = { 'basejob' : ['Yes', 'No'] ,
 'portable' : ['Yes', 'No'] ,
@@ -25,5 +23,5 @@
 'exclude' : ['Yes', 'No'] ,
 'enhancedwild' : ['Yes', 'No'] ,
-'compression' : ['gzip', 'gzip1', 'gzip2', 'gzip3', 'gzip4', 'gzip5', 'gzip6', 'gzip7', 'gzip8', 'gzip9'] ,
+'compression' : ['gzip', 'gzip1', 'gzip2', 'gzip3', 'gzip4', 'gzip5', 'gzip6', 'gzip7', 'gzip8', 'gzip9', 'lzo'] ,
 'strippath' : ['Yes', 'No'] ,
 'encryption' : ['Blowfish', '3DES'] ,
@@ -47,7 +45,13 @@
  '.api': command('.api','api_cmd','','NULL','false'),
  '.backups': command('.backups','backupscmd','','NULL','false'),
+ '.bvfs_cleanup': command('.bvfs_cleanup','dot_bvfs_cleanup','','NULL','true'),
+ '.bvfs_clear_cache': command('.bvfs_clear_cache','dot_bvfs_clear_cache','','NULL','false'),
+ '.bvfs_get_jobids': command('.bvfs_get_jobids','dot_bvfs_get_jobids','','NULL','true'),
  '.bvfs_lsdirs': command('.bvfs_lsdirs','dot_bvfs_lsdirs','','NULL','true'),
  '.bvfs_lsfiles': command('.bvfs_lsfiles','dot_bvfs_lsfiles','','NULL','true'),
+ '.bvfs_restore': command('.bvfs_restore','dot_bvfs_restore','','NULL','true'),
  '.bvfs_update': command('.bvfs_update','dot_bvfs_update','','NULL','true'),
+ '.bvfs_versions': command('.bvfs_versions','dot_bvfs_versions','','NULL','true'),
+ '.catalogs': command('.catalogs','catalogscmd','','NULL','false'),
  '.clients': command('.clients','clientscmd','','NULL','true'),
  '.defaults': command('.defaults','defaultscmd','','NULL','false'),
@@ -79,9 +83,9 @@
  'disable': command('disable','disable_cmd','Disable a job','job=<name>','true'),
  'enable': command('enable','enable_cmd','Enable a job','job=<name>','true'),
- 'estimate': command('estimate','estimate_cmd','Performs FileSet estimate, listing gives full listing','fileset=<fs> client=<cli> accurate=<yes/no> job=<job> listing','true'),
+ 'estimate': command('estimate','estimate_cmd','Performs FileSet estimate, listing gives full listing','fileset=<fs> client=<cli> level=<level> accurate=<yes/no> job=<job> listing','true'),
  'exit': command('exit','quit_cmd','Terminate Bconsole session','','false'),
  'gui': command('gui','gui_cmd','Non-interactive gui mode','on | off','false'),
- 'help': command('help','help_cmd','Print help on specific command','add autodisplay automount cancel create delete disable\n\tenable estimate exit gui label list llist       \n\tmessages memory mount prune purge python quit query\n\trestore relabel release reload run status       \n\tsetdebug setip show sqlquery time trace unmount umount\n\tupdate use var version wait','false'),
- 'label': command('label','label_cmd','Label a tape','storage=<storage> volume=<vol> pool=<pool>','false'),
+ 'help': command('help','help_cmd','Print help on specific command','add autodisplay automount cancel create delete disable\n\tenable estimate exit gui label list llist       \n\tmessages memory mount prune purge python quit query\n\trestore relabel release reload run status       \n\tsetdebug setip show sqlquery time trace unmount\n\tumount update use var version wait','false'),
+ 'label': command('label','label_cmd','Label a tape','storage=<storage> volume=<vol> pool=<pool> slot=<slot> barcodes','false'),
  'list': command('list','list_cmd','List objects from catalog','pools | jobs | jobtotals | volume | media <pool=pool-name> | files jobid=<nn> | copies jobid=<nn>','true'),
  'llist': command('llist','llist_cmd','Full or long list like list command','pools | jobs | jobtotals | media <pool=pool-name> | files jobid=<nn> | copies jobid=<nn>','true'),
@@ -95,7 +99,7 @@
  'quit': command('quit','quit_cmd','Terminate Bconsole session','','false'),
  'relabel': command('relabel','relabel_cmd','Relabel a tape','storage=<storage-name> oldvolume=<old-volume-name>\n\tvolume=<newvolume-name> pool=<pool>','false'),
- 'release': command('release','release_cmd','Release storage','storage-name','false'),
+ 'release': command('release','release_cmd','Release storage','storage=<storage-name>','false'),
  'reload': command('reload','reload_cmd','Reload conf file','','true'),
- 'restore': command('restore','restore_cmd','Restore files','where=</path> client=<client> storage=<storage> bootstrap=<file>       \n\tcomment=<text> jobid=<jobid> done select all','false'),
+ 'restore': command('restore','restore_cmd','Restore files','where=</path> client=<client> storage=<storage> bootstrap=<file>        restore_job=<job>       \n\tcomment=<text> jobid=<jobid> done select all','false'),
  'run': command('run','run_cmd','Run a job','job=<job-name> client=<client-name>\n\tfileset=<FileSet-name> level=<level-keyword>\n\tstorage=<storage-name>       where=<directory-prefix>\n\twhen=<universal-time-specification>\n\tcomment=<text> yes','false'),
  'setdebug': command('setdebug','setdebug_cmd','Sets debug level','level=<nn> trace=0/1 client=<client-name> | dir | storage=<storage-name> | all','true'),
@@ -109,7 +113,6 @@
  'unmount': command('unmount','unmount_cmd','Unmount storage','storage=<storage-name> [ drive=<num> ] | jobid=<id> | job=<job-name>','false'),
  'update': command('update','update_cmd','Update volume, pool or stats','stats\n\tpool=<poolname>\n\tslots storage=<storage> scan       \n\tvolume=<volname> volstatus=<status> volretention=<time-def>       \n\t pool=<pool> recycle=<yes/no> slot=<number>\n\t inchanger=<yes/no>       \n\t maxvolbytes=<size> maxvolfiles=<nb> maxvoljobs=<nb>       \n\t enable=<yes/no> recyclepool=<pool> actiononpurge=<action>','true'),
- 'use': command('use','use_cmd','Use catalog xxx','','false'),
+ 'use': command('use','use_cmd','Use catalog xxx','catalog=<catalog>','false'),
  'var': command('var','var_cmd','Does variable expansion','','false'),
  'version': command('version','version_cmd','Print Director version','','true'),
  'wait': command('wait','wait_cmd','Wait until no jobs are running','jobname=<name> | jobid=<nnn> | ujobid=<complete_name>','false')}
-
