From 03c84de2b0a76e00dbd67cd59a1862f2b1fb19c8 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 2 May 2014 13:03:14 +0200
Subject: [PATCH 1/3] numeric sorting of table values and start of allowing
 more sorting criteria see #78 and #108

---
 helper.php       | 10 ++---
 syntax/table.php | 99 ++++++++++++++++++++++++++++++++----------------
 2 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/helper.php b/helper.php
index 43939ad..8b89635 100644
--- a/helper.php
+++ b/helper.php
@@ -200,7 +200,7 @@ function _formatData($column, $value, &$R){
                 case 'pageid':
                     list($id,$title) = explode('|',$val,2);
                     $id = $this->_addPrePostFixes($column['type'], $id);
-                $outs[] = $R->internallink($id,$title,null,true);
+                    $outs[] = $R->internallink($id,$title,null,true);
                     break;
                 case 'nspage':
                     // no prefix/postfix here
@@ -271,16 +271,16 @@ function _formatData($column, $value, &$R){
      * @returns array with key, type, ismulti, title, opt
      */
     function _column($col){
-        preg_match('/^([^_]*)(?:_(.*))?((?<!s)|s)$/', $col, $matches);
+        preg_match('/^([^_]*)(\(num\))?(?:_(.*))?((?<!s)|s)$/', $col, $matches);
         $column = array(
             'colname' => $col,
-            'multi'   => ($matches[3] === 's'),
+            'multi'   => ($matches[4] === 's'),
             'key'     => utf8_strtolower($matches[1]),
             'origkey' => $matches[1], //similar to key, but stores upper case
             'title'   => $matches[1],
-            'type'    => utf8_strtolower($matches[2])
+            'type'    => utf8_strtolower($matches[3]),
+            'datatype'=> $matches[2] == '(num)' ? 'numeric' : ''
         );
-
         // fix title for special columns
         static $specials = array('%title%'   => array('page', 'title'),
                                  '%pageid%'  => array('title', 'page'),
diff --git a/syntax/table.php b/syntax/table.php
index 9bb1f80..2ebe1c6 100644
--- a/syntax/table.php
+++ b/syntax/table.php
@@ -158,13 +158,11 @@ function handle($match, $state, $pos, Doku_Handler &$handler){
                     break;
                 case 'order':
                 case 'sort':
-                        $column = $this->dthlp->_column($line[1]);
-                        $sort = $column['key'];
-                        if(substr($sort,0,1) == '^'){
-                            $data['sort'] = array(substr($sort,1),'DESC');
-                        }else{
-                            $data['sort'] = array($sort,'ASC');
-                        }
+                    $cols = explode(',', $line[1]);
+                    foreach($cols as $col) {
+                        $param = $this->parseSortParam($col);
+                        $data['sort'][$param[0]] = $param;
+                    }
                     break;
                 case 'where':
                 case 'filter':
@@ -389,14 +387,16 @@ function preList($clist, $data) {
             $text .= '<th'.$width.'>';
 
             // add sort arrow
-            if(isset($data['sort']) && $ckey == $data['sort'][0]){
-                if($data['sort'][1] == 'ASC'){
+            if(isset($data['sort']) && isset($data['sort'][$ckey])) {
+                $sortterm = $data['sort'][$ckey];
+                if($sortterm[1] == 'ASC'){
                     $text .= '<span>&darr;</span> ';
                     $ckey = '^'.$ckey;
                 }else{
                     $text .= '<span>&uarr;</span> ';
                 }
-            }
+                if($sortterm[2] == 'numeric') $ckey = $ckey . '(num)';
+            };
 
             // Clickable header for dynamic sorting
             $text .= '<a href="'.wl($ID,array('datasrt' => $ckey)+$cur_params).
@@ -578,26 +578,34 @@ function _buildSQL(&$data){
 
         // prepare sorting
         if(isset($data['sort'])){
-            $col = $data['sort'][0];
-
-            if($col == '%pageid%'){
-                $order = 'ORDER BY pages.page '.$data['sort'][1];
-            }elseif($col == '%class%'){
-                $order = 'ORDER BY pages.class '.$data['sort'][1];
-            }elseif($col == '%title%'){
-                $order = 'ORDER BY pages.title '.$data['sort'][1];
-            }elseif($col == '%lastmod%'){
-                $order = 'ORDER BY pages.lastmod '.$data['sort'][1];
-            }else{
-                // sort by hidden column?
-                if(!$tables[$col]){
-                    $tables[$col] = 'T'.(++$cnt);
-                    $from  .= ' LEFT JOIN data AS '.$tables[$col].' ON '.$tables[$col].'.pid = W1.pid';
-                    $from  .= ' AND '.$tables[$col].".key = " . $sqlite->quote_string($col);
-                }
+            $orderingterms = array();
+            foreach($data['sort'] AS $term) {
+                @list($col, $direction, $type) = $term;
+
+                if($col == '%pageid%'){
+                    $sortcolumn = 'pages.page';
+                }elseif($col == '%class%'){
+                    $sortcolumn = 'pages.class';
+                }elseif($col == '%title%'){
+                    $sortcolumn = 'pages.title';
+                }elseif($col == '%lastmod%'){
+                    $sortcolumn = 'pages.lastmod';
+                }else{
+                    // sort by hidden column?
+                    if(!$tables[$col]){
+                        $tables[$col] = 'T'.(++$cnt);
+                        $from  .= ' LEFT JOIN data AS '.$tables[$col].' ON '.$tables[$col].'.pid = W1.pid';
+                        $from  .= ' AND '.$tables[$col].".key = " . $sqlite->quote_string($col);
+                    }
 
-                $order = 'ORDER BY '.$tables[$col].'.value '.$data['sort'][1];
+                    $sortcolumn = $tables[$col].'.value ';
+                }
+                if($type == 'numeric') {
+                    $sortcolumn = 'CAST(' . $sortcolumn . ' AS NUMERIC)';
+                }
+                $orderingterms[] = $sortcolumn . ' ' . $direction;
             }
+            $order = 'ORDER BY ' . implode(', ', $orderingterms);
         }else{
             $order = 'ORDER BY 1 ASC';
         }
@@ -668,12 +676,13 @@ function _buildSQL(&$data){
      */
     function updateSQLwithQuery(&$data) {
         if($this->hasRequestFilter()){
-            if (isset($_REQUEST['datasrt'])) {
-                if($_REQUEST['datasrt']{0} == '^'){
-                    $data['sort'] = array(substr($_REQUEST['datasrt'],1),'DESC');
-                }else{
-                    $data['sort'] = array($_REQUEST['datasrt'],'ASC');
+            if(isset($_REQUEST['datasrt'])) {
+                @list($sort, $direction, $type) = $this->parseSortParam($_REQUEST['datasrt']);
+                //use stored numeric properties
+                if(isset($data['sort']) && isset($data['sort'][$sort]) && $data['sort'][$sort][2] == 'numeric') {
+                    $type = 'numeric';
                 }
+                $data['sort'] = array($sort => array($sort, $direction, $type));
             }
 
             // add request filters
@@ -696,5 +705,29 @@ function updateSQLwithQuery(&$data) {
     function hasRequestFilter() {
         return isset($_REQUEST['datasrt']) || isset($_REQUEST['dataflt']);
     }
+
+    /**
+     * Parse a sort option like: [^]column[(num)]
+     *
+     * @param string $col column to sort
+     * @return array(string $sort, string $direction, string $type)
+     */
+    private function parseSortParam($col) {
+        $column = $this->dthlp->_column($col);
+        $sort = $column['key'];
+        $type = '';
+        $direction = 'ASC';
+
+        $pos = strpos($sort, '(num)');
+        if($pos !== false) {
+            $sort = str_replace('(num)', '', $sort);
+            $type = 'numeric';
+        }
+        if(substr($sort, 0, 1) == '^') {
+            $sort = substr($sort, 1);
+            $direction = 'DESC';
+        }
+        return array($sort, $direction, $type);
+    }
 }
 

From ff7cd6734844c1464a213383f705707fc3b41206 Mon Sep 17 00:00:00 2001
From: Jan Vlnas <git@jan.vlnas.cz>
Date: Sat, 22 Oct 2016 19:03:38 +0200
Subject: [PATCH 2/3] Fix tests

---
 _test/helper.test.php                   |  5 +++--
 _test/syntax_plugin_data_entry.test.php |  5 +++--
 _test/syntax_plugin_data_table.test.php | 24 ++++++++++++++----------
 syntax/table.php                        |  2 +-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/_test/helper.test.php b/_test/helper.test.php
index c85c59e..ad218fc 100644
--- a/_test/helper.test.php
+++ b/_test/helper.test.php
@@ -202,14 +202,15 @@ function testReplacePlaceholdersInSQL() {
         $this->assertEquals('en', $data['sql']);
     }
 
-    protected function createColumnEntry($name, $multi, $key, $origkey, $title, $type) {
+    protected function createColumnEntry($name, $multi, $key, $origkey, $title, $type, $datatype = '') {
         return array(
             'colname' => $name,
             'multi' => $multi,
             'key' => $key,
             'origkey' => $origkey,
             'title' => $title,
-            'type' => $type
+            'type' => $type,
+            'datatype' => $datatype
         );
     }
 
diff --git a/_test/syntax_plugin_data_entry.test.php b/_test/syntax_plugin_data_entry.test.php
index 0b70ef2..51246b6 100644
--- a/_test/syntax_plugin_data_entry.test.php
+++ b/_test/syntax_plugin_data_entry.test.php
@@ -318,14 +318,15 @@ function testHandleEmpty() {
         $this->assertEquals($cols, $result['cols'], 'Cols array corrupted');
     }
 
-    protected function createColumnEntry($name, $multi, $key, $origkey, $title, $type) {
+    protected function createColumnEntry($name, $multi, $key, $origkey, $title, $type, $datatype = '') {
         return array(
             'colname' => $name,
             'multi' => $multi,
             'key' => $key,
             'origkey' => $origkey,
             'title' => $title,
-            'type' => $type
+            'type' => $type,
+            'datatype' => $datatype
         );
     }
 
diff --git a/_test/syntax_plugin_data_table.test.php b/_test/syntax_plugin_data_table.test.php
index 85b55c0..63827b9 100644
--- a/_test/syntax_plugin_data_table.test.php
+++ b/_test/syntax_plugin_data_table.test.php
@@ -36,10 +36,10 @@ function testHandle() {
         $data = array(
             'classes' => 'employees',
             'limit' => 10,
-            'dynfilters' => 1,
-            'summarize' => 1,
-            'rownumbers' => 1,
-            'sepbyheaders' => '',
+            'dynfilters' => true,
+            'summarize' => true,
+            'rownumbers' => true,
+            'sepbyheaders' => false,
             'headers' => array(
                 '0' => 'Details',
                 '1' => 'Assigned Employees #no',
@@ -71,6 +71,7 @@ function testHandle() {
                     'origkey' => '%pageid%',
                     'title' => 'Title',
                     'type' => 'page',
+                    'datatype' => ''
                 ),
                 'employee' => array(
                     'colname' => 'employees',
@@ -78,7 +79,8 @@ function testHandle() {
                     'key' => 'employee',
                     'origkey' => 'employee',
                     'title' => 'employee',
-                    'type' => ''
+                    'type' => '',
+                    'datatype' => ''
                 ),
                 'deadline' => array(
                     'colname' => 'deadline_dt',
@@ -86,7 +88,8 @@ function testHandle() {
                     'key' => 'deadline',
                     'origkey' => 'deadline',
                     'title' => 'deadline',
-                    'type' => 'dt'
+                    'type' => 'dt',
+                    'datatype' => ''
                 ),
                 'website' => array(
                     'colname' => 'website_url',
@@ -94,7 +97,8 @@ function testHandle() {
                     'key' => 'website',
                     'origkey' => 'website',
                     'title' => 'website',
-                    'type' => 'url'
+                    'type' => 'url',
+                    'datatype' => ''
                 ),
                 'volume' => array(
                     'colname' => 'volume',
@@ -102,13 +106,13 @@ function testHandle() {
                     'key' => 'volume',
                     'origkey' => 'volume',
                     'title' => 'volume',
-                    'type' => ''
+                    'type' => '',
+                    'datatype' => ''
                 ),
 
             ),
             'sort' => array(
-                '0' => 'volume',
-                '1' => 'DESC'
+                'volume' => array('volume', 'DESC', '')
             ),
             'align' => array(
                 '0' => 'center'
diff --git a/syntax/table.php b/syntax/table.php
index f408802..9ae9b04 100644
--- a/syntax/table.php
+++ b/syntax/table.php
@@ -632,7 +632,7 @@ function _buildSQL(&$data) {
                         $from .= ' AND ' . $tables[$col] . ".key = " . $sqlite->quote_string($col);
                     }
 
-                    $sortcolumn = $tables[$col] . '.value ';
+                    $sortcolumn = $tables[$col] . '.value';
                 }
                 if($type == 'numeric') {
                     $sortcolumn = 'CAST(' . $sortcolumn . ' AS NUMERIC)';

From e9f63d2aa4944b8928d21aeb4e909a5aed5b0406 Mon Sep 17 00:00:00 2001
From: Jan Vlnas <git@jan.vlnas.cz>
Date: Sat, 22 Oct 2016 19:07:57 +0200
Subject: [PATCH 3/3] Add tests for numeric multicolumn sort

---
 _test/syntax_plugin_data_table.test.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/_test/syntax_plugin_data_table.test.php b/_test/syntax_plugin_data_table.test.php
index 63827b9..2320a6d 100644
--- a/_test/syntax_plugin_data_table.test.php
+++ b/_test/syntax_plugin_data_table.test.php
@@ -18,7 +18,7 @@ function __construct() {
             . 'headers : Details, "Assigned Employees \#no", stuff outside quotes """Deadline, ",  Personal website, $$$'."\n"
             . "max     : 10\n"
             . "filter  : type=web development\n"
-            . "sort    : ^volume\n"
+            . "sort    : ^(num)volume,%pageid%\n"
             . "dynfilters: 1\n"
             . "summarize : 1\n"
             . "align   : c\n"
@@ -112,7 +112,8 @@ function testHandle() {
 
             ),
             'sort' => array(
-                'volume' => array('volume', 'DESC', '')
+                'volume' => array('volume', 'DESC', 'numeric'),
+                '%pageid%' => array('%pageid%', 'ASC', '')
             ),
             'align' => array(
                 '0' => 'center'
@@ -130,7 +131,7 @@ function testHandle() {
                  LEFT JOIN data AS T1 ON T1.pid = W1.pid AND T1.key = 'employee' LEFT JOIN data AS T2 ON T2.pid = W1.pid AND T2.key = 'deadline' LEFT JOIN data AS T3 ON T3.pid = W1.pid AND T3.key = 'website' LEFT JOIN data AS T4 ON T4.pid = W1.pid AND T4.key = 'volume'
                 LEFT JOIN pages ON W1.pid=pages.pid
                 GROUP BY W1.pid
-                ORDER BY T4.value DESC LIMIT 11",
+                ORDER BY CAST(T4.value AS NUMERIC) DESC, pages.page ASC LIMIT 11",
             'cur_param' => array()
 
 );