No comments

diff --git a/src/WOKTclLib/MkBuild.tcl b/src/WOKTclLib/MkBuild.tcl
index 7ac39b7d5505494206743095c5951aeda429821b..f83ad232bb5b60d78e183a6ff1bb0c430d817532 100755 (executable)
--- a/src/WOKTclLib/MkBuild.tcl
+++ b/src/WOKTclLib/MkBuild.tcl
@@ -95,7 +95,7 @@ proc wokBuild { {fast 0} } {
     ;#
     ;# Go from current location. 
     
-    wokNAV:Tree:UpdateSession $IWOK_GLOBALS(toplevel) [id user]
+    wokNAV:Tree:UpdateSession $IWOK_GLOBALS(toplevel) you
     if { $fast == 0 } {
        tixBusy $IWOK_GLOBALS(toplevel) on
        update

diff --git a/src/WOKTclLib/WOKVC.RCS b/src/WOKTclLib/WOKVC.RCS
index 4a764c502b68ba6ef8023a4bfb3d974994b947d2..76b540da2c762bfaf635bc31ce99f7023efc5eec 100755 (executable)
--- a/src/WOKTclLib/WOKVC.RCS
+++ b/src/WOKTclLib/WOKVC.RCS
@@ -11,18 +11,13 @@
 #               prefixe le nom avec x 
 #;<
 proc wokIntegre:BASE:ftos { file vrs } {
-    if { [string first : $vrs] == -1 } {
-       set l [lindex [split $vrs .] 0]
-       return ${l},${file},v
-    } else {
-       return [lindex [split $vrs :] 1],${file},v
-    }
-}
+    return ${file},v
+}      
 #;>
 # retourne le nom du fichier a partir du nom du fichier de travail  (basename) 
 #;<
 proc wokIntegre:BASE:stof { file vrs } {
-    return [lindex [split $file ,] 1]
+    return [lindex [split $file ,] 0]
 }
 
 #;>
@@ -43,7 +38,7 @@ proc wokIntegre:BASE:InitFile { infile vrs cmt Sfile {fileid stdout} } {
     ;#puts stderr "Appel a InitFile [file tail $infile] vrs = $vrs "
     set bna  [file tail $infile] 
     set bnas [file tail $Sfile] 
-    set pfx ${vrs},${bna}
+    set pfx ${bna}
     puts $fileid [format "echo Init for file %s" $bna ]
     puts $fileid [format "echo Init > /tmp/%s" $bna.desc]
     puts $fileid [format "rcs -q -i -U -t/tmp/%s %s" $bna.desc $pfx]
@@ -60,7 +55,7 @@ proc wokIntegre:BASE:ReInitFile { Sfile vrs cmt infile {fileid stdout} } {
     ;#puts stderr "Appel a UpdateFile  [file tail $Sfile] vrs = $vrs "
     set bna [file tail $infile] 
     set bnas [file tail $Sfile]
-    set pfx ${vrs},${bna}
+    set pfx ${bna}
     puts $fileid [format "echo Updating file %s" [file tail $infile]]
     puts $fileid [format "cp %s ." $Sfile]
     puts $fileid [format "co ./%s" $bnas]
@@ -77,7 +72,7 @@ proc wokIntegre:BASE:UpdateFile { Sfile vrs cmt infile {fileid stdout} } {
     ;#puts stderr "Appel a UpdateFile  [file tail $Sfile] vrs = $vrs "
     set bna [file tail $infile] 
     set bnas [file tail $Sfile]
-    set pfx ${vrs},${bna}
+    set pfx ${bna}
     puts $fileid [format "echo Updating file %s" [file tail $infile]]
     puts $fileid [format "cp %s ." $Sfile]
     puts $fileid [format "co ./%s" $bnas]
@@ -103,8 +98,7 @@ proc wokIntegre:BASE:GetFile { Sfile invrs {fileid stdout} } {
     ;#puts "GET: invrs = $invrs -----  Sfile = $Sfile "
     puts $fileid [format "echo Checkout file %s" $Sfile]
     set lx [split [file tail $Sfile] ,]
-    set wfil [lindex $lx 0],[lindex $lx 1]
-    set file [lindex $lx 1]
+    set file [lindex $lx 0]
     if { [regexp {(.*):(.*)} $invrs ignore key vrs] } {
        if { [string compare $key last] == 0 } {
            puts $fileid [format "co -u %s" $Sfile]
@@ -118,7 +112,6 @@ proc wokIntegre:BASE:GetFile { Sfile invrs {fileid stdout} } {
            puts $fileid [format "co -u -r%s %s" $invrs $Sfile]
        }
     }
-    puts $fileid [format "mv $wfil $file"]
     puts $fileid [format "chmod 644 $file"]
     return
 }
@@ -129,14 +122,14 @@ proc wokIntegre:BASE:GetFile { Sfile invrs {fileid stdout} } {
 #;>
 # retourne la liste des sfile dans une base
 #;<
-proc wokIntegre:BASE:List { fshop Bname vrs } {
-    set diradm [glob -nocomplain [wokIntegre:BASE:GetRootName $fshop]/${Bname}.?]
+proc wokIntegre:BASE:List { Bname vrs } {
+    set diradm [glob -nocomplain [wokIntegre:BASE:GetRootName]/${Bname}.?]
     if [file exists $diradm] {
        set l {}        
-       foreach Sfile [readdir $diradm] {
+       foreach Sfile [wokUtils:EASY:readdir $diradm] {
            set x [split $Sfile ,]
-           if { [lindex $x 0] == $vrs } {
-               lappend l [lindex $x 1]
+           if { "[lindex $x 1]" == "v" } {
+               lappend l [lindex $x 0]
            }
        }
        return $l
@@ -317,33 +310,3 @@ proc wokIntegre:BASE:tree { infile fils} {
     set lab [lindex [lindex $listlab 0] 0]
     return [list $lab 1] 
 }
-#
-#  ((((((((((((((((VERSION))))))))))))))))
-#
-#;>
-# Verifie que l'on peu plugger shop avec le numero ver retourne ver si OK
-#;<
-proc wokIntegre:Version:Check { fshop ver } {
-    set f [wokIntegre:Version:GetTableName $fshop 1]
-    set l [wokUtils:FILES:FileToList $f]
-    set str [wokinfo -n [wokinfo -s $fshop]]
-    foreach e $l {
-       if { [lindex $e 0] == $str } {
-           if { [lindex $e 1] != $ver } {
-               msgprint -c WOKVC -e "The shop $str is already registered with number [lindex $e 1]"
-               return {}
-           } else {
-               return $ver
-           }
-       }
-    }
-
-    foreach e $l {
-       set n [lindex $e 1]
-       if {$ver == $n } {
-           msgprint -c WOKVC -e "The version $ver is already assigned to the shop [lindex $e 0]"
-           return {}
-       }
-    }
-    return $ver
-}

diff --git a/src/WOKTclLib/WOKVC.SCCS b/src/WOKTclLib/WOKVC.SCCS
index 0edd68b902f78cf180c6b4ac75d90d7708e0e7a6..55a5df6d708d99414774541beb2fd18639dbc7f8 100755 (executable)
--- a/src/WOKTclLib/WOKVC.SCCS
+++ b/src/WOKTclLib/WOKVC.SCCS
@@ -106,7 +106,7 @@ proc wokIntegre:BASE:List { Bname vrs } {
     set diradm [glob -nocomplain [wokIntegre:BASE:GetRootName]/${Bname}.?]
     if [file exists $diradm] {
        set l {}
-       foreach Sfile [lsort [readdir $diradm]] {
+       foreach Sfile [lsort [wokUtils:FILES:readdir $diradm]] {
            set s [string range $Sfile 0 1]
            if { $s == "s." } {
                lappend l [string range $Sfile 2 end]

diff --git a/src/WOKTclLib/wcompare.tcl b/src/WOKTclLib/wcompare.tcl
index b788a556be111e37e45b6ef26546ce2c5cec206d..7a9f90614f144867f797833d64c20f28e0e72319 100755 (executable)
--- a/src/WOKTclLib/wcompare.tcl
+++ b/src/WOKTclLib/wcompare.tcl
@@ -288,14 +288,14 @@ proc wcompare { args } {
 
        foreach dir [lsort [lindex $lcom 0]] {
            puts $fileid "\n-- Directory  $d1$dir\n"
-           foreach f [readdir $d1$dir] {
+           foreach f [wokUtisl:EASY:readdir $d1$dir] {
                puts $fileid [format "    - %-30s %s %s" $f $d1$dir $pnts]  
            }
        }
        
        foreach dir [lsort [lindex $lcom 2]] {
            puts $fileid "\n++ Directory  $d2$dir\n"
-           foreach f [readdir $d2$dir] {
+           foreach f [wokUtisl:EASY:readdir $d2$dir] {
                puts $fileid [format "    + %-30s %s %s" $f $pnts $d2$dir]
            }   
        }
@@ -333,14 +333,14 @@ proc wcompare:ExampleDo { type flag f1 f2 f} {
            - {
                puts  "\n-- Directory  $f1\n"
                set pnts "                                        "
-               foreach f [readdir $f1] {
+               foreach f [wokUtisl:EASY:readdir $f1] {
                    puts [format "    + %-30s %s %s" $f $f1 $pnts]
                }
            }
            + {
                puts "\n++ Directory  $f2\n"
                set pnts "                                        "
-               foreach f [readdir $f2] {
+               foreach f [wokUtisl:EASY:readdir $f2] {
                    puts [format "    + %-30s %s %s" $f $pnts $f2]
                }
            }

diff --git a/src/WOKTclLib/wokPRM.tcl b/src/WOKTclLib/wokPRM.tcl
index eb59dd36da1f37b8de50d7f6828c84badbb13c28..6b3b715314e315571c229bd9f6cd2500bdb0b9aa 100755 (executable)
--- a/src/WOKTclLib/wokPRM.tcl
+++ b/src/WOKTclLib/wokPRM.tcl
@@ -333,8 +333,8 @@ proc wokPRM:ShowModif { } {
     catch { unset IWOK_GLOBALS(PRM,Modify,edlbuf) }
 
     append IWOK_GLOBALS(PRM,Modify,edlbuf) "-- File:   ${clas}.edl" \n
-    append IWOK_GLOBALS(PRM,Modify,edlbuf) "-- Author:         [id user]" \n
-    append IWOK_GLOBALS(PRM,Modify,edlbuf) "-- History:        [clock format [getclock]]" \n \n
+    append IWOK_GLOBALS(PRM,Modify,edlbuf) "-- Author:         " \n
+    append IWOK_GLOBALS(PRM,Modify,edlbuf) "-- History:        " \n \n
 
     if { $IWOK_GLOBALS(PRM,Modify,verbose) == 1 } {
        append IWOK_GLOBALS(PRM,Modify,edlbuf) "@verboseon;" \n

diff --git a/src/WOKTclLib/wprepare.tcl b/src/WOKTclLib/wprepare.tcl
index e4242117ace7df2291c5460dbf48bcccd9a38577..ed89b22988ae75f45cafe80ef7d4e91352f2f919 100755 (executable)
--- a/src/WOKTclLib/wprepare.tcl
+++ b/src/WOKTclLib/wprepare.tcl
@@ -11,10 +11,6 @@ proc wokPrepareUsage { } {
     puts stderr { Usage: wprepare  [-ref] [-ud <ud_1,ud_2, ..,ud_N>] -o [filename]}
     puts stderr {        Note: If your specify more than one unit, separate names with a comma.}
     puts stderr {                                                                              }
-    puts stderr {        The following options allows you to select files based on date/time.  }
-    puts stderr {                                                                              }
-    puts stderr {        wprepare -since date  [-ud <ud_1,ud_2, ..,ud_N>] -o [filename]        }
-    puts stderr {        Format for date is :                                                  }
     return
 }
 #
@@ -82,7 +78,7 @@ proc wprepare { args } {
            wokPrepare:Report:Output banner [wokinfo -n $SHFils] [wokinfo -n $WBPere] [wokinfo -n $WBFils] 
            wokPrepare:Unit:Since wokPrepare:Report:Output ${WBFils} $LUnits $date
            puts $wokfileid "is"
-           puts $wokfileid "  Author        : [id user]"
+           puts $wokfileid "  Author        : "
            puts $wokfileid "  Study/CSR     : "
            puts $wokfileid "  Debug         : "
            puts $wokfileid "  Improvements  : "