Changeset 1444

Timestamp:

Sep 26, 2010, 11:06:10 PM (10 years ago)

Author:

teymour

Message:

On ne montre pas les dans le résultat de la recherche
+ modif de schema de classe
+ Vire dbug

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/solr/actions/actions.class.php (modified) (2 diffs)
• config/doctrine/schema.yml (modified) (5 diffs)
• lib/task/indexSolrTask.class.php (modified) (1 diff)
• lib/task/sendAlertTask.class.php (modified) (1 diff)

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

@@ -27 +27 @@
     case 'Commentaire':
       return url_for('@photo_citoyen?slug='.$obj->getCitoyen()->getSlug());
+    case 'Citoyen':
+      return url_for('@photo_citoyen?slug='.$obj->getSlug());
     }
   }
@@ -117 +119 @@
       $this->results['docs'][$i]['titre'] = $obj->getTitre();
       $this->results['docs'][$i]['personne'] = $obj->getPersonne();
-      if (isset($results['highlighting'][$res['id']]['text']))
-        $this->results['docs'][$i]['highlighting'] = preg_replace('/^'."$this->results['docs'][$i]['personne']".'/', '', implode('...', $results['highlighting'][$res['id']]['text']));
-      else
+      if (isset($results['highlighting'][$res['id']]['text'])) {
+        $high_res = array();
+        foreach($results['highlighting'][$res['id']]['text'] as $h) {
+          if (!preg_match('/=/', $h)) 
+            array_push($high_res, $h);
+        }
+        $this->results['docs'][$i]['highlighting'] = preg_replace('/^'."$this->results['docs'][$i]['personne']".'/', '', implode('...', $high_res));
+      }else
         $this->results['docs'][$i]['highlighting'] = '';
     }

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

@@ -276 +276 @@
       foreignAlias: Amendements
     Texteloi:
-      foreignAlias: Texteloi
+      foreignAlias: Amendements
   inheritance:
     extends: ObjectCommentable
@@ -294 +294 @@
     Solrable:
       description: [Parlementaire, question, ministere, reponse, themes]
-      moretags: [Parlementaire, ministere, motif_retrait, numero, themes]
+      moretags: [Parlementaire, ministere, motif_retrait, themes]
       date: last_date
   columns:
@@ -526 +526 @@
       foreignAlias: Articles
     Texteloi:
-      foreignAlias: Texteloi
+      foreignAlias: ArticleLois
   inheritance:
     extends: ObjectCommentable
@@ -552 +552 @@
       foreignAlias: Alineas
     Texteloi:
-      foreignAlias: Texteloi
+      foreignAlias: Alineas
   inheritance:
     extends: ObjectCommentable
@@ -588 +588 @@
       foreignAlias: SousSections
     Texteloi:
-      foreignAlias: Texteloi
+      foreignAlias: TitreLois
 
 Texteloi:

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

@@ -44 +44 @@
     }
 
-    foreach(array("Parlementaire", "Commentaire", "QuestionEcrite", "Amendement", "Intervention") as $table) {
+    foreach(array("Citoyen", "Organisme", "Section", "Parlementaire", "Commentaire", "QuestionEcrite", "Amendement", "Intervention") as $table) {
       while (1) {
         $q = Doctrine::getTable($table)

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

@@ -28 +28 @@
       $results = $solr->search($query, array('sort' => 'date desc', 'hl' => 'yes', 'hl.fragsize'=>500));
       $alerte->next_mail = date('Y-m-d H:i:s', time() + self::$period[$alerte->period]);
-      echo $alerte->next_mail." $query\n";
       if (! $results['response']['numFound']) {
         $alerte->save();