- Remove deprecated SQL_CALC_FOUND_ROWS from search. And remove the "total" from the results, it wasn't used anyways.

- Add some null coalescing to some idx calls.

Author: wdamien

server/actions/patterns/search.php

@@ -69,7 +69,7 @@ public function searchCommunity($query, $startIndex, $limit, $type) {
         }
 
         // Do the actual search.
-        $q = "SELECT SQL_CALC_FOUND_ROWS p.*, urJoin.rating AS userRating, fJoin.patternId as favorite
+        $q = "SELECT p.*, urJoin.rating AS userRating, fJoin.patternId as favorite
         FROM patterns p
         LEFT JOIN userRatings urJoin ON urJoin.patternId = p.id AND urJoin.userId = ?
         LEFT JOIN favorites as fJoin ON fJoin.userId = ? AND fJoin.patternId=p.id
@@ -94,11 +94,7 @@ public function searchCommunity($query, $startIndex, $limit, $type) {
 
         $result = $this->db->execute($q, $searchSqlParams);
 
-        // Returns the total results.
-        $countQuery = (object)$this->db->execute("SELECT FOUND_ROWS() as count", null, true);
-        $total = $countQuery->count;
-
-        $json = createPatternSet($result, $total, $startIndex, $limit);
+        $json = createPatternSet($result);
 
         return $json;
     }

server/utils.php

@@ -109,7 +109,7 @@ function convertFromURL($id) {
 }
 
 function createPatternNode($row) {
-    $tool = idx($row, 'state');
+    $tool = idx($row, 'state') ?? '';
 
     // Replace a few hidden characters with there string counterparts. Otherwise JSON parsing will break.
     $tool = preg_replace(["/\n/", "/\r/", "/\t/"], ["\\\\\\n", "\\\\\\r", "\\\\\\t"], $tool);
@@ -138,36 +138,34 @@ function createPatternNode($row) {
     $result = array(
         'id' => convertToURL(idx($row, 'id')),
         'keywords' => idx($row, 'keywords'),
-        'name' => stripslashes(idx($row, 'name')),
-        'description' => stripslashes(idx($row, 'description')),
-        'dateAdded' => strtotime(stripslashes(idx($row, 'dateAdded')))*1000,
+        'name' => stripslashes(idx($row, 'name') ?? ''),
+        'description' => stripslashes(idx($row, 'description') ?? ''),
+        'dateAdded' => strtotime(stripslashes(idx($row, 'dateAdded') ?? ''))*1000,
         'flavor' => idx($row, 'flavor'),
-        'expression' => stripslashes(idx($row, 'pattern')),
+        'expression' => stripslashes(idx($row, 'pattern') ?? ''),
         'text' => idx($row, 'content'),
         'tool' => $tool,
         'rating' => idx($row, 'rating'),
         'userId' => intval(idx($row, 'owner')),
-        'author' => stripslashes(idx($row, 'author')),
+        'author' => stripslashes(idx($row, 'author') ?? ''),
         'userRating' => idx($row, 'userRating') ?? '0',
         'favorite' => !is_null(idx($row, 'favorite')),
         'access' => idx($row, 'visibility'),
         'mode' => idx($row, 'mode'),
-        'tests' => json_decode(idx($row, 'tests'))
+        'tests' => json_decode(idx($row, 'tests') ?? '')
     );
 
     return $result;
 }
 
-function createPatternSet($result, $total = -1, $startIndex = 0, $limit = 100) {
+function createPatternSet($result, $limit = 100) {
     $results = array();
     for ($i=0;$i<count($result);$i++) {
         $results[] = createPatternNode($result[$i]);
     }
 
     return array(
-        'startIndex' => $startIndex,
         'limit' => $limit,
-        'total' => $total,
         'results' => $results
     );
 }