Changeset 1274 for cpc/trunk/project/apps

Timestamp:

Aug 22, 2010, 8:42:40 PM (11 years ago)

Author:

roux

Message:

doctrine au lieu de Doctrine ne semble plus marcher sous linux avec la 1.4

Location:

cpc/trunk/project/apps/frontend/modules

Files:

• amendement/actions/actions.class.php (modified) (8 diffs)
• api/actions/actions.class.php (modified) (2 diffs)
• commentaire/actions/actions.class.php (modified) (4 diffs)
• commentaire/actions/components.class.php (modified) (1 diff)
• intervention/actions/actions.class.php (modified) (7 diffs)
• intervention/actions/components.class.php (modified) (1 diff)
• loi/actions/actions.class.php (modified) (9 diffs)
• parlementaire/actions/actions.class.php (modified) (1 diff)
• presence/actions/actions.class.php (modified) (3 diffs)
• questions/actions/actions.class.php (modified) (7 diffs)
• section/actions/actions.class.php (modified) (4 diffs)
• section/actions/components.class.php (modified) (1 diff)
• solr/actions/actions.class.php (modified) (1 diff)

cpc/trunk/project/apps/frontend/modules/amendement/actions/actions.class.php

@@ -7 +7 @@
   public function executeShow(sfWebRequest $request)
   {
-    $query = doctrine::getTable('Amendement')->createquery('a')
+    $query = Doctrine::getTable('Amendement')->createquery('a')
       ->where('a.texteloi_id = ?', $request->getParameter('loi'))
       ->andWhere('a.numero = ?', $request->getParameter('numero'))
@@ -21 +21 @@
      else $this->section = $section->getSection(1);
 
-     $this->identiques = doctrine::getTable('Amendement')->createQuery('a')
+     $this->identiques = Doctrine::getTable('Amendement')->createQuery('a')
        ->where('content_md5 = ?', $this->amendement->content_md5)
        ->orderBy('numero')
@@ -48 +48 @@
        ->fetchArray();
    
-     $this->loi = doctrine::getTable('TitreLoi')->findLightLoi($this->amendement->texteloi_id);
+     $this->loi = Doctrine::getTable('TitreLoi')->findLightLoi($this->amendement->texteloi_id);
   }
 
   public function executeParlementaire(sfWebRequest $request)
   {
-    $this->parlementaire = doctrine::getTable('Parlementaire')
+    $this->parlementaire = Doctrine::getTable('Parlementaire')
       ->findOneBySlug($request->getParameter('slug'));
     $this->forward404Unless($this->parlementaire);
-    $this->amendements = doctrine::getTable('Amendement')->createQuery('a')
+    $this->amendements = Doctrine::getTable('Amendement')->createQuery('a')
       ->leftJoin('a.ParlementaireAmendement pa')
       ->where('pa.parlementaire_id = ?', $this->parlementaire->id)
@@ -69 +69 @@
   public function executeParlementaireSection(sfWebRequest $request) 
   {
-    $this->parlementaire = doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
+    $this->parlementaire = Doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
     $this->forward404Unless($this->parlementaire);
 
-    $this->section = doctrine::getTable('Section')->find($request->getParameter('id'));
+    $this->section = Doctrine::getTable('Section')->find($request->getParameter('id'));
     $this->forward404Unless($this->section);
 
@@ -80 +80 @@
                                           'return' => 'value'));
 
-    $this->qamendements = doctrine::getTable('Amendement')->createQuery('a')
+    $this->qamendements = Doctrine::getTable('Amendement')->createQuery('a')
       ->leftJoin('a.ParlementaireAmendement pa')
       ->where('pa.parlementaire_id = ?', $this->parlementaire->id)
@@ -117 +117 @@
       $ids[] = $s['id'];
     
-    $this->query = doctrine::getTable('Amendement')->createQuery('a');
+    $this->query = Doctrine::getTable('Amendement')->createQuery('a');
     if (count($ids))
       $this->query->whereIn('a.id', $ids);
