Merge branch 'latest-flag'

Author: annda

meta/Search.php

@@ -59,6 +59,9 @@ class Search
     /** @var  array the revisions of the result rows */
     protected $result_revs = [];
 
+    /** @var bool Include latest = 1 in select query */
+    protected $selectLatest = true;
+
     /**
      * Search constructor.
      */
@@ -311,6 +314,16 @@ public function setLimit($limit)
         }
     }
 
+    /**
+     * Allows disabling default 'latest = 1' clause in select statement
+     *
+     * @param bool $selectLatest
+     */
+    public function setSelectLatest($selectLatest): void
+    {
+        $this->selectLatest = $selectLatest;
+    }
+
     /**
      * Return the number of results (regardless of limit and offset settings)
      *
@@ -475,8 +488,8 @@ public function getSQL()
 
                 $first_table = $datatable;
             }
-            // phpcs:ignore
-            $QB->filters()->whereAnd("( (IS_PUBLISHER($datatable.pid) AND $datatable.latest = 1) OR (IS_PUBLISHER($datatable.pid) !=1 AND $datatable.published = 1) )");
+
+            $QB->filters()->whereAnd($this->getSpecialFlagsClause($datatable));
         }
 
         // columns to select, handling multis
@@ -700,4 +713,19 @@ protected function isEmptyValue(Value $value)
         if ($value->getColumn()->getTid() == 0) return true;
         return false;
     }
+
+    /**
+     * @param string $datatable
+     * @return string
+     */
+    protected function getSpecialFlagsClause($datatable)
+    {
+        $latestClause = "IS_PUBLISHER($datatable.pid)";
+        if ($this->selectLatest) {
+            $latestClause .= " AND $datatable.latest = 1";
+        }
+        $publishedClause = "IS_PUBLISHER($datatable.pid) !=1 AND $datatable.published = 1";
+
+        return "( ($latestClause) OR ($publishedClause) )";
+    }
 }