No comments

diff --git a/src/WOKTclLib/WOKVC.RCS b/src/WOKTclLib/WOKVC.RCS
index 76b540da2c762bfaf635bc31ce99f7023efc5eec..cf1f9832f7e12e8678e0a1a0395a372ccf80aabd 100755 (executable)
--- 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 5da45a6600a016012973a35b330c2700084eeef8..293aaad7df174f804302c1fa412df04e4e0b944e 100755 (executable)
--- 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 ed89b22988ae75f45cafe80ef7d4e91352f2f919..1cf2a22531ace7bd16747cf87c6bf511e275ff43 100755 (executable)
--- 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
     }