Changeset 123

Timestamp:

Dec 4, 2009 5:00:47 PM (13 years ago)

Author:

toby

Message:

# on 1999/11/19 00:03:25, toby did:
fixup Archive code for Windows (as per Pamela Whitfield)
make autoload option UNIX only (until we can run GSAS pgms synchronously)

File:

• trunk/expgui (modified) (5 diffs, 3 props)

trunk/expgui

@@ -399 +399 @@
     if {$tcl_platform(platform) != "windows"} {
         puts $fp "set env(GSASBACKSPACE) $env(GSASBACKSPACE)"
-    }
-    puts $fp "set expgui(autoexpload) $expgui(autoexpload)"
+        puts $fp "set expgui(autoexpload) $expgui(autoexpload)"
+    }
     close $fp
 }
@@ -489 +489 @@
         set expnam [file rootname $expgui(expfile)]
         if {$tcl_platform(platform) == "windows"} {
+            set version -1
+            catch {source $expnam.version}
+            incr version
             if ![file executable [file join $expgui(scriptdir) pkzip.exe]] {
                 # archive w/o pkzip
-                set files [glob -nocomplain ${expnam}!*.EXP]
-                if {$files == ""} {
-                    set num -1
-                } else {
-                    set file [lindex [lsort -decreasing $files] 0]
-                    regexp {!0*([0-9]+)\.EXP} [string toupper $file] a num
-                }
-                set file $expnam![format "%3.3d" [incr num]].EXP
-                file copy $expnam.EXP $file
+                set file $expnam![format "%3.3d" $version].EXP
+                file copy -force $expnam.EXP $file
                 set fp [open $expnam.lst a]
                 puts $fp "\n--------------------------------------------------------------"
@@ -511 +507 @@
                 # PKZIP can't handle long dir names either
                 cd [set dir [file dirname $expnam]]
-                set num -1
-                # get the versions from the listing
-                if [file exists $sexp.zip] {
-                    set fp [open "| [file join $expgui(scriptdir) pkzip.exe] -vb $sexp" r]
-                    while {[gets $fp line] >= 0} {
-                        regexp "$sexp\.0?0?(\[0-9\]+)" [string toupper $line] junk n
-                        catch {if {$n > $num} {set num $n}}
-                    }
-                    close $fp
-                }
-                incr num
-                set file $sexp.[format "%3.3d" $num]
+                set file $sexp.[format "%3.3d" $version]
                 file copy -force $expnam.EXP $file
-                exec [file join $expgui(scriptdir) pkzip.exe] -m $expnam $file > x.x &
+                exec [file join $expgui(scriptdir) pkzip.exe] -m $sexp $file > zip.out &
                 set fp [open $expnam.lst a]
                 puts $fp "\n--------------------------------------------------------------"
@@ -531 +516 @@
                 close $fp
             }
+            set fp [open $expnam.version w]
+            puts $fp "set version $version"
+            close $fp
         } else {
             set files [glob -nocomplain $expnam.EXP.*]
@@ -2940 +2928 @@
     $expgui(fm).option.menu  add checkbutton -label "Override backspace" \
             -variable env(GSASBACKSPACE)
-}
-$expgui(fm).option.menu  add checkbutton -label "Autoload EXP" \
+    $expgui(fm).option.menu  add checkbutton -label "Autoload EXP" \
             -variable expgui(autoexpload)
+}
 
 $expgui(fm).option.menu add command -label "Save Options" -underline 1 \