X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FSphinxSearch%2Fsphinxsearch.php;h=607ac76d2758de203cd5aca3c32fd4a518855c3a;hb=9d42137024027eeded76016d4708439395983870;hp=654b9c9d5beada8e83664c7a3a3138310e50466f;hpb=714d920faea302b55857cc3bec4e9e6160ea136a;p=quix0rs-gnu-social.git

diff --git a/plugins/SphinxSearch/sphinxsearch.php b/plugins/SphinxSearch/sphinxsearch.php
index 654b9c9d5b..607ac76d27 100644
--- a/plugins/SphinxSearch/sphinxsearch.php
+++ b/plugins/SphinxSearch/sphinxsearch.php
@@ -65,6 +65,9 @@ class SphinxSearch extends SearchEngine
     function query($q)
     {
         $result = $this->sphinx->query($q, $this->remote_table());
+        if ($result === false) {
+            throw new ServerException($this->sphinx->getLastError());
+        }
         if (!isset($result['matches'])) return false;
         $id_set = join(', ', array_keys($result['matches']));
         $this->target->whereAdd("id in ($id_set)");
@@ -73,9 +76,39 @@ class SphinxSearch extends SearchEngine
 
     function set_sort_mode($mode)
     {
-        if ('chron' === $mode) {
+        switch ($mode) {
+        case 'chron':
+            $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'created_ts');
+            return $this->target->orderBy('id desc');
+            break;
+        case 'reverse_chron':
+            $this->sphinx->SetSortMode(SPH_SORT_ATTR_ASC, 'created_ts');
+            return $this->target->orderBy('id asc');
+            break;
+        case 'nickname_desc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'nickname');
+                return $this->target->orderBy('id desc');
+            }
+            break;
+        case 'nickname_asc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                $this->sphinx->SetSortMode(SPH_SORT_ATTR_ASC, 'nickname');
+                return $this->target->orderBy('id asc');
+            }
+            break;
+        default:
             $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'created_ts');
             return $this->target->orderBy('id desc');
+            break;
         }
     }
 
@@ -91,6 +124,8 @@ class SphinxSearch extends SearchEngine
         if (preg_match('!^.*?://.*?:.*?@.*?/(.*?)$!', common_config('db', 'database'), $matches)) {
             return $matches[1];
         }
-        throw new ServerException("Sphinx search could not identify database name");
+
+        // TRANS: Server exception thrown when a database name cannot be identified.
+        throw new ServerException(_m("Sphinx search could not identify database name."));
     }
 }