db search fix

db/StoredProcedures.sql

@@ -950,12 +950,12 @@ BEGIN
 	FROM `students`
 	INNER JOIN `study_groups` 		ON students.StudyGroupID = study_groups.ID
 	INNER JOIN `specializations`	ON study_groups.SpecializationID = specializations.ID
-	WHERE 	( Grade IS NULL OR study_groups.Grade = Grade) AND
-			( GroupN IS NULL OR study_groups.GroupNum = GroupN) AND
-			( FacultyID IS NULL OR specializations.FacultyID = FacultyID) AND 
-			( Last IS NULL OR ( students.LastName REGEXP CONCAT("^",Last,"*"))) AND 
-			( First IS NULL OR ( students.FirstName REGEXP CONCAT("^",First,"*"))) AND
-			( Second IS NULL OR ( students.SecondName REGEXP CONCAT("^",Second,"*")))
+	WHERE 	( Grade = 0 OR study_groups.Grade = Grade) AND
+			( GroupN = 0  OR study_groups.GroupNum = GroupN) AND
+			( FacultyID = 0 OR specializations.FacultyID = FacultyID) AND 
+			( students.LastName LIKE CONCAT(Last,"%") ) AND 
+			( students.FirstName LIKE CONCAT(First,"%") ) AND
+			( students.SecondName LIKE CONCAT(Second,"%") )
 	ORDER BY study_groups.Grade ASC, study_groups.GroupNum ASC;
 
 
@@ -1341,11 +1341,11 @@ BEGIN
 	FROM `teachers`
 	INNER JOIN `departments` ON departments.ID = teachers.DepartmentID
 	INNER JOIN `job_positions` ON job_positions.ID = teachers.JobPositionID
-	WHERE	( DepartmentID IS NULL OR departments.ID = DepartmentID) AND 
-			( FacultyID IS NULL OR departments.FacultyID = FacultyID) AND 
-			( Last IS NULL OR ( teachers.LastName REGEXP CONCAT("^",Last,"*"))) AND 
-			( First IS NULL OR ( teachers.FirstName REGEXP CONCAT("^",First,"*"))) AND
-			( Second IS NULL OR ( teachers.SecondName REGEXP CONCAT("^",Second,"*")))
+	WHERE	( DepartmentID = 0 OR departments.ID = DepartmentID) AND 
+			( FacultyID = 0 OR departments.FacultyID = FacultyID) AND 
+			( teachers.LastName LIKE CONCAT(Last,"%") ) AND 
+			( teachers.FirstName LIKE CONCAT(First,"%") ) AND
+			( teachers.SecondName LIKE CONCAT(Second,"%") )
 	ORDER BY departments.FacultyID ASC, departments.Name ASC, teachers.LastName ASC, teachers.FirstName ASC, teachers.SecondName ASC;
 
 END //