Changeset 561

Timestamp:

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

Author:

toby

Message:

# on 2002/02/11 17:33:41, toby did:
Change quote processing of CIF's -- strip quotes as items are read (keep semicolons)
fix bug in spacegroup validation

File:

• trunk/import_cif.tcl (modified) (4 diffs, 3 props)

trunk/import_cif.tcl

@@ -77 +77 @@
     catch {
         set spg [set block${i}(_symmetry_space_group_name_h-m)]
-        regsub -all {'} $spg {} spg
         set sgtmp [string toupper $spg]
         # remove spaces from space group
@@ -111 +110 @@
                 }
             }
-            close $fp1
-        }
+        }
+        close $fp1
         if {$spg == ""} {
             set msg "Warning: a Space Group must be specified"
@@ -353 +352 @@
             set hidden [regsub -all {\\"} $trimline \201 trimline]
             # parse out the quoted string, save the remainder
-            if {![regexp {("[^"]*")(.*)} $trimline junk item line]} {
+            if {![regexp {"([^"]*)"(.*)} $trimline junk item line]} {
                 # this is an error -- no end-quote was found
                 set item $line
@@ -364 +363 @@
             set hidden [regsub -all {\\'} $trimline \200 trimline]
             # parse out the quoted string, save the remainder
-            if {![regexp {('[^']*')(.*)} $trimline junk item line]} {
+            if {![regexp {'([^']*)'(.*)} $trimline junk item line]} {
                 # this is an error -- no end-quote was found
                 set item $line