@@ -11,15 +11,41 @@ require_once "iOutput.php";

 class Output implements iOutput {

     protected $output = "";

-    public  $newLine = "<br>\n";

     public function log($message) {

         $this->output .= $message;

     }

-    public function newLine() {

-        return $this->newLine;

-    }

-

     public function display(){}

+

+	public function addMealHeader($restaurant)

+	{

+		// TODO: Implement addHeader() method.

+	}

+

+	public function startListing()

+	{

+		// TODO: Implement startListing() method.

+	}

+

+	public function endListing()

+	{

+		// TODO: Implement endListing() method.

+	}

+

+	public function addMeal($meal)

+	{

+		// TODO: Implement addMeal() method.

+	}

+

+	public function emptyRestaurant()

+	{

+		// TODO: Implement empty_restaurant() method.

+	}

+

+

+	public function addHeader(Restaurant $restaurant)

+	{

+		// TODO: Implement addHeader() method.

+	}

 }

\ No newline at end of file

@@ -23,18 +23,19 @@ class Parser {

     public function parse() {

         foreach ($this->restaurants as $restaurant) {

+	        /** @var $restaurant Restaurant */

             $source = file_get_contents($restaurant->getUrl());

             if ($source === false) {

-                throw new RuntimeException("Can't read source address: " . $restaurant->getUrl());

+	            continue;

             }

             $dom = new DOMDocument();

             @$dom->loadHTML($source);

             $xpath_obj = new DOMXPath($dom);

-            $this->logger->log("Restaurant: <a href='{$restaurant->getUrl()}'>" . $restaurant->getName() . "</a>".$this->logger->newLine());

+	        $this->logger->addHeader($restaurant);

             foreach ($restaurant->getXpaths() as $name => $xpath) {

@@ -44,25 +45,30 @@ class Parser {

                     continue;

                 }

-                $this->logger->log("<b>$name</b>");

-                $this->logger->log("<ul>");

-                $exists = false;

-                foreach ($found->item(0)->childNodes as $elem) {

+                $this->logger->addMealHeader($name);

+                $this->logger->startListing();

-                    $meal = trim($elem->nodeValue);

-                    if (!empty($meal)) {

-                        $this->logger->log("\t<li>$meal</li>\n");

-                        $exists = true;

-                    }

-                }

-                $this->logger->log("</ul>");

+                $parsed = $restaurant->runCallbackParser($found, $this->logger);

+

+	            if ($parsed === false)

+	            {

+	                $exists = false;

+	                foreach ($found->item(0)->childNodes as $elem) {

+

+	                    $meal = trim($elem->nodeValue);

+	                    if (!empty($meal)) {

+		                    $this->logger->addMeal($meal);

+	                        $exists = true;

+	                    }

+	                }

+	            }

-                if (!$exists) {

-                    $this->logger->log("<i>Hovno. Nic nemaju.</i>" . $this->logger->newLine());

+	            $this->logger->endListing();

+

+                if ($parsed === '' OR (isset($exists) AND !$exists)) {

+	                $this->logger->emptyRestaurant();

                 }

             }

-

-            $this->logger->log($this->logger->newLine());

         }

     }

 }

@@ -10,11 +10,29 @@

 /**

  * Class representing restaurant

  */

-class Restaurant {

+abstract class Restaurant {

-    private $url;

-    private $name;

-    private $xpaths = array();

+    protected $url;

+	protected $name;

+	protected $xpaths = array();

+

+	function __construct($name, $url, $xpaths) {

+

+		if (empty($url) || empty($xpaths)) {

+			throw new InvalidArgumentException("All argument are required");

+		}

+

+		$this->name = $name;

+		$this->url = $url;

+

+		if (is_string($xpaths)) {

+			$this->xpaths[] = $xpaths;

+		} else if (is_array($xpaths)) {

+			$this->xpaths = $xpaths;

+		} else {

+			throw new InvalidArgumentException("Xpaths must be string or array");

+		}

+	}

     public function getName() {

         return $this->name;

@@ -28,26 +46,7 @@ class Restaurant {

         return $this->xpaths;

     }

-    /**

-     * @param $name

-     * @param $url

-     * @param $xpaths

-     */

-    function __construct($name, $url, $xpaths) {

-

-        if (empty($url) || empty($xpaths)) {

-            throw new InvalidArgumentException("All argument are required");

-        }

-

-        $this->name = $name;

-        $this->url = $url;

-

-        if (is_string($xpaths)) {

-            $this->xpaths[] = $xpaths;

-        } else if (is_array($xpaths)) {

-            $this->xpaths = $xpaths;

-        } else {

-            throw new InvalidArgumentException("Xpaths must be string or array");

-        }

-    }

+	public function runCallbackParser($parentNode, iOutput $logger) {

+		return FALSE;

+	}

 }

@@ -9,4 +9,14 @@

 interface iOutput {

     public function log($message);

     public function display();

+

+	public function addMealHeader($restaurant);

+	public function startListing();

+	public function endListing();

+

+	public function addMeal($meal);

+

+	public function emptyRestaurant();

+

+	public function addHeader(Restaurant $restaurant);

 }

@@ -4,12 +4,10 @@ require_once "Restaurant.php";

 require_once "Output.php";

 require_once "Parser.php";

-define('CONFIG_FILE', 'config.ini');

+require_once "restaurants/Pulitzer.php";

+require_once "restaurants/Twenties.php";

-$twenties = new Restaurant("Twenties", "http://www.twenties.sk/", ["Polievka aj zradlo" => '//*[@id="article"]/div[2]/p[1]']);

-$pulitzer = new Restaurant("Pulitzer", "http://www.pulitzer.sk",  ["Tekute predjedlo" => '//*[@id="soups"]', "Zradlo" => '//*[@id="meals"]']);

-#todo http://www.irish-pub.sk/sk/denne-menu

-#todo http://www.mexicana.sk/dennemenu_sk.htm

+define('CONFIG_FILE', 'config.ini');

 $data = parse_ini_file(CONFIG_FILE);

 $outputType = ucfirst($data['output']);

@@ -18,6 +16,13 @@ $outputClass = sprintf('%sOutput', $outputType);

 require_once sprintf("outputs/%s.php", $outputClass);

 $output = new $outputClass();

-$parser     = new Parser($output, array($twenties, $pulitzer));

+$restaurants[] = new Pulitzer();

+$restaurants[] = new Twenties();

+

+#todo http://www.irish-pub.sk/sk/denne-menu

+#todo http://www.mexicana.sk/dennemenu_sk.htm

+

+$parser = new Parser($output, $restaurants);

 $parser->parse();

-$output->display();

\ No newline at end of file

+

+$output->display();

@@ -7,9 +7,41 @@

  * To change this template use File | Settings | File Templates.

  */

-class HtmlOutput extends Output  {

+class HtmlOutput extends Output {

+

+	private $newLine = "<br>\n";

     public function display(){

         echo $this->output;

     }

+

+	public function addMealHeader($restaurant)

+	{

+		$this->log("<strong>$restaurant</strong>");

+	}

+

+	public function startListing()

+	{

+		$this->log("<ul>");

+	}

+

+	public function endListing()

+	{

+		$this->log("</ul>");

+	}

+

+	public function addMeal($meal)

+	{

+		$this->log("\t<li>$meal</li>\n");

+	}

+

+	public function emptyRestaurant()

+	{

+		$this->log("<i>Hovno. Nic nemaju.</i>" . $this->newLine . $this->newLine);

+	}

+

+	public function addHeader(Restaurant $restaurant) {

+		$this->log("Restaurant: <a href='{$restaurant->getUrl()}'>" . $restaurant->getName() . "</a><br/>");

+	}

+

 }

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,11 @@

+<?php

+class Pulitzer extends Restaurant {

+

+	function __construct() {

+		parent::__construct(

+			"Pulitzer",

+			"http://www.pulitzer.sk",

+			["Tekute predjedlo" => '//*[@id="soups"]', "Zradlo" => '//*[@id="meals"]']

+		);

+	}

+}

new file mode 100644

@@ -0,0 +1,12 @@

+<?php

+class Twenties extends Restaurant {

+

+	function __construct() {

+

+		parent::__construct(

+			"Twenties",

+			"http://www.twenties.sk/",

+			["Polievka aj zradlo" => '//*[@id="article"]/div[2]/p[1]']

+		);

+	}

+}