From 1e3491a76fdfc1c241b31946d91aa8ab77c4e5b4 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Mon, 18 Apr 2016 16:24:14 +0200 Subject: [PATCH 01/15] forse risolto il problema delle statistiche con le timezone --- public/admin/statCustom.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php index 640cb42..2659c1f 100644 --- a/public/admin/statCustom.php +++ b/public/admin/statCustom.php @@ -27,11 +27,11 @@ if (!is_null($action) && strcmp($action, "show")==0){ $showGraph = true; - $date = new DateTime(PostHandler::get("start")." 00:00", new DateTimeZone("Europe/Rome")); - $start = $date->format('U'); + $date = new DateTime(PostHandler::get("start")." 00:00", new DateTimeZone("CET")); + $start = $date->getTimestamp(); - $date = new DateTime(PostHandler::get("end")." 23:59", new DateTimeZone("Europe/Rome")); - $end = $date->format('U'); + $date = new DateTime(PostHandler::get("end")." 23:59", new DateTimeZone("CET")); + $end = $date->getTimestamp(); // $start = strtotime(PostHandler::get("start")." 00:00"); From 365f00fe2af997ce54324d359264613ad61ffa34 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Mon, 18 Apr 2016 16:26:29 +0200 Subject: [PATCH 02/15] echo di test --- public/admin/statCustom.php | 1 + 1 file changed, 1 insertion(+) diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php index 2659c1f..a0a7cf5 100644 --- a/public/admin/statCustom.php +++ b/public/admin/statCustom.php @@ -29,6 +29,7 @@ if (!is_null($action) && strcmp($action, "show")==0){ $date = new DateTime(PostHandler::get("start")." 00:00", new DateTimeZone("CET")); $start = $date->getTimestamp(); + echo $start; $date = new DateTime(PostHandler::get("end")." 23:59", new DateTimeZone("CET")); $end = $date->getTimestamp(); From daf03309a789d1d562096c6a346448948ad078c3 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Mon, 18 Apr 2016 16:36:43 +0200 Subject: [PATCH 03/15] forse finalmente risolto problema di timezone con le pipeline --- private/lib/PipelineHelper.php | 5 +++++ public/admin/statCustom.php | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/private/lib/PipelineHelper.php b/private/lib/PipelineHelper.php index 598d685..d15f05d 100644 --- a/private/lib/PipelineHelper.php +++ b/private/lib/PipelineHelper.php @@ -69,6 +69,11 @@ class PipelineHelper { public static function getDailyVisualizationPipelineByStartAndEnd($startDate,$endDate){ $rval = array( + array( + '$project'=>array( + 'date'=>array('$add'=>60*60*1000) + ) + ), array( '$match'=>array( 'statType'=>StatisticModel::STAT_TYPE_PAGE, diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php index a0a7cf5..2659c1f 100644 --- a/public/admin/statCustom.php +++ b/public/admin/statCustom.php @@ -29,7 +29,6 @@ if (!is_null($action) && strcmp($action, "show")==0){ $date = new DateTime(PostHandler::get("start")." 00:00", new DateTimeZone("CET")); $start = $date->getTimestamp(); - echo $start; $date = new DateTime(PostHandler::get("end")." 23:59", new DateTimeZone("CET")); $end = $date->getTimestamp(); From 4ce753aa6f02a20b734df157194e14299a810d88 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Mon, 18 Apr 2016 16:38:56 +0200 Subject: [PATCH 04/15] errore nella pipeline --- private/lib/PipelineHelper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/private/lib/PipelineHelper.php b/private/lib/PipelineHelper.php index d15f05d..64a2467 100644 --- a/private/lib/PipelineHelper.php +++ b/private/lib/PipelineHelper.php @@ -71,7 +71,11 @@ class PipelineHelper { $rval = array( array( '$project'=>array( - 'date'=>array('$add'=>60*60*1000) + 'date'=>array( + '$add'=>array( + array('$date',60*60*1000) + ) + ) ) ), array( From 75e837ffba87cc6392768f0f7132993480cde401 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Mon, 18 Apr 2016 16:39:50 +0200 Subject: [PATCH 05/15] un tipico caso di ops --- private/lib/PipelineHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/private/lib/PipelineHelper.php b/private/lib/PipelineHelper.php index 64a2467..3657e42 100644 --- a/private/lib/PipelineHelper.php +++ b/private/lib/PipelineHelper.php @@ -73,7 +73,7 @@ class PipelineHelper { '$project'=>array( 'date'=>array( '$add'=>array( - array('$date',60*60*1000) + '$date',60*60*1000 ) ) ) From 9e576651b388a4d6724bb94d4366888daac9d8b8 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Mon, 18 Apr 2016 16:48:42 +0200 Subject: [PATCH 06/15] fix pipeline --- private/lib/PipelineHelper.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/private/lib/PipelineHelper.php b/private/lib/PipelineHelper.php index 3657e42..5a47bf2 100644 --- a/private/lib/PipelineHelper.php +++ b/private/lib/PipelineHelper.php @@ -70,13 +70,15 @@ class PipelineHelper { public static function getDailyVisualizationPipelineByStartAndEnd($startDate,$endDate){ $rval = array( array( - '$project'=>array( - 'date'=>array( - '$add'=>array( - '$date',60*60*1000 - ) + '$project'=>array( + 'date'=>array( + '$add'=>array( + '$date',60*60*1000 + ) + ), + "statType"=>'$statType', + 'user'=>'$user', ) - ) ), array( '$match'=>array( From 420df6b4a8e23fb09acd6ac47a497ab3939ffeca Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Mon, 18 Apr 2016 16:51:36 +0200 Subject: [PATCH 07/15] esperimenti..... --- private/lib/PipelineHelper.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/private/lib/PipelineHelper.php b/private/lib/PipelineHelper.php index 5a47bf2..e72e30a 100644 --- a/private/lib/PipelineHelper.php +++ b/private/lib/PipelineHelper.php @@ -71,7 +71,7 @@ class PipelineHelper { $rval = array( array( '$project'=>array( - 'date'=>array( + 'tdate'=>array( '$add'=>array( '$date',60*60*1000 ) @@ -83,7 +83,7 @@ class PipelineHelper { array( '$match'=>array( 'statType'=>StatisticModel::STAT_TYPE_PAGE, - 'date'=>array( + 'tdate'=>array( '$gte'=>new MongoDate($startDate), '$lte'=>new MongoDate($endDate) ) @@ -93,9 +93,9 @@ class PipelineHelper { '$group'=>array( "_id"=>array( 'date'=>array( - "day"=>array('$dayOfMonth'=>'$date'), - "month"=>array('$month'=>'$date'), - "year"=>array('$year'=>'$date') + "day"=>array('$dayOfMonth'=>'$tdate'), + "month"=>array('$month'=>'$tdate'), + "year"=>array('$year'=>'$tdate') ), 'user'=>'$user.id', ), From c65b9b1f59ed8f0e82b9d5960d34d953f9f604aa Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Mon, 18 Apr 2016 16:53:16 +0200 Subject: [PATCH 08/15] asd --- public/admin/statCustom.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php index 2659c1f..75f0886 100644 --- a/public/admin/statCustom.php +++ b/public/admin/statCustom.php @@ -27,10 +27,10 @@ if (!is_null($action) && strcmp($action, "show")==0){ $showGraph = true; - $date = new DateTime(PostHandler::get("start")." 00:00", new DateTimeZone("CET")); + $date = new DateTime(PostHandler::get("start")." 00:00", new DateTimeZone("GMT")); $start = $date->getTimestamp(); - $date = new DateTime(PostHandler::get("end")." 23:59", new DateTimeZone("CET")); + $date = new DateTime(PostHandler::get("end")." 23:59", new DateTimeZone("GMT")); $end = $date->getTimestamp(); From 3eb618493b5ced751727d032c555fc13e46d5b61 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Mon, 18 Apr 2016 16:54:43 +0200 Subject: [PATCH 09/15] Fixato problema pipeline+timestamp --- public/admin/statCustom.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/admin/statCustom.php b/public/admin/statCustom.php index 75f0886..0ebebed 100644 --- a/public/admin/statCustom.php +++ b/public/admin/statCustom.php @@ -60,7 +60,7 @@ if (!is_null($action) && strcmp($action, "show")==0){ $result[$i]["mktime"] = mktime(0,1,0,$ele["_id"]["date"]["month"],$ele["_id"]["date"]["day"],$ele["_id"]["date"]["year"]) *1000; } - var_dump($result); +// var_dump($result); ?> + -
-
Questo sito utilizza cookie tecnici per offrirti una migliore esperienza di navigazione sul sito.
-
Navigando su questo sito accetti l'utilizzo dei cookie.

- Chiudi -

-
-
Home @@ -455,5 +460,22 @@ class GUIHandler { From a82dfff95ef071b7c43a5346ce35db404881a535 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Tue, 19 Apr 2016 12:17:30 +0200 Subject: [PATCH 11/15] =?UTF-8?q?script=20per=20retrocompatibilit=C3=A0=20?= =?UTF-8?q?link=20in=20versione=20di=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- private/bin/retroBuildIDs.php | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 private/bin/retroBuildIDs.php diff --git a/private/bin/retroBuildIDs.php b/private/bin/retroBuildIDs.php new file mode 100644 index 0000000..200188c --- /dev/null +++ b/private/bin/retroBuildIDs.php @@ -0,0 +1,49 @@ +#!/usr/bin/php + "SET NAMES utf8") ); +$pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION ); + +$count = 0; +// $statement = $pdo->query("select * from notizia order by id desc limit $count,100"); +$statement = $pdo->query("select * from notizia order by id desc limit $count,100"); +$dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); + +while (is_array($dati) && sizeof($dati)>0){ + + foreach ($dati as $ele){ + + $notizia = GlobalVariables::get("dao")->getFirst("NotiziaModel",array("titolo"=>$ele->mainTitle)); + + if (is_null($notizia)){ + $notizia = GlobalVariables::get("dao")->getFirst("NotiziaModel",array("titolo"=>htmlspecialchars_decode($ele->mainTitle))); + } + + if (is_null($notizia)){ + var_dump($ele); + } + + if (!is_null($notizia)){ +// $notizia->oldId = $ele->id; + +// GlobalVariables::get("dao")->save($notizia); + } + else { + echo $ele->id."\n"; + } + + } + $dati = array(); +// $count+=100; +// $statement = $pdo->query("select * from notizia order by id desc limit $count,100"); +// $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); +} + + +?> \ No newline at end of file From 46aaf346593b0f120048136f986b7a8d69ff7947 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Tue, 19 Apr 2016 12:31:05 +0200 Subject: [PATCH 12/15] inserito sistema di redirect per vecchie notizie indicizzate --- private/bin/retroBuildIDs.php | 18 ++++++------------ public/oldArticleRedirect.php | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 public/oldArticleRedirect.php diff --git a/private/bin/retroBuildIDs.php b/private/bin/retroBuildIDs.php index 200188c..5aeb3e7 100644 --- a/private/bin/retroBuildIDs.php +++ b/private/bin/retroBuildIDs.php @@ -11,7 +11,6 @@ $pdo = new PDO("mysql:host=localhost;dbname=fdn_old","root","root",array(PDO::MY $pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION ); $count = 0; -// $statement = $pdo->query("select * from notizia order by id desc limit $count,100"); $statement = $pdo->query("select * from notizia order by id desc limit $count,100"); $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); @@ -25,24 +24,19 @@ while (is_array($dati) && sizeof($dati)>0){ $notizia = GlobalVariables::get("dao")->getFirst("NotiziaModel",array("titolo"=>htmlspecialchars_decode($ele->mainTitle))); } - if (is_null($notizia)){ - var_dump($ele); - } - if (!is_null($notizia)){ -// $notizia->oldId = $ele->id; + $notizia->oldId = intval($ele->id); -// GlobalVariables::get("dao")->save($notizia); + GlobalVariables::get("dao")->save($notizia); } else { - echo $ele->id."\n"; + echo "Failed id ". $ele->id."\n"; } } - $dati = array(); -// $count+=100; -// $statement = $pdo->query("select * from notizia order by id desc limit $count,100"); -// $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); + $count+=100; + $statement = $pdo->query("select * from notizia order by id desc limit $count,100"); + $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); } diff --git a/public/oldArticleRedirect.php b/public/oldArticleRedirect.php new file mode 100644 index 0000000..f74e70d --- /dev/null +++ b/public/oldArticleRedirect.php @@ -0,0 +1,21 @@ +getFirst("NotiziaModel",array("oldId"=>$id)); + + if (!is_null($notizia)){ + GUIHandler::redirect("articolo.php?id=".$notizia->id); + } + else { + echo "asd"; + } +} + +?> \ No newline at end of file From 695081bf443279a58d40c28e60c44230fd768fee Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Tue, 19 Apr 2016 12:47:23 +0200 Subject: [PATCH 13/15] rimpiazzato redirect dei vecchi articoli con un 301 --- public/oldArticleRedirect.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/oldArticleRedirect.php b/public/oldArticleRedirect.php index f74e70d..133bac9 100644 --- a/public/oldArticleRedirect.php +++ b/public/oldArticleRedirect.php @@ -11,7 +11,10 @@ if (array_key_exists("id", $_GET)){ $notizia = $notizia = GlobalVariables::get("dao")->getFirst("NotiziaModel",array("oldId"=>$id)); if (!is_null($notizia)){ - GUIHandler::redirect("articolo.php?id=".$notizia->id); + Header( "HTTP/1.1 301 Moved Permanently" ); + Header( "Location: http://www.ifattidinapoli.it/articolo.php?id=".$notizia->id ); + +// GUIHandler::redirect("articolo.php?id=".$notizia->id); } else { echo "asd"; From 7eadbc6a47c66ac8f230bad9d23e1f1b197a8c7d Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Tue, 19 Apr 2016 12:49:47 +0200 Subject: [PATCH 14/15] sitemap incrementata a 1000 notizie --- public/sitemap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/sitemap.php b/public/sitemap.php index 09638b5..6121252 100644 --- a/public/sitemap.php +++ b/public/sitemap.php @@ -46,7 +46,7 @@ foreach(NotiziaModel::$NOTIZIE_CATEGORY as $category=>$data){ $latestArticles = GlobalVariables::get("dao")->query("NotiziaModel", array("status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDate())), - array("sort"=>array("about.data"=>-1),"limit"=>100) + array("sort"=>array("about.data"=>-1),"limit"=>1000) ); if (sizeof($latestArticles)>0){ From 6ce46227da09a26db87ddd80d4800e2d8be25760 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Fri, 22 Apr 2016 13:27:30 +0200 Subject: [PATCH 15/15] =?UTF-8?q?Le=20notizie=20pi=C3=B9=20viste=20in=20ho?= =?UTF-8?q?me=20page=20da=20ora=20sono=20selezionate=20tra=20le=20notizie?= =?UTF-8?q?=20degli=20ultimi=20tre=20mesi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.php b/public/index.php index cbc39f9..9d521d1 100644 --- a/public/index.php +++ b/public/index.php @@ -81,7 +81,7 @@ try { $idArray = array_map(function ($ele){ return new MongoId($ele["_id"]["notizia"]);}, $stats); $lastsNews = GlobalVariables::get("dao")->query("NotiziaModel", - array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$in'=>$idArray),"about.data"=>array('$lte'=>new MongoDate())), + array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$in'=>$idArray),"about.data"=>array('$lte'=>new MongoDate(),'$gte'=>new MongoDate(strtotime('-2 months')))), array("sort"=>array("about.data"=>-1)) ); if (sizeof($lastsNews)<5){