search functionality: custom search

ezraezraezra · Mar 4, 2012 · 578d9d9 · 578d9d9
1 parent 739ac80
commit 578d9d9
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 15 deletions.
diff --git a/js/event_listener.js b/js/event_listener.js
@@ -5,7 +5,7 @@
 var LISTENER = function() {
 	var DEBUG = true;
 	var teach_view = 'layout_tester.php?d=teach';
-	var learn_view = 'layout_tester.php?d=learn&q=all';
+	var learn_view = 'layout_tester.php?d=learn';
 
 	var $button = '';
 	var $modal = '';
@@ -95,17 +95,33 @@ var LISTENER = function() {
 				break;
 			case 'Create':
 				_createWorkshop();
-				break;		
+				break;	
 		}
 	}
 
+	function _formListener(e, $object) {
+		e.preventDefault();
+		switch($object.attr("id")) {
+			case 'container_content_header_learn_search_form':
+				window.location = learn_view + "&q=" + $object.children("[type=text]").val();
+				break;
+			default:
+				console.log($object);
+				break;
+		}
+
+	}
+
 	function init() {
 		$button = $('.button');
 		$modal = $('.modal_container');
 		$modal_backdrop = $('.modal_backdrop');
+		$form = $('form');
 
 		$button.on("click", function() { _buttonListener($(this)); });
 		$modal_backdrop.on("click", function() { _hideModal(); });
+		//$("form").submit(function(e) { e.preventDefault(); });
+		$form.on("submit", function(e) { _formListener(e,$(this)); });
 	}
 
 	$(document).ready(function() {

diff --git a/php/result.php b/php/result.php
@@ -4,16 +4,30 @@
 	$server = new Server();
 	$server->startApp();
 
-	$query = $_GET['q'];
-	switch($query) {
-		case 'blah':
-			break;
-		default:
-			// Display all results FOR TESTING ONLY
-			$results = $server->getWorkshop();
-			displayPage($results);
-			break;
+	// Learn-View Search Results
+	if(!strcasecmp($_GET['d'], 'learn')) {
+		if(!strcasecmp($_GET['q'], '') OR !strcasecmp($_GET['q'], 'all')) {
+			$results = $server->getWorkshop('learn','all');
+		}
+		else {
+			$results = $server->getWorkshop('learn',$_GET['q']);
+		}
 	}
+	// Teacher-View Search Results
+	else if (!strcasecmp($_GET['d'], 'teach')) {
+		echo 'Teacher-View Search Results<br/>';
+	}
+
+	// $query = $_GET['q'];
+	// switch($query) {
+		// case 'blah':
+			// break;
+		// default:
+			// // Display all results FOR TESTING ONLY
+			// $results = $server->getWorkshop('learn','all');
+			displayPage($results);
+			// break;
+	// }
 
 	$server->closeApp();
 

diff --git a/php/scheduler.php b/php/scheduler.php
@@ -17,7 +17,8 @@
 
 			if($display == 'learn') {
 				$group_name = 'Search results for: ';
-				$group_name_sub = 'Security JS';
+				//$group_name_sub = 'Security JS';
+				$group_name_sub = $_GET['q'];
 				include('scheduler_group.php');
 			}
 			else {

diff --git a/php/server.php b/php/server.php
@@ -95,9 +95,29 @@ function getWorkshops($query,$type) {
 			}
 		}
 
-		function getWorkshop() {
-			#SELECT ALL WORKSHOPS W/INSTRUCTOR INFO
-			$request = "SELECT w.id AS workshop_id, w.date, w.title, w.description, w.title, w.tags, i.id AS instructor_id, i.name, i.fb_id, i.rating_good, i.rating_bad FROM workshop AS w, instructor AS i, workshop_X_instructor AS wXi WHERE w.id = wXi.workshop_id AND i.id = wXi.instructor_id ORDER BY date DESC, title ASC;";
+		function getWorkshop($view, $query) {
+			// Learn-View	
+			if(!strcasecmp($view, 'learn')) {
+				// All Results
+				if(!strcasecmp($query, 'all')) {
+					#SELECT ALL WORKSHOPS W/INSTRUCTOR INFO
+					$request_query = '';
+				}
+				else {
+					$request_query = " AND w.description LIKE '%".$query."%' OR w.title LIKE '%".$query."%' OR w.tags LIKE '%".$query."%' OR i.name LIKE '%".$query."%'";
+				}
+
+				// Custom Search
+			}
+			// Teach-View
+			else {
+
+			}
+
+
+
+
+			$request = "SELECT DISTINCT w.id AS workshop_id, w.date, w.title, w.description, w.tags, i.id AS instructor_id, i.name, i.fb_id, i.rating_good, i.rating_bad FROM workshop AS w, instructor AS i, workshop_X_instructor AS wXi WHERE w.id = wXi.workshop_id AND i.id = wXi.instructor_id".$request_query." ORDER BY date DESC, title ASC;";
 			$request = $this->submit_info($request, $this->connection, true);
 
 			while(($rows[] = mysql_fetch_assoc($request)) || array_pop($rows));