--- /home/sjplimp/oldpizza/src/log.py	2005-12-20 10:26:51.000000000 -0700
+++ /home/sjplimp/pizza/src/log.py	2005-12-20 10:22:31.000000000 -0700
@@ -218,17 +218,15 @@
 
     if self.style == 1:
       s1 = txt.find(self.firststr)
-      s2 = txt.find("\n",s1) + 1
-      s3 = txt.find("\n--",s1)
-      pattern = "\d\s"
-      fields = re.split(pattern,txt[s2:s3])
-      self.names.append("Step")
-      self.ptr["Step"] = 0
-      pattern = "(.*?)\s*="
-      for i in range(len(fields)):
-        keyword = re.search(pattern,fields[i]).group(1)
+      s2 = txt.find("\n--",s1)
+      pattern = "\s(\S*)\s*="
+      keywords = re.findall(pattern,txt[s1:s2])
+      keywords.insert(0,"Step")
+      i = 0
+      for keyword in keywords:
 	self.names.append(keyword)
-        self.ptr[keyword] = i+1
+        self.ptr[keyword] = i
+        i += 1
 
     else:
       s1 = txt.find(self.firststr)
@@ -319,7 +317,7 @@
         for section in sections:
           word1 = [re.search(pat1,section).group(1)]
           word2 = re.findall(pat2,section)
-          words = word1 + word2[1:]
+          words = word1 + word2
           self.data.append(map(float,words))
 
       else: