search improvement server side, max 200 pictos

sails/src/api/controllers/PictoController.js

@@ -220,10 +220,10 @@ module.exports = {
       var sql = "";
       var params = [];
       if(typeof categories == "object" ){ //Is an array
-        sql="SELECT `picto_exp`.`id`, `picto_exp`.`id_pic`, `picto_exp`.`lang`, `picto_exp`.`text`, `picto`.`id`, `picto`.`uri`, `picto`.`id_src`, `picto`.`id_owner`, `picto`.`id_cat` FROM `picto_exp` INNER JOIN `picto` ON `picto_exp`.`id_pic` = `picto`.`id` WHERE `picto_exp`.`lang`=? AND `picto_exp`.`text` LIKE ? AND (`picto`.`id_owner` IS NULL OR `picto`.`id_owner`=?) AND `picto`.`id_src`=? AND `picto`.`id_cat` IN (?);";
+        sql="SELECT `picto_exp`.`id`, `picto_exp`.`id_pic`, `picto_exp`.`lang`, `picto_exp`.`text`, `picto`.`id`, `picto`.`uri`, `picto`.`id_src`, `picto`.`id_owner`, `picto`.`id_cat` FROM `picto_exp` INNER JOIN `picto` ON `picto_exp`.`id_pic` = `picto`.`id` WHERE `picto_exp`.`lang`=? AND `picto_exp`.`text` LIKE ? AND (`picto`.`id_owner` IS NULL OR `picto`.`id_owner`=?) AND `picto`.`id_src`=? AND `picto`.`id_cat` IN (?) ORDER BY LENGTH(`picto_exp`.`text`) LIMIT 200;";
         params = [req.params.lang,'%'+req.params.text+'%', req.params.sup_id, req.params.source, categories];
       }else{
-        sql= "SELECT `picto_exp`.`id`, `picto_exp`.`id_pic`, `picto_exp`.`lang`, `picto_exp`.`text`, `picto`.`id`, `picto`.`uri`, `picto`.`id_src`, `picto`.`id_owner`, `picto`.`id_cat` FROM `picto_exp` INNER JOIN `picto` ON `picto_exp`.`id_pic` = `picto`.`id` WHERE `picto_exp`.`lang`=? AND `picto_exp`.`text` LIKE ? AND (`picto`.`id_owner` IS NULL OR `picto`.`id_owner`=?) AND `picto`.`id_src`=?;";
+        sql= "SELECT `picto_exp`.`id`, `picto_exp`.`id_pic`, `picto_exp`.`lang`, `picto_exp`.`text`, `picto`.`id`, `picto`.`uri`, `picto`.`id_src`, `picto`.`id_owner`, `picto`.`id_cat` FROM `picto_exp` INNER JOIN `picto` ON `picto_exp`.`id_pic` = `picto`.`id` WHERE `picto_exp`.`lang`=? AND `picto_exp`.`text` LIKE ? AND (`picto`.`id_owner` IS NULL OR `picto`.`id_owner`=?) AND `picto`.`id_src`=? ORDER BY LENGTH(`picto_exp`.`text`) LIMIT 200;";
         params = [req.params.lang,'%'+req.params.text+'%', req.params.sup_id, req.params.source];
       }
 

sails/src/assets/scripts/modules/student/controllers/addpicto.js

@@ -458,17 +458,6 @@ dashboardControllers.controller('AddPictoCtrl', function (
         // Load data into pictos
         $scope.pictos = data;
 
-        // Order by expression length
-        $scope.pictos.sort(function(a, b){
-          var val = 0;
-          if(a.expressions[0].text.length > b.expressions[0].text.length){
-            val = 1;
-          }else if(a.expressions[0].text.length < b.expressions[0].text.length){
-            val = -1;
-          }
-          return val;
-        });
-
         // No data warning
         if(data.length == 0){
           $scope.alert = { type: 'warning', msg: 'warning_no_pictos_found', show: true };