Changeset 806 for trunk/app

Timestamp:

10/10/08 21:03:41 (8 weeks ago)

Author:

aarkerio

Message:

Little changes

Location:

trunk/app

Files:

• controllers/components/search.php (modified) (4 diffs)
• controllers/entries_controller.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• views/elements/search.ctp (modified) (1 diff)
• views/entries/search.ctp (modified) (1 diff)
• views/layouts/portal.ctp (modified) (1 diff)

trunk/app/controllers/components/search.php

@@ -1 +1 @@
 <?php
 /**
-*
-* GPLv3 Chipotle Software 2002-2008 
-*
+*  Manuel Montoya
+*  GPLv3 Chipotle Software 2002-2008 
+*  Full Text Search Engine   --   Postgresql 8.3
 **/
 App::import('Model', 'Entry');
@@ -12 +12 @@
 App::import('Model', 'Lesson');
 
-class SearchComponent extends Object
-{
+class SearchComponent extends Object {
 
-public $controller = true; 
+ public $controller = true; 
 
-/**
+ private $Keywords = null;
+
+ private $lang     = '';
+ 
+ public $Data      = array();
+
+ /**
  * Startup - Link the component to the controller.
  *
@@ -24 +29 @@
  public function startup(&$controller)
  {
-         $this->controller =& $controller;
+  $this->controller =& $controller;
+  $this->Models = array('Entry', 'News'); // models to search in
+  if ($this->controller->Auth->user('lang')):
+    $this->lang = 'es'; //$this->controller->Auth->user('lang');
+  else:
+    $this->lang = 'en';
+  endif;
  }
  
@@ -30 +41 @@
  * Build and execute search query
  */
- 
- private $Models   = null; // fields to search
- 
- private $Keywords = null;
- 
- private $Fields   = null;
- 
- private $Limit    = null;
- 
- private $Order    = null;
- 
- public $Data      = array();
- 
+  
  public function getRows($keywords) 
- {    
-      //at least three letters
-      if (strlen($keywords) < 3)
-      {
+ {
+  if (strlen($keywords) < 3):
          return null;
-      }
-      
-      $this->Models = array('Entry', 'News', 'Podcast', 'Faq', 'Glossary', 'Lesson'); // models to search in
-      
-      $this->Keywords = explode(' ', $keywords); // convert to array
-      
-      //exit(print_r($this->Keywords));
-      
-      foreach ($this->Models as $model)
-      {
-         $conditions = "(";
-         
-         foreach ($this->Keywords as $f)
-         {  
-            if ( strlen($conditions) > 5)
-            {
-                      $conditions  .= " OR ";
-            }
-            
-            switch ($model)
-            {
-               case 'Entry':
-                   
-                   $conditions  .= "Entry.body ~* '$f' OR Entry.title ~* '$f' AND Entry.status=1";
-                   
-                   $this->Fields = array('Entry.id', 'Entry.title');
-                   $this->Limit  = 20;
-                   $this->Order  = "Entry.id DESC";
-                   break;
-                   
-               case 'News':
-                   $conditions  .= "News.body ~* '$f' OR News.title ~* '$f' AND News.status=1";
-                   $this->Fields = array('News.id', 'News.title');
-                   $this->Limit  = 20;
-                   $this->Order  = "News.id DESC";
-                   break;
-                   
-               case 'Faq':
-                   $conditions  .= "Faq.question ~* '$f' OR Faq.answer ~* '$f'";
-                   $this->Fields = array('Faq.id', 'Faq.question');
-                   $this->Limit  = 20;
-                   $this->Order  = "Faq.id DESC";
-                   break;
-               
-               case 'Podcast':
-                   $conditions  .= "Podcast.title ~* '$f' OR Podcast.description ~* '$f' AND Podcast.status=1";
-                   $this->Fields = array('Podcast.id', 'Podcast.title');
-                   $this->Limit  = 20;
-                   $this->Order  = "Podcast.id DESC";
-                   break;
-                   
-               case 'Glossary':
-                   $conditions  .= "Glossary.item ~* '$f' OR Glossary.definition ~* '$f'";
-                   $this->Fields = array('Glossary.id', 'Glossary.item');
-                   $this->Limit  = 20;
-                   $this->Order  = "Glossary.id DESC";
-                   break;
-                   
-               case 'Lesson':
-                   $conditions  .= "Lesson.title ~* '$f' OR Lesson.body ~* '$f'";
-                   $this->Fields = array('Lesson.id', 'Lesson.title');
-                   $this->Limit  = 20;
-                   $this->Order  = "Lesson.id DESC";
-                   break;
-            }
-          }
-          
-          $conditions .= ")";
-          
-          $Model =& new $model;
-          
-          $this->Data[$model] = $Model->findAll($conditions, $this->Fields, $this->Order, $this->Limit);
-          
-          $conditions = '';
-      }
-      
-      return $this->Data;
-        
-  }
+  endif;
+
+  $this->Keywords = explode(' ', $keywords); // convert to array
+  // build terms
+  if ( count($this->Keywords) === 1):            
+     $t = $keywords;
+  else:
+     $t = (string) '';
+     for($i=0;count($this->Keywords)<=$i;$i++):
+        $t .= $this->Keywords[$i];
+    if (count($this->Keywords) < $i): 
+            $t .=  ' | ';
+    endif;
+     endfor;
+  endif;
+
+  foreach ($this->Models as $model):            
+    switch ($model) 
+    {
+     case 'News':
+      $q  = "SELECT id, title, ts_headline('karamelo_".$this->lang."', body, to_tsquery('karamelo_".$this->lang."','".$t."')), ";
+      $q .= "rank FROM ( SELECT id, title, substr(body,0,260) as body, ts_rank_cd(to_tsvector('karamelo_".$this->lang."', body), ";
+      $q .= "to_tsquery('karamelo_".$this->lang."','".$t."')) AS rank FROM news, to_tsquery('karamelo_".$this->lang."','".$t."') ";
+      $q .= "query WHERE to_tsquery('karamelo_".$this->lang."','".$t."') @@ to_tsvector('karamelo_".$this->lang."', body) ";
+      $q .= "ORDER BY rank DESC LIMIT 20) AS foo";    
+     break;
+   case 'Entry':
+      $q  = "SELECT id, title, ts_headline('karamelo_".$this->lang."', body, to_tsquery('karamelo_".$this->lang."','".$t."')), ";
+      $q .= "rank FROM ( SELECT id, title, substr(body,0,260) as body, ts_rank_cd(to_tsvector('karamelo_".$this->lang."', body), ";
+      $q .= "to_tsquery('karamelo_".$this->lang."','".$t."')) AS rank FROM entries, to_tsquery('karamelo_".$this->lang."','".$t."') ";
+      $q .= "query WHERE to_tsquery('karamelo_".$this->lang."','".$t."') @@ to_tsvector('karamelo_".$this->lang."', body) ";
+      $q .= "ORDER BY rank DESC LIMIT 20) AS foo";
+     break;              
+  
+    }
+    $Model =& new $model;
+    $this->Data[$model] = $Model->query($q);
+   endforeach;
+  return $this->Data;
+ }
 }
 ?>

trunk/app/controllers/entries_controller.php

@@ -110 +110 @@
   $this->Sanitize = new Sanitize;
       
-  $this->Sanitize->paranoid($this->data['Entry']['terms']); 
-  $q  = 'SELECT id, title FROM entries WHERE ';
-  $q .= '  to_tsvector(title || body) @@ to_tsquery(\''.$this->data['Entry']['terms'].'\') ';
-  $q .= '  ORDER BY created DESC LIMIT 10';
-     
+  $this->Sanitize->paranoid($this->data['Entry']['terms']);
+  
   $this->set('data', $this->Search->getRows($this->data['Entry']['terms']));
  }