@@ -129 +129 @@
 
     if ($slug = $request->getParameter('parlementaire')) {
-      $this->parlementaire = doctrine::getTable('Parlementaire')
+      $this->parlementaire = Doctrine::getTable('Parlementaire')
         ->findOneBySlug($slug);
       if ($this->parlementaire)
@@ -149 +149 @@
     if ($amdt == 'all' || $amdt == 'new' ) {
       if (count($this->lois) == 1)
-        $this->loi = doctrine::getTable('TitreLoi')->findLightLoi($this->lois[0]);
-      $this->amendements_query = doctrine::getTable('Amendement')
+        $this->loi = Doctrine::getTable('TitreLoi')->findLightLoi($this->lois[0]);
+      $this->amendements_query = Doctrine::getTable('Amendement')
         ->createQuery('a')
         ->whereIn('a.texteloi_id', $this->lois)

cpc/trunk/project/apps/frontend/modules/api/actions/actions.class.php

@@ -72 +72 @@
   public function executeListParlementaires(sfWebRequest $request) 
   {
-    $deputes = doctrine::getTable('Parlementaire')->createQuery('p')->execute();
+    $deputes = Doctrine::getTable('Parlementaire')->createQuery('p')->execute();
     $this->res = array('deputes' => array());
     $this->champs = array();
@@ -104 +104 @@
     $this->forward404Unless($slug);
 
-    $depute = doctrine::getTable('Parlementaire')->findOneBySlug($slug);
+    $depute = Doctrine::getTable('Parlementaire')->findOneBySlug($slug);
     $this->res = array();
     $this->multi = array();

cpc/trunk/project/apps/frontend/modules/commentaire/actions/actions.class.php

@@ -86 +86 @@
 
   // On teste l'existence préalable du même commentaire
-    if ($existing = doctrine::getTable('Commentaire')->createQuery('c')
+    if ($existing = Doctrine::getTable('Commentaire')->createQuery('c')
       ->select('created_at')
       ->where('citoyen_id = ?', $this->getUser()->getAttribute('user_id'))
@@ -104 +104 @@
     $commentaire->object_id = $this->id;
     $commentaire->lien = $redirect_url[$this->type].$this->id;
-    $object = doctrine::getTable($this->type)->find($this->id);
+    $object = Doctrine::getTable($this->type)->find($this->id);
     if (isset($object->texteloi_id)) {
-      $loi = doctrine::getTable('TitreLoi')->findLightLoi($object->texteloi_id);
+      $loi = Doctrine::getTable('TitreLoi')->findLightLoi($object->texteloi_id);
       if ($this->type != 'Amendement') {
         $present = preg_replace('/<br\/>.*$/', '', $loi['titre']).' - A propos de l\'article ';
         if ($this->type == 'Alinea') {
-          $article = doctrine::getTable('ArticleLoi')->createQuery('a')
+          $article = Doctrine::getTable('ArticleLoi')->createQuery('a')
             ->select('titre')
             ->where('texteloi_id = ?', $object->texteloi_id)
@@ -164 +164 @@
         $commentaire->addObject('Section', $section->getSection(1)->id);
       if (!($seance = $object->getIntervention($object->numero))) {
-        $identiques = doctrine::getTable('Amendement')->createQuery('a')
+        $identiques = Doctrine::getTable('Amendement')->createQuery('a')
           ->where('content_md5 = ?', $object->content_md5)
           ->orderBy('numero')->execute();
@@ -177 +177 @@
         if (preg_match('/^Article\s+(.*)$/', $object->sujet, $match)) {
           $art = preg_replace('/premier/i', '1er', $match[1]);
-          if ($art_obj = doctrine::getTable('ArticleLoi')->findOneByLoiTitre($object->texteloi_id,$art))
+          if ($art_obj = Doctrine::getTable('ArticleLoi')->findOneByLoiTitre($object->texteloi_id,$art))
             $commentaire->addObject('ArticleLoi', $art_obj->id);
         } else $commentaire->addObject('TitreLoi', $loi->id);

cpc/trunk/project/apps/frontend/modules/commentaire/actions/components.class.php

@@ -45 +45 @@
     $id = $this->object->id;
     $type = get_class($this->object);
-    $query = doctrine::getTable('Commentaire')->createQuery('c')
+    $query = Doctrine::getTable('Commentaire')->createQuery('c')
       ->leftJoin('c.Objects co')
       ->where('co.object_type = ?', $type)

cpc/trunk/project/apps/frontend/modules/intervention/actions/actions.class.php

@@ -14 +14 @@
   {
     if (!$this->type = $request->getParameter('type')) $this->type = 'all';
-    $this->parlementaire = doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
+    $this->parlementaire = Doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
     $this->forward404Unless($this->parlementaire);
-    $this->interventions = doctrine::getTable('Intervention')->createQuery('i')
+    $this->interventions = Doctrine::getTable('Intervention')->createQuery('i')
       ->where('i.parlementaire_id = ?', $this->parlementaire->id);
     if (preg_match('/(commission|question|loi)$/', $this->type)) {
@@ -39 +39 @@
   
   public function executeParlementaireOrganisme(sfWebRequest $request) {
-    $this->parlementaire = doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
+    $this->parlementaire = Doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
     $this->forward404Unless($this->parlementaire);
-    $this->orga = doctrine::getTable('Organisme')->find($request->getParameter('orga'));
+    $this->orga = Doctrine::getTable('Organisme')->find($request->getParameter('orga'));
     $this->forward404Unless($this->orga);
-    $this->interventions = doctrine::getTable('Intervention')->createQuery('i')
+    $this->interventions = Doctrine::getTable('Intervention')->createQuery('i')
       ->leftJoin('i.Seance s')
       ->where('i.parlementaire_id = ?', $this->parlementaire->id)
@@ -54 +54 @@
 
   public function executeShow(sfWebRequest $request) {
-    $this->intervention = doctrine::getTable('Intervention')->createquery('i')
+    $this->intervention = Doctrine::getTable('Intervention')->createquery('i')
       ->where('i.id = ?', $request->getParameter('id'))
       ->fetchOne();
@@ -72 +72 @@
   public function executeSeance(sfWebRequest $request) {
     $seance_id = $request->getParameter('seance');
-    $this->seance = doctrine::getTable('Seance')->find($seance_id);
+    $this->seance = Doctrine::getTable('Seance')->find($seance_id);
     $this->forward404Unless($this->seance);
     if ($this->seance->type == 'commission') $this->orga = $this->seance->getOrganisme();
-    $query = doctrine::getTable('Intervention')->createquery('i')
+    $query = Doctrine::getTable('Intervention')->createquery('i')
         ->where('i.seance_id = ?', $seance_id)
         ->orderBy('i.timestamp ASC');
@@ -90 +90 @@
     $this->tags = split('\|', $request->getParameter('tags'));
     
-    if (doctrine::getTable('Tag')->findOneByName($this->tags[0]))
+    if (Doctrine::getTable('Tag')->findOneByName($this->tags[0]))
       $query = PluginTagTable::getObjectTaggedWithQuery('Intervention', $this->tags);
     else
-      $query = doctrine::getTable('Intervention')
+      $query = Doctrine::getTable('Intervention')
         ->createQuery('Intervention')->where('0');
 
     if ($slug = $request->getParameter('parlementaire')) {
-      $this->parlementaire = doctrine::getTable('Parlementaire')
+      $this->parlementaire = Doctrine::getTable('Parlementaire')
         ->findOneBySlug($slug);
       if ($this->parlementaire)
@@ -145 +145 @@
     }
 
-    $this->query = doctrine::getTable('Intervention')->createQuery('i');
+    $this->query = Doctrine::getTable('Intervention')->createQuery('i');
     if (count($ids))
       $this->query->whereIn('i.id', $ids);
@@ -157 +157 @@
 
     if ($slug = $request->getParameter('parlementaire')) {
-      $this->parlementaire = doctrine::getTable('Parlementaire')
+      $this->parlementaire = Doctrine::getTable('Parlementaire')
         ->findOneBySlug($slug);
       if ($this->parlementaire)

cpc/trunk/project/apps/frontend/modules/intervention/actions/components.class.php

@@ -8 +8 @@
   public function executeParlementaireQuestion()
   {
-    $this->questions = doctrine::getTable('Intervention')->createQuery('i')
+    $this->questions = Doctrine::getTable('Intervention')->createQuery('i')
       ->where('i.parlementaire_id = ?', $this->parlementaire->id)
       ->andWhere('i.type = ?', 'question')

cpc/trunk/project/apps/frontend/modules/loi/actions/actions.class.php

@@ -14 +14 @@
   private function getAmendements($loi, $articles = 'all', $alineas = 0) {
     $amendements = array();
-    $admts = doctrine::getTable('Amendement')->createquery('a')
+    $admts = Doctrine::getTable('Amendement')->createquery('a')
       ->where('a.texteloi_id = ?', $loi)
       ->andWhere('a.sort <> ?', 'Rectifié')
@@ -46 +46 @@
   public function executeLoi(sfWebRequest $request) {
     $loi_id = $this->getLoi($request);
-    $this->soussections = doctrine::getTable('TitreLoi')->createquery('t')
+    $this->soussections = Doctrine::getTable('TitreLoi')->createquery('t')
       ->where('t.texteloi_id = ?', $loi_id)
       ->andWhere('t.id != t.titre_loi_id')
       ->orderBy('t.chapitre, t.section')
       ->execute();
-    $this->articles = doctrine::getTable('ArticleLoi')->createquery('a')
+    $this->articles = Doctrine::getTable('ArticleLoi')->createquery('a')
       ->where('a.texteloi_id = ?', $loi_id)
       ->orderBy('a.ordre')
       ->fetchArray();
-    $this->amendements = count(doctrine::getTable('Amendement')->createquery('a')
+    $this->amendements = count(Doctrine::getTable('Amendement')->createquery('a')
       ->where('a.texteloi_id = ?', $loi_id)
       ->andWhere('a.sort <> ?', 'Rectifié')
@@ -69 +69 @@
     $loi_id = $this->getLoi($request, 1);
     $n_chapitre = $request->getParameter('chapitre');
-    $this->chapitre = doctrine::getTable('TitreLoi')->findChapitre($loi_id, $n_chapitre);
+    $this->chapitre = Doctrine::getTable('TitreLoi')->findChapitre($loi_id, $n_chapitre);
     $this->forward404Unless($this->chapitre);
     $n_section = $request->getParameter('section');
-    $artquery = doctrine::getTable('ArticleLoi')->createquery('a');
+    $artquery = Doctrine::getTable('ArticleLoi')->createquery('a');
     if ($n_section && $n_section != 0) {
-      $this->section = doctrine::getTable('TitreLoi')->findSection($loi_id, $n_chapitre, $n_section);
+      $this->section = Doctrine::getTable('TitreLoi')->findSection($loi_id, $n_chapitre, $n_section);
       $this->forward404Unless($this->section);
       $artquery->where('a.titre_loi_id = ?', $this->section->id);
     } else {
-      $this->soussections = doctrine::getTable('TitreLoi')->createquery('t')
+      $this->soussections = Doctrine::getTable('TitreLoi')->createquery('t')
         ->where('t.texteloi_id = ?', $loi_id)
         ->andWhere('t.chapitre = ?', $n_chapitre)
@@ -99 +99 @@
       if (preg_match('/^(\d+)\s+bis$/',$n_section, $match)) {
         $this->precedent = $match[1];
-        if (doctrine::getTable('TitreLoi')->findSection($loi_id, $n_chapitre, $match[1]+1))
+        if (Doctrine::getTable('TitreLoi')->findSection($loi_id, $n_chapitre, $match[1]+1))
           $this->suivant = $match[1] + 1;
       } else {
         $pre = $n_section - 1;
-        $voisins = doctrine::getTable('TitreLoi')->createQuery('c')
+        $voisins = Doctrine::getTable('TitreLoi')->createQuery('c')
           ->select('c.section')
           ->where('c.texteloi_id = ?', $loi_id)
@@ -143 +143 @@
       if (preg_match('/^(\d+)\s+bis$/',$n_chapitre, $match)) {
         $this->precedent = $match[1];
-        if (doctrine::getTable('TitreLoi')->findChapitre($loi_id, $match[1]+1)) $this->suivant = $match[1]+1;
+        if (Doctrine::getTable('TitreLoi')->findChapitre($loi_id, $match[1]+1)) $this->suivant = $match[1]+1;
       } else {
         $pre = $n_chapitre - 1;
-        $voisins = doctrine::getTable('TitreLoi')->createQuery('c')
+        $voisins = Doctrine::getTable('TitreLoi')->createQuery('c')
           ->select('c.chapitre')
           ->where('c.texteloi_id = ?', $loi_id)
@@ -188 +188 @@
  public function executeAlinea(sfWebRequest $request) {
     $id = $request->getParameter('id');
-    $this->alinea = doctrine::getTable('Alinea')->find($id);
+    $this->alinea = Doctrine::getTable('Alinea')->find($id);
     $this->forward404Unless($this->alinea);
     $article = $this->alinea->getArticle();
     $this->forward404Unless($article);
-    $this->loi = doctrine::getTable('TitreLoi')->findLightLoi($article->texteloi_id);
+    $this->loi = Doctrine::getTable('TitreLoi')->findLightLoi($article->texteloi_id);
     $loi_id = $this->loi->texteloi_id;
     $index = array();
@@ -198 +198 @@
       if ($i > 0) $index[] = $i;
     }
-    $this->alineas = doctrine::getTable('Alinea')
+    $this->alineas = Doctrine::getTable('Alinea')
       ->createquery('a')
       ->where('a.article_loi_id = ?', $article->id)
@@ -213 +213 @@
   public function executeArticle(sfWebRequest $request) {
     if ($id = $request->getParameter('id'))
-      $this->article = doctrine::getTable('ArticleLoi')->find($id);
+      $this->article = Doctrine::getTable('ArticleLoi')->find($id);
     else {
       $loi_id = $this->getLoi($request, 1);
       $slug_article = $request->getParameter('article');
-      $this->article = doctrine::getTable('ArticleLoi')->findOneByLoiSlug($loi_id, $slug_article);
+      $this->article = Doctrine::getTable('ArticleLoi')->findOneByLoiSlug($loi_id, $slug_article);
     }
     $this->forward404Unless($this->article);
     if (!(isset($slug_article))) {
-      $this->loi = doctrine::getTable('TitreLoi')->findLightLoi($this->article->texteloi_id);
+      $this->loi = Doctrine::getTable('TitreLoi')->findLightLoi($this->article->texteloi_id);
       $loi_id = $this->loi->texteloi_id;
     }
-    $this->alineas = doctrine::getTable('Alinea')
+    $this->alineas = Doctrine::getTable('Alinea')
       ->createquery('a')
       ->where('a.article_loi_id = ?', $this->article->id)
@@ -243 +243 @@
     $loi_id = $request->getParameter('loi');
     if ($light)
-      $this->loi = doctrine::getTable('TitreLoi')->findLightLoi($loi_id);
-    else $this->loi = doctrine::getTable('TitreLoi')->findLoi($loi_id);
+      $this->loi = Doctrine::getTable('TitreLoi')->findLightLoi($loi_id);
+    else $this->loi = Doctrine::getTable('TitreLoi')->findLoi($loi_id);
     $this->forward404Unless($this->loi);
     return $loi_id;

cpc/trunk/project/apps/frontend/modules/parlementaire/actions/actions.class.php

@@ -178 +178 @@
       }
     } else {
-      $ctquery = doctrine_query::create()
+      $ctquery = Doctrine_Query::create()
         ->from('Parlementaire p')
         ->select('count(distinct p.id) as ct')
         ->fetchOne();
       $this->total = $ctquery['ct'];
-      $ctquery = doctrine_query::create()
+      $ctquery = Doctrine_Query::create()
         ->from('Parlementaire p')
         ->select('count(distinct p.id) as ct')

cpc/trunk/project/apps/frontend/modules/presence/actions/actions.class.php

@@ -38 +38 @@
     $this->seance = Doctrine::getTable('Seance')->findOneById($seance_id);
     $this->forward404Unless($this->seance);
-    $this->preuves = doctrine::getTable('PreuvePresence')
+    $this->preuves = Doctrine::getTable('PreuvePresence')
       ->createQuery('pp')
       ->leftJoin('pp.Presence p')
@@ -50 +50 @@
     $seance_id = $request->getParameter('seance');
     $this->forward404Unless($seance_id);
-    $this->seance = doctrine::getTable('Seance')->createQuery('s')
+    $this->seance = Doctrine::getTable('Seance')->createQuery('s')
       ->where('s.id = ?', $seance_id)
       ->leftJoin('s.Organisme')
       ->fetchOne();
     $this->forward404Unless($this->seance);
-    $this->intervenants = doctrine::getTable('Presence')->createQuery('p')      
+    $this->intervenants = Doctrine::getTable('Presence')->createQuery('p')      
       ->leftJoin('p.Parlementaire pa')
       ->leftJoin('p.Preuves pr')
@@ -63 +63 @@
       ->orderBy('pa.nom_de_famille')
       ->execute();
-    $this->presents = doctrine::getTable('Presence')->createQuery('p')
+    $this->presents = Doctrine::getTable('Presence')->createQuery('p')
       ->where('p.seance_id = ?', $seance_id)
       ->leftJoin('p.Parlementaire pa')

cpc/trunk/project/apps/frontend/modules/questions/actions/actions.class.php

@@ -15 +15 @@
     //respect de l'existant : il est possible d'appeler les questions ecrites par leur id
     //Mais lorsque c'est le cas on redirige vers une url plus parlante utilisant le numéro définit par l'AN
-    $question = doctrine::getTable('QuestionEcrite')->find($request->getParameter('id'));
+    $question = Doctrine::getTable('QuestionEcrite')->find($request->getParameter('id'));
     $this->forward404Unless($question);
     return $this->redirect('@question_numero?numero='.$question->numero);
@@ -22 +22 @@
   {
     $numero = $request->getParameter('numero');
-    $this->question = doctrine::getTable('QuestionEcrite')
+    $this->question = Doctrine::getTable('QuestionEcrite')
       ->createquery('q')
       ->where('q.numero = ?', $numero)
@@ -28 +28 @@
       ->fetchOne();
     $this->forward404Unless($this->question);
-    $this->parlementaire = doctrine::getTable('Parlementaire')->find($this->question->parlementaire_id);
+    $this->parlementaire = Doctrine::getTable('Parlementaire')->find($this->question->parlementaire_id);
     $this->forward404Unless($this->parlementaire);
   }
@@ -34 +34 @@
   public function executeParlementaire(sfWebRequest $request)
   {
-    $this->parlementaire = doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
+    $this->parlementaire = Doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
     $this->forward404Unless($this->parlementaire);
-    $this->questions = doctrine::getTable('QuestionEcrite')->createQuery('q')
+    $this->questions = Doctrine::getTable('QuestionEcrite')->createQuery('q')
       ->where('q.parlementaire_id = ?', $this->parlementaire->id)
       ->orderBy('q.date DESC, q.numero DESC');
@@ -77 +77 @@
     }
 
-    $this->query = doctrine::getTable('QuestionEcrite')->createQuery('i');
+    $this->query = Doctrine::getTable('QuestionEcrite')->createQuery('i');
     if (count($ids))
       $this->query->whereIn('i.id', $ids);
@@ -91 +91 @@
 
     if ($slug = $request->getParameter('parlementaire')) {
-      $this->parlementaire = doctrine::getTable('Parlementaire')
+      $this->parlementaire = Doctrine::getTable('Parlementaire')
         ->findOneBySlug($slug);
       if ($this->parlementaire)
@@ -104 +104 @@
   }
 }
+?>

cpc/trunk/project/apps/frontend/modules/section/actions/actions.class.php

@@ -18 +18 @@
   public function executeParlementaire(sfWebRequest $request)
   {
-    $this->parlementaire = doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
+    $this->parlementaire = Doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
     $this->forward404Unless($this->parlementaire);
     $this->titre = 'Dossiers parlementaires';
@@ -26 +26 @@
   public function executeParlementaireSection(sfWebRequest $request) 
   {
-    $this->parlementaire = doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
+    $this->parlementaire = Doctrine::getTable('Parlementaire')->findOneBySlug($request->getParameter('slug'));
     $this->forward404Unless($this->parlementaire);
 
-    $this->section = doctrine::getTable('Section')->find($request->getParameter('id'));
+    $this->section = Doctrine::getTable('Section')->find($request->getParameter('id'));
     $this->forward404Unless($this->section);
 
-    $this->qinterventions = doctrine::getTable('Intervention')->createQuery('i')
+    $this->qinterventions = Doctrine::getTable('Intervention')->createQuery('i')
       ->where('i.parlementaire_id = ?', $this->parlementaire->id)
       ->leftJoin('i.Section s')
@@ -41 +41 @@
   public function executeShow(sfWebRequest $request) 
   {
-    $this->section = doctrine::getTable('Section')->find($request->getParameter('id'));
+    $this->section = Doctrine::getTable('Section')->find($request->getParameter('id'));
     $this->forward404Unless($this->section);
 
@@ -99 +99 @@
     if (!($this->order = $request->getParameter('order')))
       $this->order = 'plus';
-    $query = doctrine::getTable('Section')->createQuery('s')
+    $query = Doctrine::getTable('Section')->createQuery('s')
       ->where('s.id = s.section_id')
       ->andWhere('s.nb_interventions > 5');

cpc/trunk/project/apps/frontend/modules/section/actions/components.class.php

@@ -9 +9 @@
   public function executeParlementaire()
   {
-    $sql = doctrine_query::create()
+    $sql = Doctrine_Query::create()
       ->from('Section s')
       ->select('s.section_id, sp.titre, count(i.id) as nb')

cpc/trunk/project/apps/frontend/modules/solr/actions/actions.class.php

@@ -66 +66 @@
       $res = $this->results['docs'][$i];
       $this->results['docs'][$i]['highlighting'] = implode('...', $results['highlighting'][$res['id']]['text']);
-      //      $this->results['docs'][$i]['object'] = doctrine::getTable($res['object_name'])->find($res['object_id']);
+      //      $this->results['docs'][$i]['object'] = Doctrine::getTable($res['object_name'])->find($res['object_id']);
     }
     $this->results['end'] = $deb + $nb;