fixed issue with regen making new logs

barncow · Apr 17, 2011 · e61c0dc · e61c0dc
1 parent 3b16681
commit e61c0dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/logparser/LogParser.class.php b/lib/logparser/LogParser.class.php
@@ -196,7 +196,12 @@ public function parseLogFile($filename, $logSubmitterId, $logName = null, $logMa
 	    $ret =  $this->parseLog($file);
 	  } catch(TournamentModeNotFoundException $e) {
 	    //if no tournament mode was found, re-run entire log file as one round.
+
+	    //clearing state - need to keep log obj
+	    $log = $this->log;
 	    $this->clearValues();
+	    $this->log = $log;
+
 	    return $this->parseLog($file, true);
 	  }
 	  $tlp->addTime();
@@ -220,7 +225,12 @@ public function parseLogFromDB($logid) {
 	    $logid =  $this->parseLog($file);
 	  } catch(TournamentModeNotFoundException $e) {
 	    //if no tournament mode was found, re-run entire log file as one round.
+
+	    //clearing state - need to keep log obj
+	    $log = $this->log;
 	    $this->clearValues();
+	    $this->log = $log;
+
 	    $logid = $this->parseLog($file, true);
 	  }
 

diff --git a/test/phpunit/unit/LogParserTest.php b/test/phpunit/unit/LogParserTest.php
@@ -27,9 +27,10 @@ public function testIgnoreCorruptExceptionOnLastLine() {
   public function testParseFromDB() {
     $logid = $this->logParser->parseLogFile($this->LFIXDIR."mini.log", 1);
     $this->logParser = new LogParser();
-    $logid = $this->logParser->parseLogFromDB($logid);
+    $logidnew = $this->logParser->parseLogFromDB($logid);
     $log = Doctrine::getTable('Log')->getLogByIdAsArray($logid);
 
     $this->assertEquals(9, count($log['Stats']), "number of players, should exclude console and specs");
+    $this->assertEquals($logid, $logidnew, 'testing that log id does not change');
   }
 }