From 261523f539b74c5ab01dd243c5d3099f7d8b3a27 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Thu, 17 Mar 2016 11:42:16 +0100
Subject: [PATCH] Commentata query di test in searchResult

---
 private/bin/importOldData.php |  3 ++-
 public/searchResults.php      | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/private/bin/importOldData.php b/private/bin/importOldData.php
index 8ad795e..b14dd74 100644
--- a/private/bin/importOldData.php
+++ b/private/bin/importOldData.php
@@ -91,7 +91,8 @@ $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass");
 			else if (preg_match("~http[s]?[:]//www\.youtube\.com/watch[?]v[=](.+)$~", trim($ele->img), $matches)){
 				$media->link = $matches[1];
 			}
-			else if (preg_match("~http[s]?[:]//www\.youtube\.com/v/(.+)[&]amp.*$~", trim($ele->img), $matches)){
+			// LEGACY FORMAT http://www.youtube.com/v/c0B1snrcoPk&amp;hl=it_IT&amp;fs=1&amp;
+			else if (preg_match("~http[:]//www\.youtube\.com/v/(.+)[&]amp[;]hl[=]it_IT[&]amp[;]fs[=]1[&]amp[;]$~", trim($ele->img), $matches)){
 				$media->link = $matches[1];
 			}
 // 			$media->link = $ele->img;
diff --git a/public/searchResults.php b/public/searchResults.php
index 804ea19..bf39988 100644
--- a/public/searchResults.php
+++ b/public/searchResults.php
@@ -11,13 +11,13 @@ try {
 	$searchParameters = "";
 	if(array_key_exists("search", $_POST) && strcmp($_POST["search"], "")!=0){
 
-		var_dump($_POST["search"]);
+// 		var_dump($_POST["search"]);
 		$searchParameters = strip_tags(PostHandler::get("search"));
 		
-// 		$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
-// 				array("status"=>NotiziaModel::STATUS_ACCEPTED),
-// 				array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit)
-// 		);
+		$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
+				array("status"=>NotiziaModel::STATUS_ACCEPTED),
+				array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit)
+		);
 		$found = false;
 		$limit=12;
 		$page = 1;
@@ -28,7 +28,7 @@ try {
 		}
 		
 		$skip =($page - 1) * $limit;
-		$notizieAll = GlobalVariables::get("dao")->query("NotiziaModel",
+		$notizieAll = GlobalVariables::get("dao")->count("NotiziaModel",
 				array("status"=>NotiziaModel::STATUS_ACCEPTED)
 		);
 		
@@ -40,10 +40,10 @@ try {
 			$found = false;
 		}
 		
-		$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
-				array("status"=>NotiziaModel::STATUS_ACCEPTED),
-				array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit)
-		);
+// 		$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
+// 				array("status"=>NotiziaModel::STATUS_ACCEPTED),
+// 				array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit)
+// 		);
 		
 		if (sizeof($notizie)>0){
 			$found=true;