Changeset 1444
- Timestamp:
- Sep 26, 2010, 11:06:10 PM (10 years ago)
- Location:
- cpc/trunk/project
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
cpc/trunk/project/apps/frontend/modules/solr/actions/actions.class.php
r1438 r1444 27 27 case 'Commentaire': 28 28 return url_for('@photo_citoyen?slug='.$obj->getCitoyen()->getSlug()); 29 case 'Citoyen': 30 return url_for('@photo_citoyen?slug='.$obj->getSlug()); 29 31 } 30 32 } … … 117 119 $this->results['docs'][$i]['titre'] = $obj->getTitre(); 118 120 $this->results['docs'][$i]['personne'] = $obj->getPersonne(); 119 if (isset($results['highlighting'][$res['id']]['text'])) 120 $this->results['docs'][$i]['highlighting'] = preg_replace('/^'."$this->results['docs'][$i]['personne']".'/', '', implode('...', $results['highlighting'][$res['id']]['text'])); 121 else 121 if (isset($results['highlighting'][$res['id']]['text'])) { 122 $high_res = array(); 123 foreach($results['highlighting'][$res['id']]['text'] as $h) { 124 if (!preg_match('/=/', $h)) 125 array_push($high_res, $h); 126 } 127 $this->results['docs'][$i]['highlighting'] = preg_replace('/^'."$this->results['docs'][$i]['personne']".'/', '', implode('...', $high_res)); 128 }else 122 129 $this->results['docs'][$i]['highlighting'] = ''; 123 130 } -
cpc/trunk/project/config/doctrine/schema.yml
r1441 r1444 276 276 foreignAlias: Amendements 277 277 Texteloi: 278 foreignAlias: Texteloi278 foreignAlias: Amendements 279 279 inheritance: 280 280 extends: ObjectCommentable … … 294 294 Solrable: 295 295 description: [Parlementaire, question, ministere, reponse, themes] 296 moretags: [Parlementaire, ministere, motif_retrait, numero,themes]296 moretags: [Parlementaire, ministere, motif_retrait, themes] 297 297 date: last_date 298 298 columns: … … 526 526 foreignAlias: Articles 527 527 Texteloi: 528 foreignAlias: Texteloi528 foreignAlias: ArticleLois 529 529 inheritance: 530 530 extends: ObjectCommentable … … 552 552 foreignAlias: Alineas 553 553 Texteloi: 554 foreignAlias: Texteloi554 foreignAlias: Alineas 555 555 inheritance: 556 556 extends: ObjectCommentable … … 588 588 foreignAlias: SousSections 589 589 Texteloi: 590 foreignAlias: T exteloi590 foreignAlias: TitreLois 591 591 592 592 Texteloi: -
cpc/trunk/project/lib/task/indexSolrTask.class.php
r1364 r1444 44 44 } 45 45 46 foreach(array(" Parlementaire", "Commentaire", "QuestionEcrite", "Amendement", "Intervention") as $table) {46 foreach(array("Citoyen", "Organisme", "Section", "Parlementaire", "Commentaire", "QuestionEcrite", "Amendement", "Intervention") as $table) { 47 47 while (1) { 48 48 $q = Doctrine::getTable($table) -
cpc/trunk/project/lib/task/sendAlertTask.class.php
r1440 r1444 28 28 $results = $solr->search($query, array('sort' => 'date desc', 'hl' => 'yes', 'hl.fragsize'=>500)); 29 29 $alerte->next_mail = date('Y-m-d H:i:s', time() + self::$period[$alerte->period]); 30 echo $alerte->next_mail." $query\n";31 30 if (! $results['response']['numFound']) { 32 31 $alerte->save();
Note: See TracChangeset
for help on using the changeset viewer.