karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement simple search

Browse Source
This commit is contained in:
Eike Foken
2011-09-15 05:12:40 +02:00
parent 5e539daebd
commit aefc4e0387
7 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/models/experiment.php
View File

@@ -152,14 +152,17 @@ class Experiment extends CI_Model {
/**
* Search for a specific experiment and return a list of possible results.
*
* @param string $needle The needle to look for in the haystack.
* @param string $needle The needle to look for in the haystack
* @param string $projectId
*/
public function search($project, $needle) {
$query = $this->db->where('project_id', $project)
->like('name', $needle)->get('experiments');
$results = $query->result_array();
public function search($needle, $projectId = false) {
if ($projectId) {
$this->db->where('project_id', $projectId);
}
return $results;
$query = $this->db->like('name', $needle)->get('experiments');
return $query->result_array();
}
}

7
application/models/project.php
View File

@@ -155,14 +155,15 @@ class Project extends CI_Model {
/**
* Search for a specific project and return a list of possible results.
*
* @param type $needle The needle to look for in the haystack.
* @param string $needle The needle to look for in the haystack.
*/
public function search($needle) {
// get matching projects that are public
$query = $this->db->query("SELECT * FROM `projects` WHERE `public`='1' AND `name` LIKE ".$this->db->escape('%'.$needle.'%'));
$query = $this->db->where('public', 1)->like('name', $needle)->get('projects');
$public_results = $query->result_array();
// or belong directly to the user
$query = $this->db->where('owner', $this->session->userdata('user_id'));
$query = $this->db->query("SELECT * FROM `projects` WHERE `owner`=".$this->db->escape($this->session->userdata('user_id'))
." AND `name` LIKE ".$this->db->escape('%'.$needle.'%'));
$own_results = $query->result_array();
@@ -177,7 +178,7 @@ class Project extends CI_Model {
$shared_results = $query->result_array();
return $this->_addShortNames(array_merge($own_results, $shared_results));
return $this->_addShortNames(array_merge($public_results, $own_results, $shared_results));
}
/**