Changeset 3065

Timestamp:

Jan 14, 2013, 2:14:09 AM (8 years ago)

Author:

roux

Message:

update simplifions for more complex bill hierarchy + better style + data mariage/banques (need to update model example in bin/updateDB7.sh + reset routing bin/generate_routing.sh)

Location:

cpc/trunk/project

Files:

• apps/frontend/config/routing.yml.example (modified) (1 diff)
• apps/frontend/modules/loi/actions/actions.class.php (modified) (4 diffs)
• apps/frontend/modules/loi/templates/articleSuccess.php (modified) (1 diff)
• apps/frontend/modules/loi/templates/loiSuccess.php (modified) (5 diffs)
• apps/frontend/modules/loi/templates/sectionSuccess.php (modified) (3 diffs)
• apps/frontend/modules/section/actions/actions.class.php (modified) (1 diff)
• apps/frontend/modules/section/actions/components.class.php (modified) (1 diff)
• batch/loi/parse_loi.old.pl (copied) (copied from cpc/trunk/project/batch/loi/parse_loi.pl)
• batch/loi/parse_loi.pl (modified) (13 diffs)
• batch/loi/save_json/344-mariage.json (added)
• batch/loi/save_json/566-banques.json (added)
• bin/updateDB7.sh (added)
• config/doctrine/schema.yml (modified) (1 diff)
• lib/model/doctrine/Alinea.class.php (modified) (2 diffs)
• lib/model/doctrine/AlineaTable.class.php (modified) (1 diff)
• lib/model/doctrine/ArticleLoiTable.class.php (modified) (2 diffs)
• lib/model/doctrine/TitreLoi.class.php (modified) (2 diffs)
• lib/model/doctrine/TitreLoiTable.class.php (modified) (4 diffs)
• lib/task/loadLoiTask.class.php (modified) (3 diffs)
• web/css/xneth/style.css (modified) (9 diffs)

cpc/trunk/project/apps/frontend/config/routing.yml.example

@@ -43 +43 @@
   param: {module: commentaire, action: json}
 
-loi_section:
-  url: /%LEGISLATURE%/loi/:loi/section/:chapitre/:section
+loi_level4:
+  url: /%LEGISLATURE%/loi/:loi/section/:level1/:level2/:level3/:level4
   param: {module: loi, action: section}
 
-loi_chapitre:
-  url: /%LEGISLATURE%/loi/:loi/section/:chapitre
-  param: {module: loi, action: section, section: "0"}
+loi_level3:
+  url: /%LEGISLATURE%/loi/:loi/section/:level1/:level2/:level3
+  param: {module: loi, action: section, level4: "0"}
+
+loi_level2:
+  url: /%LEGISLATURE%/loi/:loi/section/:level1/:level2
+  param: {module: loi, action: section, level3: "0", level4: "0"}
+
+loi_level1:
+  url: /%LEGISLATURE%/loi/:loi/section/:level1
+  param: {module: loi, action: section, level2: "0", level3: "0", level4: "0"}
 
 loi_rss_commentaires:

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

@@ -49 +49 @@
       ->where('t.texteloi_id = ?', $loi_id)
       ->andWhere('t.id != t.titre_loi_id')
-      ->orderBy('t.chapitre, t.section')
+      ->orderBy('t.level1, t.level2, t.level3, t.level4')
       ->execute();
     $this->articles = Doctrine::getTable('ArticleLoi')->createquery('a')
@@ -59 +59 @@
       ->andWhere('a.sort <> ?', 'Rectifié')
       ->execute());
-    $this->dossier = $this->loi->getDossier()->id;
-
-    $this->response->setTitle(strip_tags($this->loi->titre).' - NosDéputés.fr');
+    if ($this->loi->getDossier())
+      $this->dossier = $this->loi->getDossier()->id;
+    $this->response->setTitle("Simplifions la loi - ".strip_tags($this->loi->titre).' - NosDéputés.fr');
     $request->setParameter('rss', array(array('link' => '@loi_rss_commentaires?loi='.$loi_id, 'title'=>'Les commentaires sur '.$this->loi->titre)));
-
   }
 
