issue #0000106 : Use the new table and enhance search method

application/controllers/RechercheController.php

@@ -786,21 +786,41 @@ class RechercheController extends Zend_Controller_Action
     public function nafAction()
     {
     	$this->_helper->layout()->disableLayout();
-		$this->_helper->viewRenderer->setNoRender(true);
 
-		$q = strtolower($this->getRequest()->getParam('q', ''));
+		$q = strtolower($this->getRequest()->getParam('q', null));
-		$naf = new Application_Model_Naf5();
-		$rowset = $naf->select('codNaf5, libNaf5')
-			->where("codNaf5 LIKE '%$q%' OR libNaf5 LIKE '%$q%'")
-			->order('poids DESC');
-		$rows = $naf->fetchAll($rowset);
 		$output = array();
+
+		if ( null !== $q ) {
+		    $naf = new Application_Model_Naf5();
+		    $sql = $naf->select('codNaf5, libNaf5');
+		    if ( is_numeric(substr($q,0,4)) ) {
+		        $sql->where("codNaf5 LIKE '%".$q."%'");
+		    } else {
+    		    $queries = explode(' ', $q);
+    		    if (count($queries)>0) {
+    		        $where = '';
+    		        $i = 0;
+    		        foreach ($queries as $item) {
+    		            $i++;
+    		            if (empty($where)) {
+    		                $op = 'LIKE ';
+    		            } elseif ($i < count($queries)) {
+    		                $op = ' OR ';
+    		            }
+    		            if (strlen($item)>2) {
+    		                $where.= $op.'"%'.strtolower($item).'%"';
+    		            }
+    		        }
+    		        $sql->where("LOWER(libNaf5) ".$where);
+    		    }
+		    }
+
+    		$rows = $naf->fetchAll($sql);
     		if ( count($rows)>0 ) {
     			$separator = " , ";
     			foreach ($rows as $item) {
     				if (strpos(strtolower($item->codNaf5), $q) !== false ||
-					strpos(strtolower($item->libNaf5), $q) !== false )
+    					strpos(strtolower($item->libNaf5), $q) !== false ) {
-				{
     					$output[] = array(
     		    			'label' => $item->codNaf5 . $separator . $item->libNaf5,
     		    			'value' => $item->codNaf5,
@@ -808,7 +828,9 @@ class RechercheController extends Zend_Controller_Action
     				}
     			}
         	}
-		echo json_encode($output);
+		}
+
+		$this->view->assign('output', $output);
     }
 
     public function refclientAction()

application/models/Naf5.php

@@ -1,6 +1,6 @@
 <?php
 class Application_Model_Naf5 extends Zend_Db_Table_Abstract
 {
-	protected $_name = 'tabnaf5';
+	protected $_name = 'tabnaf5tmp';
 }
 

application/views/default/scripts/recherche/naf.phtml

@@ -0,0 +1 @@
+<?=json_encode($this->output)?>