trunk/app/locale/spa/LC_MESSAGES/default.po

@@ -4 +4 @@
 msgid  "Yes"
 msgstr "Si"
+
+msgid  "Search Results"
+msgstr "Resultados de búsqueda"
 
 msgid  "Virtual Class"

trunk/app/views/elements/search.ctp

@@ -25 +25 @@
 <?php 
     echo $form->create('Entry', array('action'=>'search', 'onsubmit'=>"return chkSearch()"));
-    echo $form->input('Entry.terms', array('label'=>'', 'size' =>12, 'value' => "Search...", "maxlength" => 40, 
+    echo $form->input('Entry.terms', array('label'=>'', 'size' =>12, 'value' => 'Search...', 'maxlength' => 40, 
          "onblur" => "if(this.value=='') this.value='Search...';", 
          "onfocus"=>"if(this.value=='Search...') this.value='';"));

trunk/app/views/entries/search.ctp

@@ -1 +1 @@
 <?php
+//die(debug($data));
+echo $html->div('title_portal', __('Search Results', true));
 
-echo $html->div('title_section','Results');
+if ( count($data) < 1 ):
+  echo $html->div(null, 'Sorry, no search results');
+else:
+  $num = (count($data['News']) + count($data['Entry']));
+  echo $html->div(null, $num.' results found');
+endif;
 
-echo '<div style="padding:4px;margin:4px;">';
+if (count($data['Entry']) > 0 ):
+ echo $html->div(null, 'Edublogs', array('style'=>'margin-top:10px;padding:4px;background-color:#ecebeb;font-size:13pt;'));
+ foreach($data['Entry'] as $e):
+      $tmp  = $html->link($e[0]['title'], '/entries/view/'.$e[0]['id']).'<br />'; 
+      $tmp .= 'Rank:'.$e[0]['rank'] .'<br /> '. $e[0]['ts_headline'];
+       echo $html->div(null, $tmp, array('style'=>'padding:4px;font-size:10pt;'));
+ endforeach;
+endif;
 
-//die(print_r($data));
+if (count($data['News']) > 0 ):
+ echo $html->div(null, __('News', true), array('style'=>'margin-top:10px;padding:4px;background-color:#ecebeb;font-size:13pt;'));
+ foreach($data['News'] as $n):
+      $tmp  = $html->link($n[0]['title'], '/news/view/'.$n[0]['id']).'<br />'; 
+      $tmp .= 'Rank:'.$n[0]['rank'] .'<br /> '. $n[0]['ts_headline'];
+       echo $html->div(null, $tmp, array('style'=>'padding:4px;font-size:10pt;'));
+ endforeach;
+endif;
 
-$Models = array('Entry'=>'entries', 'News'=>'news', 'Podcast'=>'podcasts', 'Faq'=>'faqs', 'Glossary'=>'glossaries', 'Lesson'=>'lessons');
-
-$i = 0;
-
-foreach( $Models as $model => $controller)
-{  
-   if (count($data[$model]) > 1 ) 
-   { 
-     $i++;
-     echo '<div style="padding:4px;background-color:#ecebeb;font-size:14pt;">' . $model . '</div>';
-     echo "<p>" .count($data[$model]) . " results found</p>";
-      
-     foreach ($data[$model] as $val) 
-     {  
-        switch($model)
-        {
-          case 'Entry':
-          echo '<p>';
-           echo $html->link($val[$model]['title'], '/users/entry/' .$val[$model]['id'].'/'.$val[$model]['id']);
-              echo '</p>';
-              break;
-              
-          case 'News':
-              echo '<p><a href="/users/entry/' .$val[$model]['id'].'/'.$val[$model]['id'].'">' . $val[$model]['title'] . '</a></p>';
-              break;
-              
-          case 'Podcast':
-              echo '<p><a href="/users/entry/' .$val[$model]['id'].'/'.$val[$model]['id'].'">' . $val[$model]['title'] . '</a></p>';
-              break;
-              
-          case 'Faq':
-              echo '<p><a href="/users/entry/' .$val[$model]['id'].'/'.$val[$model]['id'].'">' . $val[$model]['question'] . '</a></p>';
-              break;
-              
-          case 'Glossary':
-              echo '<p><a href="/users/entry/' .$val[$model]['id'].'/'.$val[$model]['id'].'">' . $val[$model]['item'] . '</a></p>';
-              break;
-              
-          case 'Lesson':
-              echo '<p><a href="/users/entry/' .$val[$model]['id'].'/'.$val[$model]['id'].'">' . $val[$model]['title'] . '</a></p>';
-              break;
-        }
-     }
-   }
-}
-
-if ( $i == 0):
-   echo "<h3>Sorry, no results found.</h3>";
-endif;
 ?>
-</div>

trunk/app/views/layouts/portal.ctp

@@ -96 +96 @@
 
    // search
-   //$list = array('<h2 class="bg3">'.__('Search', true).'</h2>'.$this->element('search'));
-   // echo $html->nestedList($list);
+   $list = array('<h2 class="bg3">'.__('Search', true).'</h2>'.$this->element('search'));
+   echo $html->nestedList($list);
 
   $tmp  = $html->para(null,$html->link($html->image('static/valid_xhtml10_80x15_22.png'), 'http://www.w3.org/TR/xhtml1/', null, null, false));