fix tree, per-day talk output format, rendering

This commit is contained in:
Anton Dyudin 2015-09-16 15:51:31 -07:00
parent 610cf1b95f
commit cf5a8c79c2
4 changed files with 18 additions and 16 deletions

View File

@ -1791,10 +1791,10 @@
++ log-to-file
|= man=span
^- move
=+ =+ =+ (yore now.hid)
%^ cat 3 man
`@t`(rsh 3 2 (scot %ui :(add d.t (mul 100 m) (mul 10.000 y))))
paf=/(scot %p our.hid)/home/(scot %da now.hid)/talk/[-]/talk-telegrams
=+ ^- paf=path
=+ day=(year %*(. (yore now.hid) +.t +:*tarp))
%+ tope [our.hid %home da/now.hid]
/talk-telegrams/(scot %da day)/[man]/talk
=+ grams:(~(got by stories) man)
[ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])]
::
@ -1810,10 +1810,7 @@
=+ ^= grams
%- (hard (list telegram))
.^ %cx
=+ =+ (yore now.hid)
%^ cat 3 man
`@t`(rsh 3 2 (scot %ui :(add d.t (mul 100 m) (mul 10.000 y))))
/(scot %p our.hid)/home/(scot %da now.hid)/talk/[-]/talk-telegrams
/(scot %p our.hid)/home/(scot %da now.hid)/talk/[man]/talk-telegrams
==
=+ toy=(~(got by stories) man)
[~ +>.$(stories (~(put by stories) man toy(grams grams, count (lent grams))))]

View File

@ -1495,17 +1495,17 @@
|= [cof=cafe bax=vase doe=term hon=horn]
^- (bolt vase)
%+ cope (lash cof how (flux (slat doe)))
|= [cof=cafe yep=(map ,@ span)]
=+ ^= poy ^- (list (pair ,@ span))
|= [cof=cafe yep=(map span ,@)]
=+ ^= poy ^- (list (pair span ,@))
%+ sort (~(tap by yep) ~)
|=([a=[@ *] b=[@ *]] (lth -.a -.b))
|=([[* a=@] [* b=@]] (lth a b))
%+ cope
|- ^- (bolt (list (pair ,@ vase)))
?~ poy (flue cof)
%+ cope $(poy t.poy)
|= [cof=cafe nex=(list (pair ,@ vase))]
%+ cope (chap(s.how [q.i.poy s.how]) cof bax hon)
(flux |=(elt=vase [[p.i.poy elt] nex]))
%+ cope (chap(s.how [p.i.poy s.how]) cof bax hon)
(flux |=(elt=vase [[q.i.poy elt] nex]))
%- flux
|= yal=(list (pair ,@ vase)) ^- vase
?~ yal [[%cube 0 [%atom %n]] 0]

View File

@ -12,10 +12,10 @@
:- %tang %- flop
|- ^- tang
=+ ark=;;(arch .^(cy/pax))
=- ?~ q.ark -
=- ?~ fil.ark -
[(rend pax) -]
%- zing
%+ turn
(sort (~(tap by r.ark)) aor)
(sort (~(tap by dir.ark)) aor)
|= [a=@t ~]
^$(pax (welp pax /[a]))

View File

@ -3,7 +3,12 @@
:::: /hook/hymn/talklog/pub
::
/? 310
/= mez /: /===/talk /% /; pojo /json/
/= mez
/: /===/talk
/% 2
/; pojo
/; |=(a=(list ,[@ p=json]) =.(a (flop a) ?~(a [%a ~] p.i.a)))
/& /json/
|%
++ cdnj |=(a=tape ;script(src "//cdnjs.cloudflare.com/ajax/libs/{a}");)
--