@@ -69 +68 @@
   {
     $loi_id = $this->getLoi($request, 1);
-    $n_chapitre = $request->getParameter('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');
-    if ($n_section && $n_section != 0) {
-      $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')
-        ->where('t.texteloi_id = ?', $loi_id)
-        ->andWhere('t.chapitre = ?', $n_chapitre)
-        ->andWhere('t.section IS NOT NULL')
-        ->orderBy('t.section')
-        ->execute();
-      $ids = array();
-      $ids[] = $this->chapitre->id;
-      if ($this->soussections) foreach ($this->soussections as $ss) $ids[] = $ss->id;
-      $artquery->whereIn('a.titre_loi_id', $ids);
-    }
-    $artquery->andWhere('a.texteloi_id = ?', $loi_id)
-      ->orderBy('a.ordre');
-    $this->articles = $artquery->execute();
+    $levels = array();
+    for ($i = 1; $i < 5; $i++)
+      $levels[] = $request->getParameter('level'.$i, 0);
+    $this->section = Doctrine::getTable('TitreLoi')->identifyAndFindLevel($loi_id, $levels);
+    $this->forward404Unless($this->section);
+    $this->level = $this->section->getLevel();
+    $qss = Doctrine::getTable('TitreLoi')->createquery('t')
+      ->where('t.texteloi_id = ?', $loi_id);
+    for ($i = 1; $i <= $this->level; $i++)
+      $qss->andWhere('t.level'.$i.' = ?', $levels[$i-1]);
+    if($this->level < 4)
+      $qss->andWhere('t.level'.($this->level+1).' IS NOT NULL');
+    $this->soussections = $qss->orderBy('t.level1, t.level2, t.level3, t.level4')
+      ->execute();
+    $ids = array($this->section->id);
+    if ($this->soussections) foreach ($this->soussections as $ss) $ids[] = $ss->id;
+    $this->articles = Doctrine::getTable('ArticleLoi')
+      ->createquery('a')
+      ->whereIn('a.titre_loi_id', $ids)
+      ->andWhere('a.texteloi_id = ?', $loi_id)
+      ->orderBy('a.ordre')
+      ->execute();
     if (count($this->articles) == 1)
       $this->redirect('@loi_article?loi='.$loi_id.'&article='.$this->articles[0]->slug);
     $this->amendements = $this->getAmendements($loi_id, $this->articles);
-    if (isset($this->section)) {
-      $titre = $this->section->getLargeTitre();
-      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))
-          $this->suivant = $match[1] + 1;
-      } else {
-        $pre = $n_section - 1;
-        $voisins = Doctrine::getTable('TitreLoi')->createQuery('c')
-          ->select('c.section')
-          ->where('c.texteloi_id = ?', $loi_id)
-          ->andWhere('c.chapitre = ?', $n_chapitre)
-          ->andWhereIn('c.section', array($pre, $pre." bis", $n_section." bis", $n_section+1))
-          ->orderBy('c.section')
-          ->fetchArray();
-        $ct = count($voisins);
-        if ($ct == 1) {
-          if ($n_section == 1) $this->suivant = $voisins[0]['section'];
-          else $this->precedent = $voisins[0]['section'];
-        } else if ($ct == 2) {
-          if ($n_section == 1)
-            $this->suivant = $voisins[0]['section'];
-          else if (preg_match('/^(\d+)\s+bis$/', $voisins[1]['section'], $match) && $match[1] < $n_section)
-            $this->precedent = $voisins[1]['section'];
-          else {
-            $this->precedent = $voisins[0]['section'];
-            $this->suivant = $voisins[1]['section'];
-          }
-        } else if ($ct > 2) {
-          if (preg_match('/bis/', $voisins[1]['section']) && preg_match('/bis/', $voisins[2]['section'])) {
-            $this->precedent = $voisins[1]['section'];
-            $this->suivant = $voisins[2]['section'];
-          } else {
-            $this->precedent = $voisins[0]['section'];
-            if (preg_match('/'.$n_section.'/', $voisins[1]['section'])) {
-              $this->precedent = $voisins[0]['section'];
-              $this->suivant = $voisins[1]['section'];
-            } else {
-              $this->precedent = $voisins[1]['section'];
-              $this->suivant = $voisins[2]['section'];
-            }
-          }
-        }
-      }
-    } else {
-      $titre = $this->chapitre->getLargeTitre();
-      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;
-      } else {
-        $pre = $n_chapitre - 1;
-        $voisins = Doctrine::getTable('TitreLoi')->createQuery('c')
-          ->select('c.chapitre')
-          ->where('c.texteloi_id = ?', $loi_id)
-          ->andWhere('c.section is NULL')
-          ->andWhereIn('c.chapitre', array($pre, $pre." bis", $n_chapitre." bis", $n_chapitre+1))
-          ->orderBy('c.chapitre')
-          ->fetchArray();
-        $ct = count($voisins);
-        if ($ct == 1) {
-          if ($n_chapitre == 1) $this->suivant = $voisins[0]['chapitre'];
-          else $this->precedent = $voisins[0]['chapitre'];
-        } else if ($ct == 2) {
-          if ($n_chapitre == 1)
-            $this->suivant = $voisins[0]['chapitre'];
-          else if (preg_match('/^(\d+)\s+bis$/', $voisins[1]['chapitre'], $match) && $match[1] < $n_chapitre)
-            $this->precedent = $voisins[1]['chapitre'];
-          else {
-            $this->precedent = $voisins[0]['chapitre'];
-            $this->suivant = $voisins[1]['chapitre'];
-          }
-        } else if ($ct > 2) {
-          if (preg_match('/bis/', $voisins[1]['chapitre']) && preg_match('/bis/', $voisins[2]['chapitre'])) {
-            $this->precedent = $voisins[1]['chapitre'];
-            $this->suivant = $voisins[2]['chapitre'];
-          } else {
-            $this->precedent = $voisins[0]['chapitre'];
-            if (preg_match('/'.$n_chapitre.'/', $voisins[1]['chapitre'])) {
-              $this->precedent = $voisins[0]['chapitre'];
-              $this->suivant = $voisins[1]['chapitre'];
-            } else {
-              $this->precedent = $voisins[1]['chapitre'];
-              $this->suivant = $voisins[2]['chapitre'];
-            }
-          }
-        }
-      }
-    }
-    $this->response->setTitle(strip_tags($this->loi->titre.' - '.$titre));
+    $this->voisins = $this->section->getVoisins();
+    $this->titre = $this->section->getHierarchie()." : ".$this->section->titre;
+    $this->response->setTitle(strip_tags($this->loi->titre.' - '.$this->titre));
   }
 
@@ -233 +144 @@
     $this->forward404Unless(count($this->alineas));
     $this->section = $this->article->getTitreLoi();
+    $titre = strip_tags($this->loi->titre);
+    if ($this->section->getHierarchie())
+      $titre .= " (".strip_tags($this->section->getHierarchie()).") ";
     $this->titre = 'Article '.$this->article->titre;
-    if (isset($this->section->chapitre) && $this->section->chapitre != 0)
-      $this->titre .= ' ('.$this->section->getLargeTitre().')';
-    $this->response->setTitle(strip_tags($this->loi->titre.' - '.$this->titre));
+    $this->response->setTitle($titre.' - '.$this->titre);
     if (isset($this->article->expose) && $this->article->expose != "") $this->expose = $this->article->expose;
     else $this->expose = $this->section->expose;

cpc/trunk/project/apps/frontend/modules/loi/templates/articleSuccess.php

@@ -1 +1 @@
 <div class="loi">
 <h1><?php echo link_to($loi->titre, '@loi?loi='.$loi->texteloi_id); ?></h1>
