Changeset 2655

Timestamp:

Apr 18, 2012, 6:33:18 PM (9 years ago)

Author:

komodo

Message:

adaptation changements ND -> NS

Location:

cpc/branches/senat/project

Files:

• apps/frontend/modules/citoyen/actions/actions.class.php (modified) (1 diff)
• bin/update_hardcache (modified) (1 diff)
• bin/update_hardcache_one (modified) (1 diff)
• lib/task/indexSolrTask.class.php (modified) (1 diff)
• lib/task/loadAmdmtsTask.class.php (modified) (1 diff)
• lib/task/reindexSolrObjectTask.class.php (modified) (2 diffs)

cpc/branches/senat/project/apps/frontend/modules/citoyen/actions/actions.class.php

@@ -366 +366 @@
     $this->slug = $request->getParameter('slug');
     $this->activation_id = $request->getParameter('activation_id');
-    
+    if (Doctrine::getTable('Citoyen')->findOneBySlug($this->slug)->is_active < 0) {
+      $this->getUser()->setFlash('error', 'Ce compte a été désactivé');
+      return;
+    }
     if ($this->getUser()->isAuthenticated())
     {

cpc/branches/senat/project/bin/update_hardcache

@@ -6 +6 @@
 do 
   rm web/$url.html
-  curl http://www.nossenateurs.fr/$url > $TMPFILE 2> /dev/null
+  curl --max-time 90 "http://www.nossenateurs.fr/$url?_sf_ignore_cache=$$" > $TMPFILE 2>> /tmp/update_NS_curl_output.txt
   mv $TMPFILE web/$url.html
 done;

cpc/branches/senat/project/bin/update_hardcache_one

@@ -6 +6 @@
 echo "http://www.nossenateurs.fr/seance/$seance_id"
 rm web/seance/$seance_id.html 2> /dev/null
-curl -q http://www.nossenateurs.fr/seance/${seance_id}?_sf_ignore_cache=1 > $TMPFILE
+curl -q "http://www.nossenateurs.fr/seance/${seance_id}?_sf_ignore_cache=$$" > $TMPFILE
 mv $TMPFILE web/seance/$seance_id.html
 

cpc/branches/senat/project/lib/task/indexSolrTask.class.php

@@ -61 +61 @@
   protected function execute($arguments = array(), $options = array())
   {
-    $this->configuration = sfProjectConfiguration::getApplicationConfiguration($options['app'], $options['dev'], true);
+    $this->configuration = sfProjectConfiguration::getApplicationConfiguration($options['app'], $options['env'], true);
     $manager = new sfDatabaseManager($this->configuration);    
 

cpc/branches/senat/project/lib/task/loadAmdmtsTask.class.php

@@ -55 +55 @@
               $amdmt->numero = $json->numero;
               $amdmt->rectif = $json->rectif;
-            } elseif ($amdmt->signataires == $json->auteurs && $amdmt->date == $json->date) {
+            } elseif ($amdmt->signataires == $json->auteurs && ($amdmt->date == $json->date || ($amdmt->texte == $json->texte && $amdmt->expose == $json->expose && $amdmt->sujet == $json->sujet))) {
               $modif = false;
             }

cpc/branches/senat/project/lib/task/reindexSolrObjectTask.class.php

@@ -16 +16 @@
     $manager = new sfDatabaseManager($this->configuration);
     $class = $arguments['class'];
-    if (!preg_match('/^(Commentaire|Intervention|Amendement|Question|Section|Organisme|Texteloi|Parlementaire)$/', $class)) {
+    if (!preg_match('/^(Commentaire|Intervention|Amendement|Question|Section|Organisme|Texteloi|Parlementaire|Seance)$/', $class)) {
       echo "ERREUR : $class n'est pas une classe d'objet indexé dans Solr\n";
       return;
@@ -25 +25 @@
       return;
     }
+    if ($class === "Seance") { 
+      $inters = Doctrine::getTable('Intervention')->createQuery('i')->where('seance_id = ?', $id)->execute(); 
+      foreach ($inters as $i) 
+        $this->index($class, $i); 
+    } else {
+      $this->index($class, $id);
+    } 
+  } 
+
+  protected static function index($class, $id) {
     $obj = Doctrine::getTable($class)->find($id);
     if (!$obj) {