From 9050a454c5fd7cf723e9018b426f2053699133d9 Mon Sep 17 00:00:00 2001
From: Alf Magne Kalleland <post@dhtmlgoodies.com>
Date: Fri, 8 Feb 2013 01:34:49 +0100
Subject: [PATCH] Code cleanup in parser

---
 DGTGameParser.php |  2 --
 FenParser0x88.php |  7 ++-----
 GameParser.php    |  1 -
 PgnGameParser.php |  1 +
 PgnParser.php     | 13 ++++++++-----
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/DGTGameParser.php b/DGTGameParser.php
index b7401cd..1516c41 100644
--- a/DGTGameParser.php
+++ b/DGTGameParser.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 class DGTGameParser {
 
     private $remoteUrl;
diff --git a/FenParser0x88.php b/FenParser0x88.php
index 443452b..0a47787 100644
--- a/FenParser0x88.php
+++ b/FenParser0x88.php
@@ -1,8 +1,5 @@
 <?php
 
-error_reporting(E_ALL);
-ini_set('display_errors', 'on');
-
 class FenParser0x88
 {
     private $fen;
@@ -1278,7 +1275,7 @@ class FenParser0x88
     function getFen()
     {
         if (!$this->fen) {
-            $this->fen = $this->setNewFen();
+            $this->fen = $this->getNewFen();
         }
         return $this->fen;
     }
@@ -1351,7 +1348,7 @@ class FenParser0x88
 
     }
 
-    function setNewFen()
+    private function getNewFen()
     {
         $board = $this->cache['board'];
         $fen = '';
diff --git a/GameParser.php b/GameParser.php
index 79b75ec..3668193 100644
--- a/GameParser.php
+++ b/GameParser.php
@@ -6,7 +6,6 @@ class GameParser {
     private $game;
     private $fen;
 
-
     public function __construct(){
         $this->moveParser = new FenParser0x88();
     }
diff --git a/PgnGameParser.php b/PgnGameParser.php
index d3c7609..75e5d81 100644
--- a/PgnGameParser.php
+++ b/PgnGameParser.php
@@ -35,6 +35,7 @@ class PgnGameParser{
         $ret = array(
             CHESS_JSON::GAME_METADATA=>array()
         );
+        // TODO set lastmoves property by reading last 3-4 moves in moves array
         $lines = explode("\n", $this->pgnGame);
         foreach($lines as $line){
             $line = trim($line);
diff --git a/PgnParser.php b/PgnParser.php
index 6cc7d6b..6dfd7d9 100644
--- a/PgnParser.php
+++ b/PgnParser.php
@@ -6,19 +6,22 @@ class PgnParser
     private $pgnFile;
     private $pgnContent;
     private $pgnGames;
-    private $games;
     private $gameParser;
     private $pgnGameParser;
+    private $_fullParsing = true;
 
-    public function __construct($pgnFile = "")
+    public function __construct($pgnFile = "", $fullParsing =true)
     {
         if ($pgnFile) {
             $this->pgnFile = $pgnFile;
         }
+        $this->_fullParsing = $fullParsing;
         $this->gameParser = new GameParser();
         $this->pgnGameParser = new PgnGameParser();
     }
 
+
+
     public function setPgnContent($content)
     {
         $this->pgnContent = $content;
@@ -65,9 +68,9 @@ class PgnParser
         return json_encode($this->getGames());
     }
 
-    private function isLazy()
+    private function fullParsing()
     {
-        return false;
+        return $this->_fullParsing;
     }
 
     public function getUnparsedGames()
@@ -107,7 +110,7 @@ class PgnParser
     private function getParsedGame($unParsedGame){
         $this->pgnGameParser->setPgn($unParsedGame);
         $ret = $this->pgnGameParser->getParsedData();
-        if (!$this->isLazy()) {
+        if ($this->fullParsing()) {
             $ret = $this->gameParser->getParsedGame($ret);
         }
         return $ret;