Changeset 2655
- Timestamp:
- Apr 18, 2012, 6:33:18 PM (9 years ago)
- Location:
- cpc/branches/senat/project
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
cpc/branches/senat/project/apps/frontend/modules/citoyen/actions/actions.class.php
r2345 r2655 366 366 $this->slug = $request->getParameter('slug'); 367 367 $this->activation_id = $request->getParameter('activation_id'); 368 368 if (Doctrine::getTable('Citoyen')->findOneBySlug($this->slug)->is_active < 0) { 369 $this->getUser()->setFlash('error', 'Ce compte a été désactivé'); 370 return; 371 } 369 372 if ($this->getUser()->isAuthenticated()) 370 373 { -
cpc/branches/senat/project/bin/update_hardcache
r2614 r2655 6 6 do 7 7 rm web/$url.html 8 curl http://www.nossenateurs.fr/$url > $TMPFILE 2> /dev/null8 curl --max-time 90 "http://www.nossenateurs.fr/$url?_sf_ignore_cache=$$" > $TMPFILE 2>> /tmp/update_NS_curl_output.txt 9 9 mv $TMPFILE web/$url.html 10 10 done; -
cpc/branches/senat/project/bin/update_hardcache_one
r2566 r2655 6 6 echo "http://www.nossenateurs.fr/seance/$seance_id" 7 7 rm web/seance/$seance_id.html 2> /dev/null 8 curl -q http://www.nossenateurs.fr/seance/${seance_id}?_sf_ignore_cache=1> $TMPFILE8 curl -q "http://www.nossenateurs.fr/seance/${seance_id}?_sf_ignore_cache=$$" > $TMPFILE 9 9 mv $TMPFILE web/seance/$seance_id.html 10 10 -
cpc/branches/senat/project/lib/task/indexSolrTask.class.php
r2571 r2655 61 61 protected function execute($arguments = array(), $options = array()) 62 62 { 63 $this->configuration = sfProjectConfiguration::getApplicationConfiguration($options['app'], $options[' dev'], true);63 $this->configuration = sfProjectConfiguration::getApplicationConfiguration($options['app'], $options['env'], true); 64 64 $manager = new sfDatabaseManager($this->configuration); 65 65 -
cpc/branches/senat/project/lib/task/loadAmdmtsTask.class.php
r2272 r2655 55 55 $amdmt->numero = $json->numero; 56 56 $amdmt->rectif = $json->rectif; 57 } elseif ($amdmt->signataires == $json->auteurs && $amdmt->date == $json->date) {57 } elseif ($amdmt->signataires == $json->auteurs && ($amdmt->date == $json->date || ($amdmt->texte == $json->texte && $amdmt->expose == $json->expose && $amdmt->sujet == $json->sujet))) { 58 58 $modif = false; 59 59 } -
cpc/branches/senat/project/lib/task/reindexSolrObjectTask.class.php
r2040 r2655 16 16 $manager = new sfDatabaseManager($this->configuration); 17 17 $class = $arguments['class']; 18 if (!preg_match('/^(Commentaire|Intervention|Amendement|Question|Section|Organisme|Texteloi|Parlementaire )$/', $class)) {18 if (!preg_match('/^(Commentaire|Intervention|Amendement|Question|Section|Organisme|Texteloi|Parlementaire|Seance)$/', $class)) { 19 19 echo "ERREUR : $class n'est pas une classe d'objet indexé dans Solr\n"; 20 20 return; … … 25 25 return; 26 26 } 27 if ($class === "Seance") { 28 $inters = Doctrine::getTable('Intervention')->createQuery('i')->where('seance_id = ?', $id)->execute(); 29 foreach ($inters as $i) 30 $this->index($class, $i); 31 } else { 32 $this->index($class, $id); 33 } 34 } 35 36 protected static function index($class, $id) { 27 37 $obj = Doctrine::getTable($class)->find($id); 28 38 if (!$obj) {
Note: See TracChangeset
for help on using the changeset viewer.