emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[O] [PATCH] Allow relative times in clocktable tstart and tend options


From: Ivan Vilata i Balaguer
Subject: [O] [PATCH] Allow relative times in clocktable tstart and tend options
Date: Thu, 22 Nov 2012 00:07:33 +0100
User-agent: Mutt/1.5.21 (2010-09-15)

* 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, address@hidden     @r{a relative year}
              @r{Use @address@hidden/@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}
+             @address@hidden tags and properties} for relative time syntax.}
 :tend        @r{A time string specifying when to stop considering times.}
+             @r{Relative times like @code{"<now>"} can also be used.  See}
+             @address@hidden tags and properties} for relative time syntax.}
 :step        @address@hidden 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/



reply via email to

[Prev in Thread] Current Thread [Next in Thread]