-<h2><?php if (preg_match('/@loi_chapitre/', $titre)) {
-  $url = url_for('@loi_chapitre?loi='.$loi->texteloi_id.'&chapitre='.$section->chapitre);
-  $titre = preg_replace('/@loi_chapitre/', $url, $titre);
-  if (preg_match('/@loi_section/', $titre)) {
-    $url = url_for('@loi_section?loi='.$loi->texteloi_id.'&chapitre='.$section->chapitre.'&section='.$section->section);
-    $titre = preg_replace('/@loi_section/', $url, $titre);
-  }
-}
-echo $titre; ?></h2>
+<h2><?php echo $titre; ?></h2>
+<h3><?php echo "(".$section->getHierarchie()."&nbsp;: ".link_to(ucfirst($section->titre), $section->getUrl()).")"; ?></h3>
 <div class="pagerloi">
 <?php if ($article->precedent) {

cpc/trunk/project/apps/frontend/modules/loi/templates/loiSuccess.php

@@ -1 @@
-<?php if ($dossier) echo '<div class="source">'.link_to('Dossier relatif', '@section?id='.$dossier)."</div>"; ?>
+<?php if (isset($dossier)) echo '<div class="source">'.link_to('Dossier relatif', '@section?id='.$dossier)."</div>"; ?>
 <div class="loi"><h1><?php echo $loi->titre; ?></h1></div>
 <?php if ($loi->source) echo '<p class="source"><a href="'.$loi->source.'" rel="nofollow">Source</a></p><div class="clear"></div>';
-if ($loi->parlementaire_id && $loi->expose && !($loi->texteloi_id == 2760)) { ?>
+if ($loi->parlementaire_id && $loi->expose) { ?>
   <div class="loi"><div class="intervenant">
   <?php $perso = $loi->getParlementaire();
@@ -17 +17 @@
 <?php $nart = 0; $nbart = 0;
 if (isset($soussections)) {
-  $chapitre = 0;
-  $section = 0;
+  $level = 0;
   foreach ($soussections as $ss) {
-    if (($section != 0 || $chapitre != 0) && ($ss->chapitre != $chapitre || $ss->section > 1)) {
+    if ($ss->level <= $level) {
       echo '<br/><small> &nbsp; Article';
-      if ($nbart > 1) echo 's';
-      echo '&nbsp;: ';
+      if ($nbart > 1) echo 's&nbsp;:';
+      echo ' ';
       for ($i=$nart;$i<$nart+$nbart;$i++) {
         echo link_to($articles[$i]['titre'], '@loi_article?loi='.$loi->texteloi_id.'&article='.$articles[$i]['slug']);
@@ -30 +29 @@
       $nart += $nbart;
       echo '</small>';
+      if ($ss->level < $level) for ($i=0; $i < $level-$ss->level; $i++)
+        echo "</li></ul>";
+      else echo "</li>";
+    } else echo "<ul>";
+    echo '<li class="level'.$ss->getLevel().'">'.link_to($ss->getLevelTitre(), $ss->getUrl());
+    $level = $ss->getLevel();
+    $nbart = $ss->nb_articles;
+    if ($ss->nb_commentaires > 0) {
+      echo '(<span class="coms_loi_txt">'.$ss->nb_commentaires.' commentaire';
+      if ($ss->nb_commentaires > 1) echo 's';
+      echo '</span>)';
     }
-    $nbart = $ss->nb_articles;
-    if (isset($ss->chapitre) && $ss->chapitre != $chapitre && (!($ss->section) || $ss->section == 0)) {
-      if ($section != 0) echo '</li></ul>';
-      $section = 0;
-      if ($chapitre != 0) echo '</li>';
-      else echo '<ul>';
-      $chapitre = $ss->chapitre;
-      echo '<li><b><a href="'.url_for('@loi_chapitre?loi='.$loi->texteloi_id.'&chapitre='.$chapitre).'">';
-      echo 'Chapitre '.$chapitre;
-    } else if (isset($ss->section) && $ss->section != $section) {
-      if ($section != 0) echo '</li>';
-      else echo '<ul>';
-      $section = $ss->section;
-      echo '<li><a href="'.url_for('@loi_section?loi='.$loi->texteloi_id.'&chapitre='.$chapitre.'&section='.$section).'">';
-      echo 'Section '.$section;
-    }
-    echo '&nbsp;: '.$ss->titre.'</a>';
-    if ($section == 0) echo '</b>';
-    echo ' ('.$ss->nb_articles.' article';
-    if ($ss->nb_articles > 1) echo 's';
-    if ($ss->nb_commentaires > 0) {
-      echo ', <span class="coms_loi_txt">'.$ss->nb_commentaires.' commentaire';
-      if ($ss->nb_commentaires > 1) echo 's';
-    }
-    echo '</span>)';
   }
   echo '<br/><small> &nbsp; Article';
@@ -65 +50 @@
   }
   echo '</small>';
-  if ($section != 0) echo '</li></ul>';
-  if ($chapitre != 0) echo '</li></ul>';
+  if ($ss->level < $level) for ($i=0; $i < $level-$ss->level; $i++)
+    echo "</li></ul>";
   if ($amendements) {
     echo '<p class="suivant">'.link_to('Voir les '.$amendements.' amendements déposés sur ce texte', '@find_amendements_by_loi_and_numero?loi='.$loi->texteloi_id.'&numero=all');
@@ -85 +70 @@
 </div>
 <br/>
-<?php if ((!$loi->parlementaire_id && $loi->expose) || $loi->texteloi_id == 2760) {
+<?php if (!$loi->parlementaire_id && $loi->expose) {
   echo '<div class="loi"><h2>Exposé des motifs&nbsp;:</h2>';
   if ($loi->parlementaire_id && $perso = $loi->getParlementaire()) 

cpc/trunk/project/apps/frontend/modules/loi/templates/sectionSuccess.php

@@ -2 +2 @@
 <div class="loi">
 <h1><?php echo link_to($loi->titre, '@loi?loi='.$loi->texteloi_id); ?></h1>
-<h2><?php if (isset($section)) echo '<a href="'.url_for('@loi_chapitre?loi='.$loi->texteloi_id.'&chapitre='.$chapitre->chapitre).'">'; 
-echo 'Chapitre '.$chapitre->chapitre.'&nbsp;: '.$chapitre->titre;
-if (isset($section)) echo '</a>'; ?></h2>
+<h2><?php echo $titre; ?></h2>
 <?php $expose = '';
-if (isset($section)) {
-  echo '<h3>Section '.$section->section.'&nbsp;: '.$section->titre.'</h3>';
-  echo '<div class="pagerloi">';
-  if (isset($precedent)) {
-    echo '<div class="precedent">'.link_to('Section '.$precedent, '@loi_section?loi='.$loi->texteloi_id.'&chapitre='.$chapitre->chapitre.'&section='.$precedent).'</div>';
+echo '<div class="pagerloi">';
+$baseurl = '@loi_level'.$level.'?loi='.$loi->texteloi_id;
+for ($i = 1; $i < $level; $i++)
+  $baseurl .= "&level".$i."=".$section->getLevelValue($i);
+if ($voisins[0]) echo '<div class="precedent">'.link_to(ucfirst($section->leveltype).' '.$voisins[0], $baseurl."&level".$level.'='.$voisins[0]).'</div>';
+if ($voisins[1]) echo '<div class="suivant">'.link_to(ucfirst($section->leveltype).' '.$voisins[1], $baseurl."&level".$level.'='.$voisins[1]).'</div>';
+echo '</div>';
+if (isset($section->expose)) {
+  $expose = $section->expose;
+  echo myTools::escape_blanks($expose);
+} ?>
+<div class="sommaireloi">
+<?php if (isset($soussections)) {
+  $idx_sec = array(); $ct = 0;
+  foreach ($soussections as $ss) {
+    $idx_sec[$ss->id] = $ct;
+    $ct++;
   }
-  if (isset($suivant))
-    echo '<div class="suivant">'.link_to('Section '.$suivant, '@loi_section?loi='.$loi->texteloi_id.'&chapitre='.$chapitre->chapitre.'&section='.$suivant).'</div>';
-  echo '</div>';
-  if (isset($section->expose)) {
-    $expose = $section->expose;
-    echo myTools::escape_blanks($expose);
-  }
-} else {
-  echo '<div class="pagerloi">';
-  if (isset($precedent)) {
-    echo '<div class="precedent">'.link_to('Chapitre '.$precedent, '@loi_chapitre?loi='.$loi->texteloi_id.'&chapitre='.$precedent).'</div>';
-  }
-  if (isset($suivant))
-    echo '<div class="suivant">'.link_to('Chapitre '.$suivant, '@loi_chapitre?loi='.$loi->texteloi_id.'&chapitre='.$suivant).'</div>';
-  echo '</div>';
-  if (isset($chapitre->expose)) {
-    $expose = $chapitre->expose;
-    echo myTools::escape_blanks($expose);
-  } 
 }
-if (isset($soussections)) {
-  $sections = array();
-  foreach ($soussections as $ss) {
-    $sections[$ss->id] = array('numero' => $ss->section, 'titre' => $ss->titre, 'expose' => $ss->expose);
-  }
-  unset($soussections);
-}
-
 $nart = 0;
 $changesec = 0;
-if (isset($sections)) $nsec = 0;
+$cursec = 0;
+$nsec = 0;
+$level = 0;
 foreach ($articles as $a) {
-  if (isset($sections) && isset($sections[$a->titre_loi_id])) {
-    $section = $sections[$a->titre_loi_id];
-    if ($section['numero'] != $nsec) {
-      if ($nsec != 0) echo '</ul></li>';
-      else echo '<ul>';
-      $nsec = $section['numero'];
-      $changesec = 1;
-      echo '<li><b><a href="'.url_for('@loi_section?loi='.$loi->texteloi_id.'&chapitre='.$chapitre->chapitre.'&section='.$nsec).'">';
-      echo 'Section '.$nsec.'&nbsp;: '.$section['titre'];
-      if (isset($section['expose']) && $section['expose'] != "") {
+  if (isset($soussections) && isset($idx_sec[$a->titre_loi_id]) && $soussections[$idx_sec[$a->titre_loi_id]]->id != $cursec) {
+    $section = $soussections[$idx_sec[$a->titre_loi_id]];
+    $cursec = $section->id;
+    $changesec = 1;
+    echo "</ul>";
+    if ($section->level < $level) {
+      echo "</li>";
+      for ($i=1; $i < $level-$section->level+1; $i++)
+        echo "</ul></li>";
+    } elseif ($section->level == $level)
+      echo "</li>";
+    for ($i = $nsec; $i <= $idx_sec[$cursec]; $i++) {
+      $parsec = $soussections[$i];
+      if ($parsec->level > $level) {
+        echo "<ul>";
+      }
+      $level = $parsec->level;
+      echo '<li class="level'.$parsec->level.'"><a href="'.url_for($parsec->getUrl()).'">'.$parsec->getLevelTitre();
+      if (isset($parsec->expose) && $parsec->expose != "") {
         $expose = myTools::escape_blanks(truncate_text(html_entity_decode(strip_tags($section['expose']), ENT_NOQUOTES, "UTF-8"), 250));
-        echo '</b><blockquote>'.$expose.'</blockquote></a>';
-      } else echo '</b></a>';
+        echo '</b><blockquote>'.$expose.'</blockquote>';
+      }
+      echo '</a>';
     }
+    $nsec = $idx_sec[$cursec]+1;
   }
   if ($nart != 0 && $changesec == 0) echo '</li>';
   else {
-    echo '<ul>';
+    echo "<ul>";
     $changesec = 0;
   }
@@ -73 +69 @@
   }
   $nart = $a->ordre;
-  echo '<li><a href="'.url_for('@loi_article?loi='.$loi->texteloi_id.'&article='.$a->slug).'">';
-  echo '<b>Article '.$a->titre.'</b></a>';
+  echo '<li class="articleloi"><a href="'.url_for('@loi_article?loi='.$loi->texteloi_id.'&article='.$a->slug).'"><u>Article '.$a->titre.'</u></a>';
   if ($a->nb_commentaires > 0 || isset($amendements[$atitre])) echo ' (';
   if ($a->nb_commentaires > 0) {
@@ -105 +100 @@
   }
 } 
-if ($nart != 0) echo '</ul>'; ?>
+if ($nart != 0) echo '</ul>';
+for ($i = 0; $i < $level; $i++)
+  echo "</li></ul>";  ?>
 </div>
+</div>

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

@@ -78 +78 @@
         ->from('TitreLoi t')
         ->whereIn('t.texteloi_id', $lois)
-        ->andWhere('t.chapitre IS NULL')
-        ->andWhere('t.section is NULL')
+        ->andWhere('t.leveltype = ?', 'loi')
         ->orderBy('t.texteloi_id')
         ->fetchArray();

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

@@ -4 +4 @@
 {
   public function executeSimplifions() {
-    $this->lois = Doctrine_Query::create()->select('l.texteloi_id, l.titre, l.nb_commentaires')->from('TitreLoi l')->where('l.chapitre IS NULL')->andWhere('l.section IS NULL')->andWhere('l.nb_commentaires >= 5')->orderBy('l.date DESC')->fetchArray();
+    $this->lois = Doctrine_Query::create()->select('l.texteloi_id, l.titre, l.nb_commentaires')->from('TitreLoi l')->where('l.leveltype = ?', 'loi')->orderBy('l.date DESC')->fetchArray(); //->andWhere('l.nb_commentaires >= 5') 
   }
 

cpc/trunk/project/batch/loi/parse_loi.pl

@@ -2 +2 @@
 
 $file = $source = shift;
-$titre_chap = shift;
 
 $source =~ s/^[^\/]+\///;
@@ -15 +14 @@
   $present = 0;
 } else {
-  $present = 1;
-}
+  $present = 0;
+}
+use HTML::Entities;
 
 open(FILE, $file) ;
@@ -50 +50 @@
 }
 
-sub checkout_chapitre {
-  if ($present == 0 && $chapitre == 1) {
+$accents = '[ÀÉÈÊËÎÏÔÙÛÜÇ]';
+$upcases = "([A-Z]|$accents)";
+sub name_lowerize {
+  my $name = shift;
+  utf8::decode($name);
+  $name = decode_entities($name);
+  $name =~ s/ ($upcases\w{1,4}+ )/ \L$1/g;
+  $name =~ s/ ($upcases\w{1,4}+ )/ \L$1/g;
+  $name =~ s/($upcases')/\L$1/g;
+  $name =~ s/$upcases(\w+ ?)/$1\L$2/g;
+  $name =~ s/(([^' ]|$accents))(\w+)/$1\L$3/g;
+  utf8::encode($name);
+  $name =~ s/\s+/ /g;
+  return ucfirst($name);
+}  
+
+sub checkout_level {
+  $level = shift;
+  if ($level == 0) {
+    return;
+  }
+  if ($present == 0 && $level == 1 && $levels[0] == 1) {
     checkout_loi();
   }
-  if ($chapitre != 0) {
-    print '{"type": "chapitre", "loi": "'.$loi.'", "chapitre": "'.$chapitre.'", "titre": "'.$titre.'", "expose": "'.$exposechapitre."\"}\n";
-  }
-  $exposechapitre = "";
-  $exposesection = "";
-  $exposearticle = "";
-  $titre = "";
-  $section = 0;
-}
-
-sub checkout_section {
-  if ($section != 0) {
-    print '{"type": "section", "loi": "'.$loi.'", "chapitre": "'.$chapitre.'", "section": "'.$section.'", "titre": "'.$titre.'", "expose": "'.$exposesection."\"}\n";
-  }
-  $exposesection = "";
+  if ($levels[$level-1] != 0) {
+    print '{"type": "section", "loi": "'.$loi.'", "level": "'.$level.'", "leveltype": "'.$leveltype.'", "level1": "'.$levels[0].'", "level2": "'.$levels[1].'", "level3": "'.$levels[2].'", "level4": "'.$levels[3].'", "titre": "'.name_lowerize($titre).'", "expose": "'.$exposelevels[$level-1]."\"}\n";
+  }
+  for ($i = $level - 1; $i < 4; $i++) {
+    $exposelevels[$i] = "";
+  }
   $exposearticle = "";
   $titre = "";
@@ -77 +88 @@
     $exposearticle =~ s/<a href=["']([^"']*);([^"']*)["']>/<a href='\1.\2'>/gi;
   }
-  if ($chapitre != 0 && $num_article != 0) { if (!(($loi == 1890 && ($chapitre == 5 || $num_article == 101)) || ($loi == 1697 && ($chapitre == 3 && $section >= 2 && $num_article == 9) ))) {
+  if ($levels[0] != 0 && $num_article != 0) {
    if (!($exposearticle =~ /^$/)) {
 #    $exposearticle =~ s/\s*$/<\/p>/;
@@ -85 +96 @@
       $num_article_titre = $num_article;
     }
-    print '{"type": "article", "loi": "'.$loi.'", "chapitre": "'.$chapitre.'", "section": "'.$section.'", "article": "'.$num_article_titre.'", "ordre": "", "expose": "'.$exposearticle."\"}\n";
-   } } $exposearticle = "";
+    print '{"type": "article", "loi": "'.$loi.'", "level": "'.$level.'", "leveltype": "'.$leveltype.'", "level1": "'.$levels[0].'", "level2": "'.$levels[1].'", "level3": "'.$levels[2].'", "level4": "'.$levels[3].'", "article": "'.$num_article_titre.'", "ordre": "", "expose": "'.$exposearticle."\"}\n";
+   } $exposearticle = "";
   }
 }
@@ -92 +103 @@
 sub checkout_article {
   if ($num_article != 0 && $titre_article != '') {
-    print '{"type": "article", "loi": "'.$loi.'", "chapitre": "'.$chapitre.'", "section": "'.$section.'", "article": "'.$titre_article.'", "ordre": "'.$num_article.'", "expose": ""}'."\n";
+    print '{"type": "article", "loi": "'.$loi.'", "level1": "'.$levels[0].'", "level2": "'.$levels[1].'", "level3": "'.$levels[2].'", "level4": "'.$levels[3].'", "article": "'.$titre_article.'", "ordre": "'.$num_article.'", "expose": ""}'."\n";
   }
 }
 
 sub checkout_alinea {
-  print '{"type": "alinea", "loi": "'.$loi.'", "chapitre": "'.$chapitre.'", "section": "'.$section.'", "article": "'.$titre_article.'", "alinea": "'.$num_alinea.'", "texte": "'.$texte."\"}\n";
+  print '{"type": "alinea", "loi": "'.$loi.'", "level1": "'.$levels[0].'", "level2": "'.$levels[1].'", "level3": "'.$levels[2].'", "level4": "'.$levels[3].'", "article": "'.$titre_article.'", "alinea": "'.$num_alinea.'", "texte": "'.$texte."\"}\n";
   $texte = "";
 }
 
+# Convert from roman numbers
+%romans_map = ('M' => 1000, 'CM' => 900, 'D' => 500, 'CD' => 400, 'C' => 100, 'XC' => 90, 'L' => 50, 'XL' => 40, 'X' => 10, 'IX' => 9, 'V' => 5, 'IV' => 4, 'I' => 1);
+sub romans {
+  $num = shift;
+  $res = 0;
+  while (($r, $d) = each(%romans_map)) {
+    while ($num =~ s/^$r//i) {
+     $res += $d;
+    }
+  }
+  $res += $num;
+  return $res;
+}
+
+sub set_level {
+  $leveltype = lc(shift);
+  $levelvalue = romans(shift);
+  $oldlevel = $curlevel;
+  if (!$hierarchy{$leveltype}) {
+    $curlevel += 1;
+    $hierarchy{$leveltype} = $curlevel;
+  } else {
+    $curlevel = $hierarchy{$leveltype};
+  }
+  $levels[$curlevel-1] = $levelvalue;
+  for ($i=$curlevel; $i<4; $i++) {
+    $levels[$i] = 0;
+  }
+  #print "TEST $leveltype ; $levelvalue ; $curlevel ; $hierarchy ; $levels\n";
+}
+
 sub handle_text {
-  if ($deftitre =~ /^none$/) {
-    if (($titre_chap =~ /^titre$/ && $content =~ /^\s*(T|t)(itre|ITRE)\s+(\d+|[IVX]+)(ER|er)?/) || (!($titre_chap =~ /^titre$/) && $content =~ /^\s*(T|CHAP|Chap)(itre|ITRE)\s+(\d+|[IVXivx]+)(ER|er)?/)) {
-      $chapitre++;
-      $section = 0;
-      $deftitre = 'chapitre';
-    } elsif (($titre_chap =~ /^titre$/ && $content =~ /^\s*(C|c)(HAPITRE|hapitre)\s+(\d+|[IVXivx]+)(ER|er)?/) || (!($titre_chap =~ /^titre$/) && $content =~ /^\s*section\s+\d+/i)) {
-      $section++;
-      $deftitre = 'section';
+  if ($deftitre == 0) {
+    if ($content =~ /^\s*((chap|t)itre|volume|livre|tome|(sous-)?section)\s+(\d+|[ivx]+)(er?)?/i) {
+      set_level($1, $4);
+      $deftitre = 1;
     } elsif ($align =~ /center/ && $content =~ /<b>\s*Article/) {
       $content_art = $content;
@@ -138 +176 @@
     $content =~ s/<\/?[a-z]+>//ig;
     $titre = $content;
-    if ($deftitre =~ /^chapitre$/) {
-      checkout_chapitre();
-    } elsif ($deftitre =~ /^section$/) {
-      checkout_section();
-    }
-    $deftitre = 'none';
+    checkout_level($curlevel);
+    $deftitre = 0;
   }
 }
 
 sub reset_vars {
-  $chapitre = 0;
-  $section = 0;
+  $levels = [0,0,0,0];
+  $exposelevels = ["","","",""];
+  $curlevel = 0;
+  $leveltype = "";
   $article = 0;
   $num_article = 0;
@@ -155 +191 @@
   $texte = "";
   $expose = "";
-  $exposechapitre = "";
-  $exposesection = "";
   $exposearticle = "";
   $titre = "";
   $titrearticle = "";
+  $hierarchy = {};
+  $deftitre = 0;
 }
 
 $auteur = "";
 $zone = 0;
-$deftitre = 'none';
 reset_vars();
-if ($loi =~ /ta376/) {
-  $date = "2009-12-02";
-  $auteur = "M. Jean-Luc Warsmann";
-}
 
 foreach $line (split /\n/, $string) {
@@ -196 +227 @@
     if ($content =~ /(PRO.*DE\s+LOI|EXPOS.*MOTIF)/) {
       if ($zone == 2) {
-        if ($chapitre == 0) {
+        if ($levels[0] == 0) {
           checkout_loi();
           $titre = "";
-        } elsif ($loi == 1697) {
-          while ($num_article < 47) {
-            $tmp_expose = $exposearticle;
-            checkout_present_article();
-            $num_article ++;
-            $exposearticle = $tmp_expose;
-          }
-        } elsif ($loi == 2760) {
-          checkout_present_article();
-          checkout_chapitre();
         }
       }
@@ -218 +239 @@
     if ($zone == 2) {
 
-      if ($content =~ /(\*\*\*|<b>.*(chap|t)itre\s+(premier|[IVX]+[eE]?[rR]?).*<\/b>)/) {
+      if ($content =~ /(\*\*\*|<b>.*((chap|t)itre)\s+(premier|[ivxIVX]+[eE]?[rR]?).*<\/b>)/) {
         checkout_present_article();
-        checkout_section();
-        checkout_chapitre();
+        for ($i == 4; $i > 0; $i++) {
+          checkout_level($i);
+        }
         $check = 1;
         if ($content =~ /\*\*\*/) {
@@ -227 +249 @@
         }
       }
-      if ($check == 1 && $content =~ /(chap|t)itre\s+(premier|[IVX]+[eE]?[rR]?),?(<|\s+)/) {
-        if ($chapitre == 0) {
+      if ($check == 1 && $content =~ /((chap|t)itre|volume|livre|tome)\s+(\d+|premi|[ivx]+)e?r?,?(<|\s+)/) {
+        if ($levels[0] == 0) {
           checkout_loi();
         }
-        $chapitre++;
-        $exposechapitre .= '<p>'.$content.'</p>';
-        $section = 0;
+        if ($levels[$curlevel-1] != 0) {
+          checkout_present_article();
+          checkout_level($curlevel);
+        }
+        set_level($1, $3);
+        $exposelevels[$curlevel-1] .= '<p>'.$content.'</p>';
         $check = 0;
-        if ($loi == 1890) {
-          if ($num_article == 88) {
-            $num_article = 101;
-          } elsif ($num_article == 101) {
-            $num_article = 135;
-          }
-        } elsif ($loi == 1697) {
-          if ($num_article == 4) {
-            $num_article = 8;
-          } elsif ($num_article == 9) {
-            $num_article = 18;
-          }
-        }
-      } elsif ($content =~ /la(\s+|\s*<[a-z]*>\s*)?section\s+(\d+)/i && ($section + 1 == $2)) {
-        if ($section != 0) {
+      } elsif ($content =~ /la(\s+|\s*<[a-z]*>\s*)?((sous-)?section)\s+(\d+|[ivx]+)/i) {
+        if ($levels[$curlevel-1] != 0) {
           checkout_present_article();
-          checkout_section();
-        }
-       # $exposesection = '<p>'.$content.'</p>';
-        $section = $2;
-      }
-
-      if ($chapitre == 0) {
+          checkout_level($curlevel);
+        }
+        set_level($2, $4);
+      }
+
+      if ($levels[0] == 0) {
         $expose .= '<p>'.$content.'</p>';
       } else {
@@ -267 +278 @@
           }
           foreach $phrase (split /\.\s*/, $content) {
-            if ($phrase =~ /la\s+section\s+(\d+)/i) {
-              $exposesection = '<p>'.$phrase.'.</p>';
+            if ($phrase =~ /la\s+((sous-)?section)\s+(\d+|[ivx]+)/i) {
+              set_level($1, $3);
+              $exposelevels[$curlevel-1] = '<p>'.$phrase.'.</p>';
               if (!($phrase =~ /article\s+(\d+)/i)) {
                 next;
               }
             }
-            if ($phrase =~ /<b>.*articles?\s+(\d+).*<\/b>/i && (($num_article + 1 == $1) || ($loi == 2760 && $num_article == 6))) {
+            if ($phrase =~ /<b>.*articles?\s+(\d+).*<\/b>/i && $num_article + 1 == $1) {
               checkout_present_article();
               $num_article = $1;
-              if ($loi == 2760 && $num_article == 6) {
-                $num_article = 7;
-              }
             }
             if ($num_article != 0) {
@@ -295 +304 @@
   #          }
   #        }
-        } elsif ($section != 0 && !($exposesection =~ /$content/)) {
-          $exposesection .= '<p>'.$content.'</p>';
+        } elsif ($levels[$curlevel-1] != 0 && !($exposelevels[$curlevel-1] =~ /$content/)) {
+          $exposelevels[$curlevel-1] .= '<p>'.$content.'</p>';
 #        } elsif (!($exposearticle =~ /article\s+($num_article)/) && !($exposechapitre =~ /$content/)) {
 #          $exposechapitre .= '<p>'.$content.'</p>';

cpc/trunk/project/config/doctrine/schema.yml

@@ -582 +582 @@
   columns:
     texteloi_id: string(16)
-    chapitre: string(8)
-    section: string(8)
+    leveltype: string(16)
+    level1: string(8)
+    level2: string(8)
+    level3: string(8)
+    level4: string(8)
     titre: string(512)
     expose:

cpc/trunk/project/lib/model/doctrine/Alinea.class.php

@@ -29 +29 @@
      "code de déontologie des professionnels de l'expertise comptable" => "LEGITEXT000006074510",
      "code disciplinaire et pénal de la marine marchande" => "LEGITEXT000006071188",
+     "code des transports" => "LEGITEXT000023086525",
      "code du domaine de l'état et des collectivités publiques applicable à la collectivité territoriale de mayotte" => "LEGITEXT000006074235",
      "code du domaine de l'état" => "LEGITEXT000006070208",
@@ -66 +67 @@
      "code des pensions civiles et militaires de retraite" => "LEGITEXT000006070302",
      "code des pensions de retraite des marins français du commerce, de pêche ou de plaisance" => "LEGITEXT000006074066",
+     "code des pensions militaires d'invalidité et des victimes de guerre" => "LEGITEXT000006074068",
      "code des pensions militaires d'invalidité et des victimes de la guerre" => "LEGITEXT000006074068",
      "code des ports maritimes" => "LEGITEXT000006074233",

cpc/trunk/project/lib/model/doctrine/AlineaTable.class.php

@@ -6 +6 @@
 {
 
-  public function findOrCreate($loi, $article, $numero, $chapitre = 0, $section = 0) {
-    $art = Doctrine::getTable('ArticleLoi')->findOrCreate($loi, $article, $chapitre, $section);
+  public function findOrCreate($loi, $article, $numero, $levels = array(0, 0, 0, 0)) {
+    $art = Doctrine::getTable('ArticleLoi')->findOrCreate($loi, $article, $levels);
     $query = $this->createQuery('a')
       ->where('a.texteloi_id = ?', $loi)

cpc/trunk/project/lib/model/doctrine/ArticleLoiTable.class.php

@@ -20 +20 @@
   }
 
-  public function findOrCreate($loi, $article, $chapitre = 0, $section = 0) {
+  private static function getArticleTitreLoi($loi, $levels = array(0, 0, 0, 0)) {
+    $titreloi = $loi;
+    for ($i = 0; $i < 4; $i++) {
+      if ($levels[$i] != 0) {
+        $par = Doctrine::getTable('TitreLoi')->findLevelOrCreate($loi->texteloi_id, $i+1, $levels);
+        $par->nb_articles += 1;
+        $par->save();
+        $titreloi = $par;
+      } else return $titreloi;
+    }
+    return $titreloi;
+  }
+
+  public function findOrCreate($loi, $article, $levels = array(0, 0, 0, 0)) {
     $art = $this->findOneByLoiTitre($loi, $article);
     if (!$art) {
@@ -30 +43 @@
       $loiobj->nb_articles += 1;
       $loiobj->save();
-      if ($chapitre != 0) {
-        $chap = Doctrine::getTable('TitreLoi')->findChapitreOrCreate($loi, $chapitre);
-        $chap->nb_articles += 1;
-        $chap->save();
-        if ($section != 0) {
-          $sec = Doctrine::getTable('TitreLoi')->findSectionOrCreate($loi, $chapitre, $section);
-          $sec->nb_articles++;
-          $art->setTitreLoi($sec);
-          $sec->save();
-        } else {
-          $art->setTitreLoi($chap);
-        }
-      } else {
-        $art->setTitreLoi($loiobj);
-      }
+      $art->setTitreLoi(self::getArticleTitreLoi($loiobj, $levels));
       $art->save();
     }

cpc/trunk/project/lib/model/doctrine/TitreLoi.class.php

@@ -23 +23 @@
   }
 
-  public function getLargeTitre() {
-    $titre = '';
-    if ($this->titre_loi_id != $this->id) {
-      if (isset($this->chapitre) && $this->chapitre != 0) {
-        $titre .= '<a href="@loi_chapitre">Chapitre '.$this->chapitre;
-        if (isset($this->section) && $this->section != 0)
-          $titre .= '</a> - <a href="@loi_section">section '.$this->section;
-        $titre .= ' : '.$this->titre.'</a>';
-      }
+  public function setLevel($level, $value) {
+    $this->_set($levelstr, $value);
+  }
+
+  public static function findLevel($levels = array(0,0,0,0)) {
+    for ($i = 3; $i >= 0; $i--)
+      if ($levels[$i]) return $i+1;
+    return 0;
+  }
+
+  public function getLevel() {
+    $levels = array();
+    for ($i = 1; $i < 5; $i++)
+      $levels[] = $this->_get('level'.$i, 0);
+    return self::findLevel($levels);
+  }
+
+  public function getLevelValue($level) {
+    if ($level != 1 && $level != 2 && $level != 3 && $level != 4)
+      return '';
+    return $this->_get('level'.$level);
+  }
+
+  public function getUrl() {
+    $level = $this->getLevel();
+    if (!$level)
+      return '@loi?loi='.$this->texteloi_id;
+    $args = "?loi=".$this->texteloi_id;
+    for ($i = 1; $i <= $level; $i++)
+      $args .= "&level".$i."=".$this->_get('level'.$i);
+    return '@loi_level'.$level.$args;
+  }
+
+  public function getShortLevelTitre() {
+    if ($this->getLevel())
+      return ucfirst($this->leveltype).' '.$this->_get('level'.$this->getLevel());
+    return '';
+  }
+
+  public function getLevelTitre() {
+    $titre = ucfirst($this->titre);
+    if ($this->getShortLevelTitre())
+      $titre = $this->getShortLevelTitre()."&nbsp;: ".$titre;
+    return $titre;
+  }
+
+  public function getHierarchie() {
+    if (!$this->getLevel())
+      return ''; 
+    sfProjectConfiguration::getActive()->loadHelpers(array('Url'));
+    $titreparent = '<a href="'.url_for($this->getUrl()).'">'.$this->getShortLevelTitre()."</a>";
+    if ($this->getLevel() > 1) {
+      $parent = $this->TitreLoi;
+      $titreparent = $parent->getHierarchie()." - ".$titreparent;
     }
-    return $titre;
+    return $titreparent;
   }
 
@@ -49 +94 @@
   }
 
+  public function getVoisins() {
+    $result = array("","");
+    $level = $this->getLevel();
+    if (!$level)
+      return $result;
+    $levelstr = "level".$level;
+    $levelvalue = $this->_get($levelstr);
+    $levels = array(0,0,0,0);
+    for ($i = 1; $i < $level; $i++)
+      $levels[$i-1] = $this->_get('level'.$i);
+    if (preg_match('/^(\d+)\s+bis$/',$levelvalue, $match)) {
+      $result[0] = $match[1];
+      $levels[$levelvalue] = $match[1] + 1;
+      if (Doctrine::getTable('TitreLoi')->findLevel($this->texteloi_id, $levels))
+        $result[1] = $match[1] + 1;
+    } else {
+      $pre = $levelvalue - 1;
+      $qvoisins = Doctrine::getTable('TitreLoi')->createQuery('c')
+        ->select('c.'.$levelstr)
+        ->where('c.texteloi_id = ?', $this->texteloi_id);
+      for ($i = 1; $i < $level; $i++)
+        $qvoisins->andWhere('c.level'.$i.' = ?', $levels[$i-1]);
+      for ($i = $level + 1; $i < 5; $i++)
+        $qvoisins->andWhere('c.level'.$i.' IS NULL');
+      $voisins = $qvoisins->andWhereIn('c.'.$levelstr, array($pre, $pre." bis", $levelvalue." bis", $levelvalue + 1))
+        ->orderBy('c.'.$levelstr)
+        ->fetchArray();
+      $ct = count($voisins);
+      if ($ct == 1) {
+        if ($levelvalue == 1) $result[1] = $voisins[0][$levelstr];
+        else $result[0] = $voisins[0][$levelstr];
+      } else if ($ct == 2) {
+        if ($levelvalue == 1)
+          $result[1] = $voisins[0][$levelstr];
+        else if (preg_match('/^(\d+)\s+bis$/', $voisins[1][$levelstr], $match) && $match[1] < $levelvalue)
+          $result[0] = $voisins[1][$levelstr];
+        else {
+          $result[0] = $voisins[0][$levelstr];
+          $result[1] = $voisins[1][$levelstr];
+        }
+      } else if ($ct > 2) {
+        if (preg_match('/bis/', $voisins[1][$levelstr]) && preg_match('/bis/', $voisins[2][$levelstr])) {
+          $result[0] = $voisins[1][$levelstr];
+          $result[1] = $voisins[2][$levelstr];
+        } else {
+          $result[0] = $voisins[0][$levelstr];
+          if (preg_match('/'.$n_section.'/', $voisins[1][$levelstr])) {
+            $result[0] = $voisins[0][$levelstr];
+            $result[1] = $voisins[1][$levelstr];
+          } else {
+            $result[0] = $voisins[1][$levelstr];
+            $result[1] = $voisins[2][$levelstr];
+          }
+        }
+      }
+    }
+    return $result;
+  }
+
 }

cpc/trunk/project/lib/model/doctrine/TitreLoiTable.class.php

@@ -11 +11 @@
       ->from('TitreLoi t')
       ->where('t.texteloi_id = ?', $id)
-      ->andWhere('t.chapitre IS NULL')
-      ->andWhere('t.section IS NULL')
+      ->andWhere('t.leveltype = ?', 'loi')
       ->fetchOne();
     if (!$loiarr) return null;
@@ -28 +27 @@
     $query = $this->createQuery('t')
       ->where('t.texteloi_id = ?', $numero)
-      ->andWhere('t.chapitre IS NULL')
-      ->andWhere('t.section IS NULL');
+      ->andWhere('t.leveltype = ?', 'loi');
     return $query->fetchOne();
   }
@@ -39 +37 @@
       $loi->texteloi_id = $numero;
       $loi->nb_articles = 0;
+      $loi->leveltype = 'loi';
       $loi->save();
     }
@@ -46 +45 @@
   }
 
-  public function findChapitre($loi, $numero) {
-    $query = $this->createQuery('t')
-      ->where('t.texteloi_id = ?', $loi)
-      ->andWhere('t.chapitre = ?', $numero)
-      ->andWhere('t.section IS NULL');
-    return $query->fetchOne();
-  } 
-
-  public function findChapitreOrCreate($loi, $numero) {
-    $chap = $this->findChapitre($loi, $numero);
-    if (!$chap) {
-      $chap = new TitreLoi();
-      $chap->texteloi_id = $loi;
-      $chap->chapitre = $numero;
-      $chap->nb_articles = 0;
-    }
-    $chap->titre_loi_id = $this->findLoiOrCreate($loi)->id;
-    $chap->save();
-    return $chap;
+  public function identifyAndFindLevel($loi, $levels = array(0, 0, 0, 0)) {
+    return self::findLevel($loi, TitreLoi::findLevel($levels), $levels);
   }
 
-  public function findSection($loi, $chapitre, $numero) {
+  public function findLevel($loi, $level, $levels = array(0, 0, 0, 0)) {
     $query = $this->createQuery('t')
-      ->where('t.texteloi_id = ?', $loi)
-      ->andWhere('t.chapitre = ?', $chapitre)
-      ->andWhere('t.section = ?', $numero);
+      ->where('t.texteloi_id = ?', $loi);
+    for ($i = 0; $i < 4; $i++) {
+      if ($i < $level)
+        $query->andWhere('t.level'.($i+1).' = ?', $levels[$i]);
+      else $query->andWhere('t.level'.($i+1).' IS NULL');
+    }
     return $query->fetchOne();
   }
 
-  public function findSectionOrCreate($loi, $chapitre, $numero) {
-    $sect = $this->findSection($loi, $chapitre, $numero);
+  public function findLevelOrCreate($loi, $level, $levels = array(0, 0, 0, 0), $leveltype = '') {
+    if ($level == 0)
+      return $this->findLoiOrCreate($loi);
+    $sect = $this->findLevel($loi, $level, $levels);
     if (!$sect) {
       $sect =  new TitreLoi();
       $sect->texteloi_id = $loi;
-      $sect->chapitre = $chapitre;
-      $sect->section = $numero;
+      for ($i = 0; $i < $level; $i++) 
+        $sect->setLevel($i+1, $levels[$i]);
       $sect->nb_articles = 0;
     }
-    $sect->titre_loi_id = $this->findChapitreOrCreate($loi, $chapitre)->id;
+    if (!$sect->leveltype && $leveltype != "")
+      $sect->leveltype = $leveltype;
+    $sect->titre_loi_id = $this->findLevelOrCreate($loi, $level-1, $levels)->id;
     $sect->save();
     return $sect;

cpc/trunk/project/lib/task/loadLoiTask.class.php

@@ -29 +29 @@
               continue;
             }
-            if ($json->expose) $json->expose = preg_replace("/<a\shref='([^']+)'>/", '<a href="\1">', $json->expose);
-            if ($json->texte) $json->texte = preg_replace("/<a\shref='([^']+)'>/", '<a href="\1">', $json->texte);
+            if (isset($json->expose)) $json->expose = preg_replace("/<a\shref='([^']+)'>/", '<a href="\1">', $json->expose);
+            if (isset($json->texte)) $json->texte = preg_replace("/<a\shref='([^']+)'>/", '<a href="\1">', $json->texte);
             if ($json->type == 'loi') {
               $loi = Doctrine::getTable('TitreLoi')->findLoiOrCreate($json->loi);
@@ -39 +39 @@
               if ($json->auteur) $loi->setAuteur($json->auteur);
               $loi->save();
-            } else if ($json->type == 'chapitre') {
-              $chap = Doctrine::getTable('TitreLoi')->findChapitreOrCreate($json->loi, $json->chapitre);
-              if ($json->titre) $chap->titre = $json->titre;
-              if ($json->expose) $chap->expose = $json->expose;
-              $chap->save();
             } else if ($json->type == 'section') {
-              $sec = Doctrine::getTable('TitreLoi')->findSectionOrCreate($json->loi, $json->chapitre, $json->section);
+              $sec = Doctrine::getTable('TitreLoi')->findLevelOrCreate($json->loi, $json->level, array($json->level1, $json->level2, $json->level3, $json->level4), $json->leveltype);
               if ($json->titre) $sec->titre = $json->titre;
               if ($json->expose) $sec->expose = $json->expose;
               $sec->save();
             } else if ($json->type == 'article') {
-              $art = Doctrine::getTable('ArticleLoi')->findOrCreate($json->loi, $json->article, $json->chapitre, $json->section);
+              $art = Doctrine::getTable('ArticleLoi')->findOrCreate($json->loi, $json->article, array($json->level1, $json->level2, $json->level3, $json->level4));
               if ($json->expose && $json->expose != '') $art->expose = $json->expose;
               if ($json->ordre && $json->ordre != '') {
@@ -63 +58 @@
               } else $art->save();
             } else if ($json->type == 'alinea') {
-              $ali = Doctrine::getTable('Alinea')->findOrCreate($json->loi, $json->article, $json->alinea, $json->chapitre, $json->section);
+              $ali = Doctrine::getTable('Alinea')->findOrCreate($json->loi, $json->article, $json->alinea, array($json->level1, $json->level2, $json->level3, $json->level4));
               if ($json->alinea == 1)
                 $refcode = '';

cpc/trunk/project/web/css/xneth/style.css

@@ -1287 +1287 @@
   border-bottom: 1px dashed #E8E7E4;
 }
-.inscription input, .connexion input { width: 20em; }
+.inscription input, .connexion input { max-width: 320px; }
 /* commentaires */
 .link_comment {
@@ -1299 +1299 @@
   clear:both;
   margin-bottom: 15px;
+}
+
+.commentaires .com_ajax textarea {
+  max-width: 840px;
 }
 .commentaire_avatar {
@@ -1331 +1335 @@
   text-decoration: underline;
 }
-.commentaires com_link {
-  float: right;
+.commentaires .com_link {
+  float: right;
+}
+
+.commentaires th {
+  max-width: 400px;
 }
 .source {
@@ -1360 +1368 @@
   padding-left: 20px;
 }
-.loi li {
-  margin-left: -15px;
+.sommaireloi ul {
+  margin-bottom: 8px;
+}
+.sommaireloi li {
+  margin-top: 5px;
 }
 .loi blockquote {
@@ -1413 +1424 @@
 }
 .alineatexte {
-  width: 870px;
+  max-width: 870px;
 }
 .alineatexte p:first-letter {
@@ -1428 +1439 @@
   display: none;
   float: right;
-  margin-top: 13px;
-  margin-bottom: 0px;
-  margin-right: 25px;
+  margin-top: 10px;
+  margin-bottom: 3px;
+  margin-right: 18px;
   height: 11px;
 }
@@ -1436 +1447 @@
   margin-top: 22px;
   margin-left: 10px;
+  max-width: 850px;
+  clear: both;
+  margin: auto;
 }
 .com_ajax {
   margin-top: 30px;
 }
-.alineatexte .commentaires {
-  clear: both;
-  margin: auto;
-}
 .alineatexte .commentaire_avatar img {
   margin: 6px;
@@ -1449 +1459 @@
 .loi, .sommaireloi {
   font-size: 12px;
+}
+.sommaireloi .level1 {
+  font-weight: bold;
+  font-size: 14px;
+}
+.sommaireloi .level2 {
+  font-weight: bold;
+  opacity: 0.8;
+  font-size: 13px;
+}
+.sommaireloi .level3 {
+  font-weight: normal;
+  opacity: 1;
+  font-size: 13px;
+}
+.sommaireloi .articleloi {
+  font-weight: normal;
+  font-size: 12px;
+}
+.sommaireloi small {
+  font-weight: normal;
+  opacity: 1;
+  font-size: 11px;
 }
 .loi .alineatexte .commentaire a {
@@ -1469 +1502 @@
   text-align: right;
 }
-.alineatexte .commentaires com_link {
-  float: right;
+.alineatexte .commentaires .com_link {
+  float: right;
+}
+.alineatexte .commentaires .com_link tr {
+  max-width: 830px;
 }
 .perso {