Merge pull request #2356 from splitbrain/simpleQueryPagenames

improve search as a primary means to create new pages
dokuwiki · Apr 27, 2018 · 5e383ee · 5e383ee
2 parents 0d5c154 + 42690e4
commit 5e383ee
Show file tree

Hide file tree

Showing 2 changed files with 139 additions and 2 deletions.
diff --git a/_test/tests/inc/Ui/Search_createPagenameFromQuery.test.php b/_test/tests/inc/Ui/Search_createPagenameFromQuery.test.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * Class Search_createPagenameFromQuery
+ *
+ */
+class Search_createPagenameFromQuery extends DokuWikiTest
+{
+
+    /**
+     * @return array
+     */
+    function dataProvider()
+    {
+        return [
+            [
+                [
+                    'query' => 'foo',
+                    'parsed_str' => '(W+:foo)',
+                    'parsed_ary' => [0 => 'W+:foo',],
+                    'words' => [0 => 'foo',],
+                    'highlight' => [0 => 'foo',],
+                    'and' => [0 => 'foo',],
+                    'phrases' => [],
+                    'ns' => [],
+                    'notns' => [],
+                    'not' => [],
+                ],
+                ':foo',
+                'simple single search word',
+            ],
+            [
+                [
+                    'query' => 'foo @wiki',
+                    'parsed_str' => '(W+:foo)AND(N+:wiki)',
+                    'parsed_ary' => [0 => 'W+:foo', 1 => 'N+:wiki', 2 => 'AND',],
+                    'words' => [0 => 'foo',],
+                    'highlight' => [0 => 'foo',],
+                    'and' => [0 => 'foo',],
+                    'ns' => [0 => 'wiki',],
+                    'phrases' => [],
+                    'notns' => [],
+                    'not' => [],
+                ],
+                ':wiki:foo',
+                'simple word limited to a namespace',
+            ],
+            [
+                [
+                    'query' => 'foo ^wiki',
+                    'parsed_str' => '(W+:foo)ANDNOT(N-:wiki)',
+                    'parsed_ary' => [0 => 'W+:foo', 1 => 'N-:wiki', 2 => 'NOT', 3 => 'AND',],
+                    'words' => [0 => 'foo',],
+                    'highlight' => [0 => 'foo',],
+                    'and' => [0 => 'foo',],
+                    'notns' => [0 => 'wiki',],
+                    'phrases' => [],
+                    'ns' => [],
+                    'not' => [],
+                ],
+                ':foo',
+                'simple word and excluding a namespace',
+            ],
+            [
+                [
+                    'query' => 'foo -bar',
+                    'parsed_str' => '(W+:foo)ANDNOT((W-:bar))',
+                    'parsed_ary' => [0 => 'W+:foo', 1 => 'W-:bar', 2 => 'NOT', 3 => 'AND',],
+                    'words' => [0 => 'foo', 1 => 'bar',],
+                    'highlight' => [0 => 'foo',],
+                    'and' => [0 => 'foo',],
+                    'not' => [0 => 'bar',],
+                    'phrases' => [],
+                    'ns' => [],
+                    'notns' => [],
+                ],
+                ':foo',
+                'one word but not the other',
+            ],
+            [
+                [
+                    'query' => 'wiki:foo',
+                    'parsed_str' => '((W+:wiki)AND(W+:foo))',
+                    'parsed_ary' => [0 => 'W+:wiki', 1 => 'W+:foo', 2 => 'AND',],
+                    'words' => [0 => 'wiki', 1 => 'foo',],
+                    'highlight' => [0 => 'wiki', 1 => 'foo',],
+                    'and' => [0 => 'wiki', 1 => 'foo',],
+                    'phrases' => [],
+                    'ns' => [],
+                    'notns' => [],
+                    'not' => [],
+                ],
+                ':wiki:foo',
+                'pageid with colons should result in that pageid',
+            ],
+            [
+                [
+                    'query' => '"wiki:foo"',
+                    'parsed_str' => '((W_:wiki)AND(W_:foo)AND(P+:wiki:foo))',
+                    'parsed_ary' => [0 => 'W_:wiki', 1 => 'W_:foo', 2 => 'AND', 3 => 'P+:wiki:foo', 4 => 'AND',],
+                    'words' => [0 => 'wiki', 1 => 'foo',],
+                    'phrases' => [0 => 'wiki:foo',],
+                    'highlight' => [0 => 'wiki:foo',],
+                    'ns' => [],
+                    'notns' => [],
+                    'and' => [],
+                    'not' => [],
+                ],
+                ':wiki:foo',
+                'pageid with colons and wrapped in double quotes should result in that pageid as well',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $inputParsedQuery
+     * @param $expectedPageName
+     * @param $msg
+     */
+    function test_simpleshort($inputParsedQuery, $expectedPageName, $msg)
+    {
+        $search = new \dokuwiki\Ui\Search([], [], []);
+
+        $actualPageName = $search->createPagenameFromQuery($inputParsedQuery);
+
+        $this->assertEquals($expectedPageName, $actualPageName, $msg);
+    }
+
+}
+
+
diff --git a/inc/Ui/Search.php b/inc/Ui/Search.php
@@ -496,11 +496,15 @@ protected function getSearchIntroHTML($query)
      *
      * @return string pagename constructed from the parsed query
      */
-    protected function createPagenameFromQuery($parsedQuery)
+    public function createPagenameFromQuery($parsedQuery)
     {
+        $cleanedQuery = cleanID($parsedQuery['query']);
+        if ($cleanedQuery === $parsedQuery['query']) {
+            return ':' . $cleanedQuery;
+        }
         $pagename = '';
         if (!empty($parsedQuery['ns'])) {
-            $pagename .= cleanID($parsedQuery['ns'][0]);
+            $pagename .= ':' . cleanID($parsedQuery['ns'][0]);
         }
         $pagename .= ':' . cleanID(implode(' ' , $parsedQuery['highlight']));
         return $pagename;