From 109ac28a58bc9199994c426bce2382d0e6bd1034 Mon Sep 17 00:00:00 2001 From: cas Date: Fri, 20 Jul 2001 18:20:17 +0000 Subject: [PATCH] No comments --- src/WOKTclLib/WOKVC.RCS | 3 ++- src/WOKTclLib/wnews.tcl | 4 ++-- src/WOKTclLib/wprepare.tcl | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/WOKTclLib/WOKVC.RCS b/src/WOKTclLib/WOKVC.RCS index 76b540d..cf1f983 100755 --- a/src/WOKTclLib/WOKVC.RCS +++ b/src/WOKTclLib/WOKVC.RCS @@ -156,6 +156,7 @@ proc wokIntegre:BASE:EOF { {fileid stdout} } { # exp_internal -f file 1 : stdout et patterns dans file + pattern sur stderr #;< proc wokIntegre:BASE:Execute { VERBOSE command {fileid stdout} } { + package require Expect spawn -noecho sh $command set LOCID $spawn_id log_user 0 @@ -183,7 +184,7 @@ proc wokIntegre:BASE:Execute { VERBOSE command {fileid stdout} } { -i $LOCID -indices -re "^Checkout file (\[^\r]*)\r\n(\[^\r]*)\r\n(\[^\r]*)\r\n(\[^\r]*)\r\n" { if { $expect_out(4,string) == "done" } { set vrs [lindex [split $expect_out(3,string)] 1] - set nam [lindex [split [file tail $expect_out(1,string)] ,] 1 ] + set nam [lindex [split [file tail $expect_out(1,string)] ,] 0 ] msgprint -c WOKVC -i "Checking out file $nam ( $vrs )" exp_continue } else { diff --git a/src/WOKTclLib/wnews.tcl b/src/WOKTclLib/wnews.tcl index 5da45a6..293aaad 100755 --- a/src/WOKTclLib/wnews.tcl +++ b/src/WOKTclLib/wnews.tcl @@ -355,7 +355,7 @@ proc wokIntegre:Journal:UnMark { string } { #;< proc wokIntegre:Journal:WriteHeader { rep num wb station {jnlid stdout}} { set report_out [format "%s_%s" $num $rep] - set today [clock format [getclock] -format "%d/%m/%y %R"] + set today [clock format [clock seconds] -format "%d/%m/%y %R"] puts $jnlid [format "\n\nReport %s - %s from workbench %s (%s)" $report_out $today $wb $station] puts $jnlid [format "------------"] return @@ -747,7 +747,7 @@ proc wokIntegre:Mark:Set { journal mark index } { catch {unset tmark} set f [wokIntegre:Mark:GetTableName $journal] wokUtils:LIST:ListToMap tmark [wokUtils:FILES:FileToList $f] - set tmark($mark) ${index},[getclock] + set tmark($mark) ${index},[clock seconds] wokUtils:FILES:copy $f ${f}-previous wokUtils:FILES:ListToFile [wokUtils:LIST:MapToList tmark] $f return diff --git a/src/WOKTclLib/wprepare.tcl b/src/WOKTclLib/wprepare.tcl index ed89b22..1cf2a22 100755 --- a/src/WOKTclLib/wprepare.tcl +++ b/src/WOKTclLib/wprepare.tcl @@ -99,11 +99,13 @@ proc wprepare { args } { wokclose -a wokPrepare:Report:InitTypes - wokPrepare:Report:Output banner [wokinfo -n $SHFils] [wokinfo -n $WBPere] [wokinfo -n $WBFils] + ; wokinfo -n "" => WOKSESSION.. if { [info exists tabarg(-ref)] || [wokUtils:WB:IsRoot $WBFils] } { + wokPrepare:Report:Output banner [wokinfo -n $SHFils] [wokinfo -n $WBFils] [wokinfo -n $WBFils] wokPrepare:Unit:Ref wokPrepare:Report:Output ${WBFils} $LUnits } else { + wokPrepare:Report:Output banner [wokinfo -n $SHFils] [wokinfo -n $WBPere] [wokinfo -n $WBFils] wokPrepare:Unit:Loop wokPrepare:Report:Output ${WBPere} ${WBFils} $LUnits } -- 2.39.5