[-- Attachment #1: Type: text/plain, Size: 455 bytes --] Specifying both `maxlevel' and `match' in a columnview dynamic block was broken: the `match' argument is ignored in that case. See the link below for a (not so minimal) ECM. Reported-by: Pablo A Perez-Fernandez Link: https://emacs.stackexchange.com/questions/66658/filter-columnview-dblock-on-properties-or-tags -- Nick "There are only two hard problems in computer science: cache invalidation, naming things, and off-by-one errors." -Martin Fowler [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: [PATCH] Fix match/maxlevel conflict in colview dynblock --] [-- Type: text/x-patch, Size: 1410 bytes --] From 8bcff482e59c24758f87b9b5cdef3bc123dc12f8 Mon Sep 17 00:00:00 2001 From: Nick Dokos <ndokos@gmail.com> Date: Sun, 11 Jul 2021 22:30:22 -0400 Subject: [PATCH] Fix match/maxlevel conflict in colview dynblock * lisp/org-coplview.el (org-columns--capture-view): Combine the match and maxlevel arguments properly to construct the MATCH argument of `org-map-entries'. Specifying both `maxlevel' and `match' in a columnview dynamic block does not work: the `match' argument is ignored in that case. See the link below for a (not so minimal) ECM. Reported-by: Pablo A Perez-Fernandez Link: https://emacs.stackexchange.com/questions/66658/filter-columnview-dblock-on-properties-or-tags --- lisp/org-colview.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 2e1c29a99..7144308ff 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -1398,8 +1398,9 @@ other rows. Each row is a list of fields, as strings, or (org-get-tags)))) (push (cons (org-reduced-level (org-current-level)) (nreverse row)) table))))) - (or (and maxlevel (format "LEVEL<=%d" maxlevel)) - (and match match)) + (if match + (concat match (and maxlevel (format "+LEVEL<=%d" maxlevel))) + (and maxlevel (format "LEVEL<=%d" maxlevel))) (and local 'tree) 'archive 'comment) (org-columns-quit) -- 2.31.1
[-- Attachment #1: Type: text/plain, Size: 2522 bytes --] Hi Nick, Thanks for reporting this issue here, and providing a patch. Unfortunately the “main maintainers” seem to be rather busy as of late, leaving you hanging for quite a while. I’ve had a look at the issue and your patch, and it the issue seems clear, and your patch small and straightforward enough that I feel confident pushing it should be fine :) it’s now on master with a small tweak to the commit message. Thanks for your efforts. > Specifying both `maxlevel’ and `match’ in a columnview dynamic block > was broken: the `match’ argument is ignored in that case. See the link > below for a (not so minimal) ECM. > > Reported-by: Pablo A Perez-Fernandez > Link: <https://emacs.stackexchange.com/questions/66658/filter-columnview-dblock-on-properties-or-tags> > > – > Nick > > “There are only two hard problems in computer science: cache > invalidation, naming things, and off-by-one errors.” -Martin Fowler > > From 8bcff482e59c24758f87b9b5cdef3bc123dc12f8 Mon Sep 17 00:00:00 2001 > From: Nick Dokos <ndokos@gmail.com> > Date: Sun, 11 Jul 2021 22:30:22 -0400 > Subject: [PATCH] Fix match/maxlevel conflict in colview dynblock > > * lisp/org-coplview.el (org-columns–capture-view): Combine the match > and maxlevel arguments properly to construct the MATCH argument of > `org-map-entries’. > > Specifying both `maxlevel’ and `match’ in a columnview dynamic block > does not work: the `match’ argument is ignored in that case. See the > link below for a (not so minimal) ECM. > > Reported-by: Pablo A Perez-Fernandez > Link: <https://emacs.stackexchange.com/questions/66658/filter-columnview-dblock-on-properties-or-tags> > — > lisp/org-colview.el | 5 +++– > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff –git a/lisp/org-colview.el b/lisp/org-colview.el > index 2e1c29a99..7144308ff 100644 > — a/lisp/org-colview.el > +++ b/lisp/org-colview.el > @@ -1398,8 +1398,9 @@ other rows. Each row is a list of fields, as strings, or > (org-get-tags)))) > (push (cons (org-reduced-level (org-current-level)) (nreverse row)) > table))))) > - (or (and maxlevel (format “LEVEL<=%d” maxlevel)) > - (and match match)) > + (if match > + (concat match (and maxlevel (format “+LEVEL<=%d” maxlevel))) > + (and maxlevel (format “LEVEL<=%d” maxlevel))) > (and local ’tree) > ’archive ’comment) > (org-columns-quit) All the best, Timothy
Timothy <tecosaur@gmail.com> writes:
> Hi Nick,
>
> Thanks for reporting this issue here, and providing a patch. Unfortunately the
> “main maintainers” seem to be rather busy as of late, leaving you hanging for
> quite a while. I’ve had a look at the issue and your patch, and it the issue
> seems clear, and your patch small and straightforward enough that I feel
> confident pushing it should be fine :) it’s now on master with a small tweak to
> the commit message.
>
> Thanks for your efforts.
>
Hi Timothy,
Thanks and no worries! And thanks for working through the backlog!
--
Nick
"There are only two hard problems in computer science: cache
invalidation, naming things, and off-by-one errors." -Martin Fowler
Nick Dokos <ndokos@gmail.com> writes: > Specifying both `maxlevel' and `match' in a columnview dynamic block > was broken: the `match' argument is ignored in that case. See the link > below for a (not so minimal) ECM. > > Reported-by: Pablo A Perez-Fernandez > Link: https://emacs.stackexchange.com/questions/66658/filter-columnview-dblock-on-properties-or-tags Thanks for the patch, and sorry for the late reply. Would you also be able to supply a test for testing/lisp/test-org-colview.el? -- Ihor Radchenko // yantar92, Org mode contributor, Learn more about Org mode at <https://orgmode.org/>. Support Org development at <https://liberapay.com/org-mode>, or support my work at <https://liberapay.com/yantar92>