add stopOnEmpty and date parameters

diff --git a/src/bdrem/Config.php b/src/bdrem/Config.php
index 04cf8882a3d3e23a6e313d59413d5c6c037cbcbf..37c4c641a3d512aea937dba10e8ecd44ae62fc8f 100644 (file)
--- a/src/bdrem/Config.php
+++ b/src/bdrem/Config.php
@@ -8,6 +8,7 @@ class Config
     public $daysPrev;
     public $daysNext;
     public $locale;
     public $daysPrev;
     public $daysNext;
     public $locale;

+    public $stopOnEmpty;

 
     public function load()
     {
 
     public function load()
     {


@@ -40,6 +41,16 @@ class Config
         return new $class($settings[0]);
     }
 
         return new $class($settings[0]);
     }
 

+    public function setDate($date)
+    {
+        if ($date === null) {
+            $this->date = date('Y-m-d');
+        } else {
+            $dt = new \DateTime($date);
+            $this->date = $dt->format('Y-m-d');
+        }
+    }
+

     public function get($varname, $default = '')
     {
         if (!isset($this->$varname) || $this->$varname == '') {
     public function get($varname, $default = '')
     {
         if (!isset($this->$varname) || $this->$varname == '') {

diff --git a/src/bdrem/Renderer.php b/src/bdrem/Renderer.php
index a8da7a1efe57e25458ee73572648b3e460aa62d2..e6f633b5e5138e1ed9aebff935a031ab14dd9702 100644 (file)
--- a/src/bdrem/Renderer.php
+++ b/src/bdrem/Renderer.php
@@ -13,6 +13,10 @@ abstract class Renderer
         echo $this->render($arEvents);
     }
 
         echo $this->render($arEvents);
     }
 

+    public function handleStopOnEmpty()
+    {
+    }
+

     abstract public function render($arEvents);
 }
 ?>
     abstract public function render($arEvents);
 }
 ?>

diff --git a/src/bdrem/Renderer/Html.php b/src/bdrem/Renderer/Html.php
index af48e0ea179da6cb5279995b525a6ab5395fa52b..637a8389d1599bfb23b68f8670589284641cbdd5 100644 (file)
--- a/src/bdrem/Renderer/Html.php
+++ b/src/bdrem/Renderer/Html.php
@@ -5,6 +5,11 @@ class Renderer_Html extends Renderer
 {
     protected $httpContentType = 'application/xhtml+xml; charset=utf-8';
 
 {
     protected $httpContentType = 'application/xhtml+xml; charset=utf-8';
 

+    public function handleStopOnEmpty()
+    {
+        header('HTTP/1.0 204 No Content');
+    }
+

     public function render($arEvents)
     {
         $tr = new Renderer_HtmlTable();
     public function render($arEvents)
     {
         $tr = new Renderer_HtmlTable();

diff --git a/src/bdrem/UserInterface.php b/src/bdrem/UserInterface.php
index da5e9a3001cdb81669d7926a215c299c536b32f5..7e6bf9a141f6a9fd436dc382df31c9b6580234f8 100644 (file)
--- a/src/bdrem/UserInterface.php
+++ b/src/bdrem/UserInterface.php
@@ -10,7 +10,6 @@ abstract class UserInterface
         try {
             $this->config = new Config();
             $this->config->load();
         try {
             $this->config = new Config();
             $this->config->load();

-            $this->config->date = date('Y-m-d');

             setlocale(LC_TIME, $this->config->locale);
             $source = $this->config->loadSource();
 
             setlocale(LC_TIME, $this->config->locale);
             $source = $this->config->loadSource();
 


@@ -75,6 +74,25 @@ abstract class UserInterface
                 'add_list_option' => true,
             )
         );
                 'add_list_option' => true,
             )
         );

+        $parser->addOption(
+            'stopOnEmpty',
+            array(
+                'short_name'  => '-e',
+                'long_name'   => '--stoponempty',
+                'description' => 'Output nothing when list is empty',
+                'action'      => 'StoreTrue',
+                'default'     => false
+            )
+        );
+        $parser->addOption(
+            'date',
+            array(
+                'short_name'  => '-d',
+                'long_name'   => '--date',
+                'description' => 'Date to show events for',
+                'action'      => 'StoreString'
+            )
+        );

         $parser->addOption(
             'quiet',
             array(
         $parser->addOption(
             'quiet',
             array(


@@ -92,10 +110,12 @@ abstract class UserInterface
         try {
             $result = $parser->parse();
             // do something with the result object
         try {
             $result = $parser->parse();
             // do something with the result object

-            $this->config->daysNext = $result->options['daysNext'];
-            $this->config->daysPrev = $result->options['daysPrev'];
-            $this->config->renderer = $result->options['renderer'];
-            $this->config->quiet    = $result->options['quiet'];
+            $this->config->daysNext    = $result->options['daysNext'];
+            $this->config->daysPrev    = $result->options['daysPrev'];
+            $this->config->renderer    = $result->options['renderer'];
+            $this->config->quiet       = $result->options['quiet'];
+            $this->config->stopOnEmpty = $result->options['stopOnEmpty'];
+            $this->config->setDate($result->options['date']);

         } catch (\Exception $exc) {
             $this->preRenderParameterError();
             $parser->displayError($exc->getMessage());
         } catch (\Exception $exc) {
             $this->preRenderParameterError();
             $parser->displayError($exc->getMessage());


@@ -106,6 +126,11 @@ abstract class UserInterface
     {
         $r = $this->getRenderer();
         $r->config = $this->config;
     {
         $r = $this->getRenderer();
         $r->config = $this->config;

+
+        if ($this->config->stopOnEmpty && count($arEvents) == 0) {
+            $r->handleStopOnEmpty();
+            return;
+        }

         $r->renderAndOutput($arEvents);
     }
 
         $r->renderAndOutput($arEvents);
     }