Changeset 381

Timestamp:

Dec 4, 2009 5:05:13 PM (14 years ago)

Author:

toby

Message:

# on 2001/04/17 22:44:59, toby did:
revise to use CR/LF for all platforms

File:

• trunk/readexp.tcl (modified) (6 diffs, 3 props)

trunk/readexp.tcl

@@ -5 +5 @@
 #  The GSAS data is read from an EXP file.
 #   ... reading an EXP file into an array
+# returns -1 on error
+# returns 0 if the file is old-style UNIX format (no CR/LF)
+# returns 1 if the file is 80 char/line + cr/lf
+# returns 2 if the file is sequential but not fixed-record length
 proc expload {expfile} {
     global exparray
@@ -12 +16 @@
                 "Unable to open file $expfile" error 0 "Exit" ; return -1
     }
+    fconfigure $fil -translation lf
     set len [gets $fil line]
     if {[string length $line] != $len} {
@@ -38 +43 @@
         while {$len > 0} {
             set key [string range $line 0 11]
-            set exparray($key) [string range $line 12 end]
+            set exparray($key) [string range $line 12 79]
+            if {$len != 81 || [string range $line end end] != "\r"} {set fmt 2}
             set len [gets $fil line]
         }
@@ -962 +968 @@
                     makeexprec "${key} EPHAS"
                     # expedt defaults this to "F", but I think "T" is better
-                    global tcl_platform
-                    if {[string match "IRIX*" $tcl_platform(os)]} {
-                        setexp "${key} EPHAS" "T" 50 1
-                    } else {
-                        setexp "${key} EPHAS" "Y" 50 1
-                    }
+                    setexp "${key} EPHAS" "Y" 50 1
                     if $expgui(debug) {puts "Warning: creating a ${key} EPHAS record"}
                 }
@@ -981 +982 @@
             }
             foextract-set {
-                global tcl_platform
-                if {[string match "IRIX*" $tcl_platform(os)]} {
-                    if $value {
-                        setexp "${key} EPHAS" "T" 50 1
-                    } else {
-                        setexp "${key} EPHAS" "F" 50 1
-                    }       
-                } else {
                 # the flag has changed to "Y/N" in the latest versions
                 # of GSAS
-                    if $value {
-                        setexp "${key} EPHAS" "Y" 50 1
-                    } else {
-                        setexp "${key} EPHAS" "N" 50 1
-                    }
+                if $value {
+                    setexp "${key} EPHAS" "Y" 50 1
+                } else {
+                    setexp "${key} EPHAS" "N" 50 1
                 }
             }
@@ -2011 +2003 @@
 # write the .EXP file
 proc expwrite {expfile} {
-    global tcl_platform exparray
+    global exparray
     set blankline \
      "                                                                        "
     set fp [open ${expfile} w]
+    fconfigure $fp -translation crlf
     set keylist [lsort [array names exparray]]
     # reorder the keys so that VERSION comes 1st
     set pos [lsearch -exact $keylist {     VERSION}]
     set keylist "{     VERSION} [lreplace $keylist $pos $pos]"
-    if {$tcl_platform(platform) == "windows"} { 
-        foreach key $keylist {
-            puts $fp [string range \
-                    "$key$exparray($key)$blankline" 0 79]
-        }
-    } else {
-        foreach key $keylist {
-            puts -nonewline $fp [string range \
-                    "$key$exparray($key)$blankline" 0 79]
-        }
+    foreach key $keylist {
+        puts $fp [string range \
+                "$key$exparray($key)$blankline" 0 79]
     }
     close $fp