From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ivan Vilata i Balaguer Subject: [PATCH] Allow relative times in clocktable tstart and tend options Date: Thu, 22 Nov 2012 00:07:33 +0100 Message-ID: <20121121230733.GA15586@edgar.selidor.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([208.118.235.92]:47346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbJOa-0002qF-M9 for emacs-orgmode@gnu.org; Wed, 21 Nov 2012 18:07:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbJOZ-0006mL-IZ for emacs-orgmode@gnu.org; Wed, 21 Nov 2012 18:07:52 -0500 Received: from lev.selidor.net ([66.246.138.156]:52358) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbJOZ-0006mB-En for emacs-orgmode@gnu.org; Wed, 21 Nov 2012 18:07:51 -0500 Content-Disposition: inline List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org * lisp/org-clock.el (org-clock-get-table-data): Pass tstart and tend time strings through `org-matcher-time` to allow relative times besides absolute ones, convert result to encoded time. * doc/org.texi (The clock table): Document acceptance of relative times in tstart and tend, link to syntax description. Inspired in the original relative times proposal by Ilya Shlyakhter, this is less invasive and it doesn't modify core functions, thus it avoids the original's infinite recursion when hitting normal dates in other locations. TINYCHANGE --- doc/org.texi | 4 ++++ lisp/org-clock.el | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index bf67876..c88b745 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -6263,7 +6263,11 @@ be selected: thisyear, lastyear, thisyear-@var{N} @r{a relative year} @r{Use @kbd{S-@key{left}/@key{right}} keys to shift the time interval.} :tstart @r{A time string specifying when to start considering times.} + @r{Relative times like @code{"<-2w>"} can also be used. See} + @r{@ref{Matching tags and properties} for relative time syntax.} :tend @r{A time string specifying when to stop considering times.} + @r{Relative times like @code{""} can also be used. See} + @r{@ref{Matching tags and properties} for relative time syntax.} :step @r{@code{week} or @code{day}, to split the table into chunks.} @r{To use this, @code{:block} or @code{:tstart}, @code{:tend} are needed.} :stepskip0 @r{Do not show steps that have zero time.} diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 54e4018..6595330 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2604,9 +2604,9 @@ TIME: The sum of all time spend in this tree, in minutes. This time (setq te (format "%4d-%02d-%02d" (nth 2 te) (car te) (nth 1 te)))) ;; Now the times are strings we can parse. (if ts (setq ts (org-float-time - (apply 'encode-time (org-parse-time-string ts))))) + (seconds-to-time (org-matcher-time ts))))) (if te (setq te (org-float-time - (apply 'encode-time (org-parse-time-string te))))) + (seconds-to-time (org-matcher-time te))))) (save-excursion (org-clock-sum ts te (unless (null matcher) -- 1.7.10.4 -- Ivan Vilata i Balaguer -- https://elvil.net/