Changeset 2688

Timestamp:

5/25/2012 1:34:41 AM (12 months ago)

Author:

lowjoel

Message:

Factor out the Stack Frame parsing code to the GetStackFrameInformation? function.

File:

• trunk/website/scripts/blackbox/upload.php (modified) (2 diffs)

trunk/website/scripts/blackbox/upload.php

@@ -8 +8 @@
 function GetFunctionNameFromStackTrace($line)
 {
+    $result = GetStackFrameInformation($line);
+    return $result->function;
+}
+
+function GetStackFrameInformation($line)
+{
+    //at Eraser.Program.OnGUIInitInstance(Object sender) in D:\Development\Projects\Eraser 6.2\Eraser\Program.cs:line 191
     $matches = array();
+    $function = $file = $line = null;
     if (preg_match('/^([^   ]+) (.*) ([^    ]+) (.*):([^    ]+) ([0-9]+)/', $line, $matches))
     {
+        $function = $matches[2];
+        $file = $matches[4];
+        $line = intval($matches[6]);
     }
     else if (preg_match('/^([^  ]+) (.*)/', $line, $matches))
     {
+        $function = $matches[2];
     }
-    
-    return $matches[2];
+
+    return (object)array('function' => $function, 'file' => $file, 'line' => $line);
 }
 
@@ -103 +115 @@
                 continue;
             
-            //at Eraser.Program.OnGUIInitInstance(Object sender) in D:\Development\Projects\Eraser 6.2\Eraser\Program.cs:line 191
-            $matches = array();
-            $function = $file = $line = null;
-            if (preg_match('/^([^   ]+) (.*) ([^    ]+) (.*):([^    ]+) ([0-9]+)/', $stackFrame, $matches))
-            {
-                $function = $matches[2];
-                $file = $matches[4];
-                $line = intval($matches[6]);
-            }
-            else if (preg_match('/^([^  ]+) (.*)/', $stackFrame, $matches))
-            {
-                $function = $matches[2];
-            }
+            $stackFrameInfo = GetStackFrameInformation($stackFrame);
 
             $stackFrameInsert->bindParam(1, $exceptionId);
             $stackFrameInsert->bindParam(2, $stackIndex);
-            $stackFrameInsert->bindParam(3, $function);
-            $stackFrameInsert->bindParam(4, $file);
-            $stackFrameInsert->bindParam(5, $line);
+            $stackFrameInsert->bindParam(3, $stackFrameInfo->function);
+            $stackFrameInsert->bindParam(4, $stackFrameInfo->file);
+            $stackFrameInsert->bindParam(5, $stackFrameInfo->line);
             try
             {