X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=commands%2Flog.py;h=504108d5dfdae24e631bc096e6e8630ba1b10b8b;hb=f14c6c342ad8a8da876564892945e53cccc749d0;hp=12a87ee34bb71c6eb2f079d76c95c38c950c9c08;hpb=fd48f12baccdba974b2e405b77b67fbd07b6b383;p=tools%2Fsat.git

diff --git a/commands/log.py b/commands/log.py
index 12a87ee..504108d 100644
--- a/commands/log.py
+++ b/commands/log.py
@@ -139,7 +139,7 @@ def run(args, runner, logger):
     (options, args) = parser.parse_args(args)
 
     # get the log directory. 
-    logDir = runner.cfg.SITE.log.log_dir
+    logDir = runner.cfg.USER.log_dir
     
     # Print a header
     nb_files_log_dir = len(glob.glob(os.path.join(logDir, "*")))
@@ -160,7 +160,7 @@ def run(args, runner, logger):
             nbClean = nbLogFiles
         # Get the list to delete and do the removing
         lLogsToDelete = sorted(lLogs)[:nbClean]
-        for filePath, _, _, _, _, _ in lLogsToDelete:
+        for filePath, __, __, __, __, __ in lLogsToDelete:
             # remove the xml log file
             remove_log_file(filePath, logger)
             # remove also the corresponding txt file in OUT directory
@@ -218,7 +218,7 @@ def run(args, runner, logger):
         lLogs = src.logger.list_log_file(logDir, 
                                          src.logger.logCommandFileExpression)
         lLogsFiltered = []
-        for filePath, _, date, _, hour, cmd in lLogs:
+        for filePath, __, date, __, hour, cmd in lLogs:
             showLog, cmdAppli = src.logger.show_command_log(filePath, cmd, 
                                 runner.cfg.VARS.application, notShownCommands)
             if showLog:
@@ -228,7 +228,7 @@ def run(args, runner, logger):
         nb_logs = len(lLogsFiltered)
         index = 0
         # loop on all files and print it with date, time and command name 
-        for _, date, hour, cmd, cmdAppli in lLogsFiltered:          
+        for __, date, hour, cmd, cmdAppli in lLogsFiltered:          
             num = src.printcolors.printcLabel("%2d" % (nb_logs - index))
             logger.write("%s: %13s %s %s %s\n" % 
                          (num, cmd, date, hour, cmdAppli), 1, False)
@@ -247,11 +247,15 @@ def run(args, runner, logger):
         return 0
                     
     # Create or update the hat xml that gives access to all the commands log files
+    logger.write(_("Generating the hat log file (can be long) ... "), 3)
     xmlHatFilePath = os.path.join(logDir, 'hat.xml')
-    src.logger.update_hat_xml(runner.cfg.SITE.log.log_dir, 
+    src.logger.update_hat_xml(runner.cfg.USER.log_dir, 
                               application = runner.cfg.VARS.application, 
                               notShownCommands = notShownCommands)
+    logger.write(src.printcolors.printc("OK"), 3)
+    logger.write("\n", 3)
     
     # open the hat xml in the user editor
+    logger.write(_("\nOpening the log file\n"), 3)
     src.system.show_in_editor(runner.cfg.USER.browser, xmlHatFilePath, logger)
     return 0
\ No newline at end of file