Processing of several sentences per one request

Author: mnvx

src/SyntaxTree/ConllXParserFactory.php

@@ -11,28 +11,45 @@ class ConllXParserFactory
      * @param string $delimiter
      * @param string $enclosure
      * @param string $escape
-     * @return Tree
+     * @return TreeCollection
      */
     public static function create($csv, $delimiter = "\t", $enclosure = '"', $escape = "\\" )
     {
         $strings = explode("\n", $csv);
+        $sentences = [];
         $array = [];
 
         foreach ($strings as $string)
         {
             if (!$string)
             {
+                $sentences[] = $array;
+                $array = [];
                 continue;
             }
             $string = str_replace('"', '\\"', $string);
             $array[] = str_getcsv($string, $delimiter, $enclosure, $escape);
         }
-        $nodes = static::createNodes($array);
+        if ($array)
+        {
+            $sentences[] = $array;
+        }
+
+        return static::createTrees($sentences);
+    }
+    
+    protected static function createTrees(array $sentences)
+    {
+        $trees = [];
+        foreach ($sentences as $array)
+        {
+            $trees[] = new Tree(static::createNodes($array));
+        }
 
-        return new Tree($nodes);
+        return new TreeCollection($trees);
     }
 
-    protected static function createNodes(&$array, $rootIndex = 0)
+    protected static function createNodes(array &$array, $rootIndex = 0)
     {
         $data = [];
         foreach ($array as $item)

src/SyntaxTree/SyntaxTree.php

@@ -61,6 +61,11 @@ public function setEscape($escape)
         return $this;
     }
 
+    /**
+     * Build syntax tree for every sentence
+     * @param string $source
+     * @return Tree[]
+     */
     public function build($source)
     {
         switch ($this->system)

src/SyntaxTree/TreeCollection.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace SyntaxTree;
+
+use ArrayAccess;
+use Iterator;
+
+class TreeCollection implements Iterator, ArrayAccess
+{
+
+    /**
+     * @var Tree[]
+     */
+    protected $trees;
+    protected $position = 0;
+
+    public function __construct($trees)
+    {
+        $this->trees = $trees;
+    }
+
+    function rewind()
+    {
+        $this->position = 0;
+    }
+
+    function current()
+    {
+        return $this->trees[$this->position];
+    }
+
+    function key()
+    {
+        return $this->position;
+    }
+
+    function next()
+    {
+        ++$this->position;
+    }
+
+    function valid()
+    {
+        return isset($this->trees[$this->position]);
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        if (is_null($offset))
+        {
+            $this->trees[] = $value;
+        }
+        else
+        {
+            $this->trees[$offset] = $value;
+        }
+    }
+
+    public function offsetExists($offset)
+    {
+        return isset($this->trees[$offset]);
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->trees[$offset]);
+    }
+
+    public function offsetGet($offset)
+    {
+        return isset($this->trees[$offset]) ? $this->trees[$offset] : null;
+    }
+
+    public function toArray()
+    {
+        $array = [];
+
+        foreach ($this->trees as $tree)
+        {
+            $array[] = $tree->toArray();
+        }
+
+        return $array;
+    }
+
+    public function toJson($options = 0)
+    {
+        return json_encode($this->toArray(), $options);
+    }
+
+}

src/api/Controller/Controller.php

@@ -21,7 +21,7 @@ public function process($data)
         $csv = $command->execute();
 
         $syntaxTree = new \SyntaxTree\SyntaxTree();
-        $tree = $syntaxTree->build($csv);
+        $trees = $syntaxTree->build($csv);
 
         switch ($format)
         {
@@ -31,7 +31,7 @@ public function process($data)
 
             case 'JSON':
                 $options = $option === 'JSON_PRETTY_PRINT' ? JSON_PRETTY_PRINT : 0;
-                echo $tree->toJson($options);
+                echo $trees->toJson($options);
                 break;
 
             default:

src/api/view/index.php

@@ -65,13 +65,13 @@
     <pre><?php echo $csv ?></pre>
 
     <p><label>Json:</label></p>
-    <pre><?php echo $tree->toJson(JSON_PRETTY_PRINT); ?></pre>
+    <pre><?php echo $trees->toJson(JSON_PRETTY_PRINT); ?></pre>
 </div>
 
 <script src="vendor/d3/d3.min.js"></script>
 <script src="js/syntax-tree.js"></script>
 <script>
-    var data = JSON.parse('<?php echo $tree->toJson(); ?>');
+    var data = JSON.parse('<?php echo $trees[0]->toJson(); ?>');
     buildSyntaxTree(data);
 </script>