Browse Source

FIX: bug bugs in service
UPD: small minor fixes in engine

Giancarlo 7 years ago
parent
commit
1f385222d1

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "OM-Link",
-	"version": "1.9.27",
+	"version": "1.9.30",
 	"private": true,
 	"description": "OM-Link Engine",
 	"author": "Open Mind",

+ 0 - 3
src/OpenMind/FindBox/FindBox.php

@@ -18,6 +18,3 @@ class FindBox extends PluginStrategy
 		$this->AddRoute('GET /cli.fb.service', __NAMESPACE__ . '\FindBoxService->Main');
 	}
 }
-
-/** @var FindBox $FindBox */
-Global $FindBox;

+ 13 - 9
src/OpenMind/FindBox/FindBoxService.php

@@ -11,6 +11,7 @@ namespace OpenMind\FindBox;
 use Base;
 use DB\SQL;
 use Exception;
+use Generator;
 use Log;
 use OpenMind\System\QueueSystem;
 
@@ -57,8 +58,8 @@ class AsyncJobClass
 	/** @var integer $retryForFault */
 	public $retryForFault;
 
-	/** @var \Generator $blinkGenerator */
-	private $blinkGenerator;
+	/** @var Generator $blinkGenerator */
+	private $blinkGenerator = null;
 
 	/** @var array|null ledParams */
 	private $ledParams;
@@ -91,6 +92,9 @@ class AsyncJobClass
 
 	public function __destruct()
 	{
+		if (!$this->blinkGenerator)
+			return;
+
 		$this->Stop('Class Disposed');
 	}
 
@@ -253,9 +257,7 @@ class FindBoxService
 			}
 
 			// Async check on JOBS
-			$jobManager->Run(/**
-			 * @param AsyncJobClass $asyncBlink
-			 */ function ($asyncBlink) {
+			$jobManager->Run(function (AsyncJobClass $asyncBlink) {
 
 				$err = $asyncBlink->GetCurrentValue();  // Fa scattare il generator e ricava il valore
 
@@ -272,6 +274,7 @@ class FindBoxService
 							$asyncBlink->BlinkON();
 					}
 				}
+				return FALSE;
 			});
 
 		}
@@ -301,7 +304,7 @@ class FindBoxService
 					break;
 				case QueueCommand::$Q_DISPLAY:
 					$this->ServiceLogger->write("Change display for label {$qCommand->id} requested", 'd/m/Y H:i:s');
-					$esl = new SmartESL($this->findBoxCore, [$qCommand->id]);
+					$esl = new SmartESL($this->findBoxCore, $qCommand->id);
 					$esl->Display($qCommand->params['templateId'], $qCommand->params['barcode']);
 					break;
 			}
@@ -311,14 +314,15 @@ class FindBoxService
 	/**
 	 * Send SaveProduct to Label
 	 *
-	 * @param $label
+	 * @param QueueCommand $label
 	 * @return bool
 	 */
 	public function saveProduct($label)
 	{
 		if ($label->operation == QueueCommand::$Q_SAVEPRODUCT) {
-			$this->findBoxCore->SaveProducts($label->id, $label->description, $label->params['dataFields']);
-			$this->ServiceLogger->write("Save product {$label->id}", 'd/m/Y H:i:s');
+			$this->findBoxCore->SaveProducts($label->id[0], $label->description, $label->params['dataFields']);
+			$labelsJ = join(', ', $label->id);
+			$this->ServiceLogger->write("Save product {$labelsJ}", 'd/m/Y H:i:s');
 			return true;
 		}
 		return false;

+ 0 - 1
src/OpenMind/FindBox/SmartESL.php

@@ -76,7 +76,6 @@ class SmartESL
 	 */
 	public function AsyncBlinkSpecial(int $pattern, int $repeat, int $iter_time, int $iterations, int $ledColor = 0): Generator
 	{
-
 		$uriParams = json_encode(array_merge(
 			array($this->labels),
 			array($pattern, $ledColor, $repeat, $iter_time, $iterations, 1)));

+ 1 - 0
src/OpenMind/System/QueueSystem.php

@@ -13,6 +13,7 @@ class QueueSystem
 	// Used internally
 	private $sckFindBoxService;
 	private $serverPort;
+	private $clientRead;
 
 	public function __construct()
 	{

+ 1 - 0
src/OpenMind/System/System.php

@@ -11,6 +11,7 @@ use Base;
 use Cache;
 use DB\SQL;
 use PDO;
+use PDOException;
 
 class System extends PluginStrategy
 {

+ 5 - 0
src/OpenMind/Web/Controller.php

@@ -7,6 +7,7 @@
 
 namespace OpenMind\Web;
 
+use Base;
 use DB\SQL;
 use OpenMind\System\User;
 
@@ -22,6 +23,10 @@ class Controller
 	 */
 	private $sanitizedPostRequest;
 
+	/**
+	 * Controller constructor.
+	 * @param Base $f3
+	 */
 	public function __construct($f3)
 	{
 		$this->timeLoadStart = round(microtime(true) * 1000);

+ 4 - 3
src/OpenMind/Web/Login.php

@@ -8,6 +8,7 @@
 
 namespace OpenMind\Web;
 
+use Base;
 use Exception;
 use OpenMind\System\User;
 use Template;
@@ -15,7 +16,7 @@ use Template;
 class Login extends Controller
 {
 	/**
-	 * @param \Base $f3
+	 * @param Base $f3
 	 */
 	public function Login($f3)
 	{
@@ -34,7 +35,7 @@ class Login extends Controller
 	/**
 	 * Check if username and password are correct
 	 *
-	 * @param \Base $f3
+	 * @param Base $f3
 	 * @throws Exception
 	 */
 	public function LoginForm($f3)
@@ -82,7 +83,7 @@ class Login extends Controller
 	}
 
 	/**
-	 * @param \Base $f3
+	 * @param Base $f3
 	 */
 	public function Logout($f3)
 	{

+ 2 - 1
src/OpenMind/Web/Web.php

@@ -7,13 +7,14 @@
 
 namespace OpenMind\Web;
 
+use Base;
 use OpenMind\System\PluginStrategy;
 use Template;
 
 class Pages extends Controller
 {
 	/**
-	 * @param \Base $f3
+	 * @param Base $f3
 	 */
 	public function HomeMenu($f3)
 	{