view-text.el 46.1 KB
Newer Older
1
;;;;; -*-coding: raw-text;-*-
Linus Tolke Y's avatar
Linus Tolke Y committed
2
3
;;;;;
;;;;; $Id$
4
;;;;; Copyright (C) 1991, 1996  Lysator Academic Computer Association.
Linus Tolke Y's avatar
Linus Tolke Y committed
5
6
7
8
9
;;;;;
;;;;; This file is part of the LysKOM server.
;;;;; 
;;;;; LysKOM is free software; you can redistribute it and/or modify it
;;;;; under the terms of the GNU General Public License as published by 
10
;;;;; the Free Software Foundation; either version 2, or (at your option) 
Linus Tolke Y's avatar
Linus Tolke Y committed
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
;;;;; any later version.
;;;;; 
;;;;; LysKOM is distributed in the hope that it will be useful, but WITHOUT
;;;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;;;;; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
;;;;; for more details.
;;;;; 
;;;;; You should have received a copy of the GNU General Public License
;;;;; along with LysKOM; see the file COPYING.  If not, write to
;;;;; Lysator, c/o ISY, Linkoping University, S-581 83 Linkoping, SWEDEN,
;;;;; or the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, 
;;;;; MA 02139, USA.
;;;;;
;;;;; Please mail bug reports to bug-lyskom@lysator.liu.se. 
;;;;;
Per Cederqvist's avatar
.    
Per Cederqvist committed
26
27
28
29
30
31
32
33
34
35
;;; ================================================================
;;; ================================================================
;;;
;;; File: view-text.el
;;; 
;;; This file contains functions that have to do with putting
;;; a text into the lyskom buffer.
;;;


36
37
38
39
40
(setq lyskom-clientversion-long 
      (concat lyskom-clientversion-long
	      "$Id$\n"))


41
42
(defun lyskom-view-text (text-no &optional mark-as-read
				 follow-comments conf-stat priority
43
44
				 build-review-tree filter-active
				 flat-review)
45
46
  "Display text number TEXT-NO.
Args: TEXT-NO &optional MARK-AS-READ FOLLOW-COMMENTS CONF-STAT 
47
PRIORITY BUILD-REVIEW-TREE FLAT-REVIEW.
Per Cederqvist's avatar
.    
Per Cederqvist committed
48
49
50
51
52
If MARK-AS-READ is non-nil the text will be marked as read.
If FOLLOW-COMMENTS is non-nil all comments and footnotes to this text will be
read before the next text. CONF-STAT must be the conference status of the
current conference, and PRIORITY the priority, if FOLLOW-COMMENTS is non-nil.
If BUILD-REVIEW-TREE is non-nil then it fixes a new entry in the 
53
lyskom-reading-list to read the comments to this.
54
55
If FLAT-REVIEW is non-nil this is a review caused by lyskom-view-commented or
kom-view-text viewing REVIEW or REVIEW-MARK text.
56
57

Note that this function must not be called asynchronously."
58

59
60
  (let ((inhibit-read-only t)
	(filter (and filter-active
David Byers's avatar
David Byers committed
61
62
63
                     (lyskom-filter-text-p text-no)))
        (start nil)
        (end nil)
David Byers's avatar
David Byers committed
64
65
        (todo nil)
        (lyskom-last-text-format-flags nil))
66
    (cond ((eq filter 'skip-text) (lyskom-filter-prompt text-no 'filter-text)
67
	   (setq todo 'next-text)
David Kågedal's avatar
David Kågedal committed
68
	   (lyskom-mark-as-read (blocking-do 'get-text-stat text-no))
69
70
71
	   'next-text)
	  ((eq filter 'skip-tree)
	   (lyskom-filter-prompt text-no 'filter-tree)
David Kågedal's avatar
David Kågedal committed
72
73
74
75
76
77

	   ;;(initiate-get-text-stat 'main 'lyskom-jump text-no t)
	   ;; Let's try something else:
	   (lyskom-jump (blocking-do 'get-text-stat text-no) t)
	   (lyskom-wait-queue 'main)

78
	   (setq todo 'next-text)
79
80
81
82
83
	   'next-text)
	  (t
	   (if (not (or (null filter) 
			(eq filter 'dontshow)))
	       (lyskom-message "%s" (lyskom-get-string 'invalid-filter-list)))
84
	   (if (eq filter 'dontshow)
85
	       (setq todo 'next-text))
86
87
	   (blocking-do-multiple ((text-stat (get-text-stat text-no))
				  (text (get-text text-no)))
88
	     (if (and text-stat text)
89
		 (progn
90
                   (run-hooks 'lyskom-view-text-hook)
91
92
93
		   ;; Use a marker, because the buffer may lose data
		   ;; at the top if kom-max-buffer-size is set.
		   (setq start (point-max-marker))
94
95
		   (lyskom-format-insert "%#2@%[%#1n%] " text-stat (list 'lyskom-text-start
                                                                         (text-stat->text-no text-stat)))
96
97
98
99
100
101
102
                   (let ((mx-date (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 21)))
                         (mx-from (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 17)))
                         (mx-author (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 16)))
                         (mx-to (lyskom-get-aux-item (text-stat->aux-items text-stat) 19))
                         (mx-cc (lyskom-get-aux-item (text-stat->aux-items text-stat) 20))
                         (mx-filename (lyskom-get-aux-item (text-stat->aux-items text-stat) 10104))
                         (mx-sender (lyskom-get-aux-item (text-stat->aux-items text-stat) 10103))
David Byers's avatar
David Byers committed
103
			 (mx-headers (lyskom-get-aux-item (text-stat->aux-items text-stat) 24))
David Byers's avatar
David Byers committed
104
                         (mx-reply-to (lyskom-get-aux-item (text-stat->aux-items text-stat) 18)))
105
106
107
108
109
                         

                     ;; Insert date

                     (if mx-date
110
111
112
113
114
115
116
117
118
                         (let ((date (lyskom-mx-date-to-time mx-date)))
                           (if date
                             (progn
                               (lyskom-print-date-and-time date)
                               (when (time->tzhr date)
                                 (lyskom-format-insert " %#1s%#2s " 
                                                       (time->tzhr date)
                                                       (time->tzmin date))))
                             (lyskom-format-insert (aux-item->data mx-date))))
119
120
121
122
123
124
                       (lyskom-print-date-and-time (text-stat->creation-time
                                                    text-stat)
                                                   'time-y-m-d-h-m))

                     ;; Insert number of lines

125
126
127
128
129
130
131
132
133
		   (lyskom-insert 
		    (if (= 1 (text-stat->no-of-lines text-stat))
			(lyskom-get-string 'line)
		      (lyskom-format 'lines 
				     (let ((n (text-stat->no-of-lines
					       text-stat)))
				       (if (= n 0) ; Added to increase
					   2 ; compatibility with old KOM. /lw
					 n)))))
134
		   
135
136
137
138
139
140
141
142
143
144
145
146
147
                   ;; Insert the author

                   (lyskom-insert (or (lyskom-format-mx-author mx-from mx-author) ""))
                   (unless (or mx-from mx-author)
                     (lyskom-format-insert "%#1P" (text-stat->author text-stat)))

                   ;; Insert filtration prompt

		   (when (eq filter 'dontshow)
                     (lyskom-insert " ")
                     (lyskom-insert (lyskom-get-string 'filtered)))
                   (lyskom-insert "\n")

148
149
150
151
152
153
154
155
156
		   (setq end (point-max))

		   (if (and kom-text-properties
			    (null filter)
			    (not (lyskom-face-default-p 'kom-first-line-face)))
		       (add-text-properties
			start end '(face kom-first-line-face)))
		   (set-marker start nil)

157
158
                   ;; Insert sender

159
                   (when (and mx-sender kom-show-imported-envelope-sender)
160
161
162
163
164
165
166
167
                     (lyskom-format-insert 'envelope-sender 
                                           (aux-item->data (car mx-sender))))
                   (when mx-filename
                     (lyskom-format-insert 'attachment-filename
                                           (aux-item->data (car mx-filename))))

                   ;; Insert imported at

David Byers's avatar
David Byers committed
168
                   (cond ((and (or mx-from mx-author mx-sender mx-headers)
169
170
                               (text-stat->author text-stat)
                               kom-show-imported-importer)
171
172
173
174
175
176
177
178
179
180
181
182
183
184
                          (lyskom-format-insert 'text-imported-at-by
                                                (lyskom-return-date-and-time (text-stat->creation-time
                                                                              text-stat)
                                                                             'time-y-m-d-h-m)
                                                (text-stat->author text-stat)))
                         (mx-from
                          (lyskom-format-insert 'text-imported-at
                                                (lyskom-return-date-and-time (text-stat->creation-time
                                                                              text-stat)
                                                                             'time-y-m-d-h-m)))
                         (mx-date (lyskom-format-insert 'text-created-at
                                                        (lyskom-return-date-and-time (text-stat->creation-time
                                                                                      text-stat)
                                                                                     'time-y-m-d-h-m))))
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
                   (when kom-show-imported-external-recipients
                     (mapcar (lambda (el)
                               (lyskom-format-insert "%#1s: %#2s\n"
                                                     (lyskom-get-string 'mx-Recipient)
                                                     (aux-item->data el)))
                             mx-to)
                     (mapcar (lambda (el)
                               (lyskom-format-insert "%#1s: %#2s\n"
                                                     (lyskom-get-string 'mx-Extra-recipient)
                                                     (aux-item->data el)))
                             mx-cc)
                     (mapcar (lambda (el)
                               (lyskom-format-insert "%#1s: %#2s\n"
                                                     (lyskom-get-string 'mx-Extern-reply-to)
                                                     (aux-item->data el)))
                             mx-reply-to)
                     )
202

203
                   ;; All recipients and other header lines.
204
205

		   (if (eq filter 'dontshow)
David Kågedal's avatar
David Kågedal committed
206
207
		       (lyskom-mark-as-read
			(blocking-do 'get-text-stat text-no))
208
209
210
211
212
		     (lyskom-traverse misc
			 (text-stat->misc-info-list text-stat)
		       (let ((type (misc-info->type misc)))
			 (cond
			  ((or (eq type 'RECPT)
David Byers's avatar
David Byers committed
213
                               (eq type 'BCC-RECPT)
214
215
			       (eq type 'CC-RECPT))
			   (lyskom-print-header-recpt 
David Kågedal's avatar
David Kågedal committed
216
			    (misc-info->recipient-no misc)
217
218
219
220
			    misc))
			  ((eq type 'COMM-IN)
			   (if kom-reading-puts-comments-in-pointers-last
			       nil
221
222
223
                             (if lyskom-show-comments ; +++SOJGE
                                 (lyskom-print-header-comm
                                  (misc-info->comm-in misc)
224
225
                                  misc
                                  text-stat))))
226
227
228
229
230
			  ((eq type 'FOOTN-IN)
			   (if kom-reading-puts-comments-in-pointers-last
			       nil
			     (lyskom-print-header-comm
			      (misc-info->footn-in misc)
231
232
			      misc
                              text-stat)))
233
234
			  ((eq type 'COMM-TO)
			   (lyskom-print-header-comm (misc-info->comm-to misc)
235
236
						     misc
                                                     text-stat))
237
238
			  ((eq type 'FOOTN-TO)
			   (lyskom-print-header-comm (misc-info->footn-to misc)
239
240
						     misc
                                                     text-stat))
241
			  )))
242
243
244
245
246
247
248
249
250
251

                     ;;
                     ;; Print aux-items that go in the header
                     ;;

                     (let ((text nil))
                       (lyskom-traverse-aux aux
                                            (text-stat->aux-items text-stat)
                         (when (and
                             (or (eq (lyskom-aux-item-definition-field aux
David Byers's avatar
David Byers committed
252
                                                                 'text-print-when)
253
254
                                     'header)
                              (and (eq (lyskom-aux-item-definition-field aux
David Byers's avatar
David Byers committed
255
                                                                  'text-print-when)
256
257
258
259
                                       'comment)
                               (not kom-reading-puts-comments-in-pointers-last)
                               ))
                             (setq text 
260
                                   (lyskom-aux-item-call 
261
                                    aux
David Byers's avatar
David Byers committed
262
                                    'text-print
263
264
265
266
267
268
                                    aux
                                    text-stat)))
                           (lyskom-insert text)
                           (lyskom-insert "\n"))))


269
270
271
		     (let ((num-marks (text-stat->no-of-marks text-stat))
			   (is-marked-by-me (cache-text-is-marked
					     (text-stat->text-no text-stat))))
272
273
274
275
276
277
278
279
280
281
282
283
		       (when (> num-marks 0)
			 (if is-marked-by-me
			     (if (= num-marks 1)
				 (lyskom-format-insert 'marked-by-you
						       (mark->mark-type
							is-marked-by-me))
			       (lyskom-format-insert 'marked-by-you-and-others
						     (1- num-marks)
						     (mark->mark-type
						      is-marked-by-me)))
			   (lyskom-format-insert 'marked-by-several num-marks))))

284
		     (lyskom-print-text text-stat text
285
					mark-as-read text-no flat-review))
286
287
		   
		   
288
289
290
291
292
                   (let ((text nil))
                       (lyskom-traverse-aux aux
                                            (text-stat->aux-items text-stat)
                         (when (and
                             (or (eq (lyskom-aux-item-definition-field aux
David Byers's avatar
David Byers committed
293
                                                                 'text-print-when)
294
295
                                     'footer)
                              (and (eq (lyskom-aux-item-definition-field aux
David Byers's avatar
David Byers committed
296
                                                                  'text-print-when)
297
298
299
300
                                       'comment)
                                   kom-reading-puts-comments-in-pointers-last
                               ))
                             (setq text 
301
                                   (lyskom-aux-item-call 
302
                                    aux
David Byers's avatar
David Byers committed
303
                                    'text-print
304
305
306
307
308
309
                                    aux
                                    text-stat)))
                           (lyskom-insert text)
                           (lyskom-insert "\n"))))


310
311
312
313
		   (if kom-reading-puts-comments-in-pointers-last
		       (lyskom-view-text-handle-saved-comments text-stat))
		   
		   (if (or follow-comments
David Kågedal's avatar
David Kågedal committed
314
315
			   ;; Checking build-review-tree should not be
			   ;; necessary, really /davidk
316
317
			   build-review-tree)
		       ;; This shows footnotes also.
318
319
320
321
322
323
324
		       (progn
			 ;; this is a bit silly, as it prefetches all
			 ;; the texts many times.
			 (lyskom-prefetch-texttree text-no)
			 (lyskom-follow-comments text-stat
						 conf-stat mark-as-read
						 priority build-review-tree)))
325
		   ))
326
327
328
	       (lyskom-format-insert 'no-such-text-no text-no))
             (let ((aux-items (text-stat->aux-items text-stat)))
               (while aux-items
329
330
331
                 (lyskom-aux-item-call (car aux-items)
                                       'read-action
                                       text-stat)
332
333
                 (setq aux-items (cdr aux-items))))
             )))
334
    todo))
335
336


337
338
339
340


(defun lyskom-follow-comments (text-stat conf-stat 
					 mark-as-read priority review-tree)
Per Cederqvist's avatar
.    
Per Cederqvist committed
341
  "Arrange so that all comments and footnotes to this text will be read.
342
343
344
345
This will essentially fix the reading list and issue calls for the cache to be
filled.

Arguments are: TEXT-STAT CONF-STAT PRIORITY REVIEW-TREE
Per Cederqvist's avatar
.    
Per Cederqvist committed
346
347
348
349
350
TEXT-STAT is the current text.
CONF-STAT the current conference
PRIORITY the priority of the reading.
If REVIEW-TREE is non-nil then build an entry of type 'REVIEW-TREE in the 
lyskom-reading-list."
351
352
353
354
  ;; . Find footnotes and show them.
  ;; . Fix the reading-list
  ;; . Issue cache-filling initiate-calls for everything left comments.
  
David Kågedal's avatar
David Kågedal committed
355
  (let (flist clist)
356
357
358
359
360
361
    (lyskom-traverse misc (text-stat->misc-info-list text-stat)
      (cond
       ((and (eq (misc-info->type misc) 'FOOTN-IN)
	     (> (misc-info->footn-in misc) (text-stat->text-no text-stat))
	     kom-show-footnotes-immediately)
	;; Show the footnote
David Kågedal's avatar
David Kågedal committed
362
363
	(lyskom-view-text (misc-info->footn-in misc)
			  mark-as-read t conf-stat priority review-tree)
364
365
	(lyskom-is-read (misc-info->footn-in misc)))
       ((eq (misc-info->type misc) 'FOOTN-IN)
David Kågedal's avatar
David Kågedal committed
366
	(setq flist (cons (misc-info->footn-in misc) flist)))
367
       ((eq (misc-info->type misc) 'COMM-IN)
368
        (if lyskom-show-comments        ; +++SOJGE
David Kågedal's avatar
David Kågedal committed
369
370
371
372
373
374
375
376
377
378
379
            (setq clist (cons (misc-info->comm-in misc) clist))))))
    
    (let (comments footnotes)
      ;; Find the comments that we should read and enter them into the
      ;; read-list.
      (lyskom-traverse no clist
	(let ((text-stat (blocking-do 'get-text-stat no)))
	  (if (or review-tree
		  (and text-stat
		       (not (lyskom-text-read-p text-stat))))
	      (setq comments (cons no comments)))))
380
      (if comments
David Byers's avatar
David Byers committed
381
382
383
384
385
386
387
388
389
390
391
392
393
          (if review-tree
              (lyskom-review-enter-read-info
               (lyskom-create-read-info 'REVIEW-TREE
                                        conf-stat priority
                                        (lyskom-create-text-list comments)
                                        (text-stat->text-no text-stat)) t)
            (read-list-enter-read-info
             (lyskom-create-read-info 'COMM-IN
                                      conf-stat priority
                                      (lyskom-create-text-list comments)
                                      (text-stat->text-no text-stat))
             lyskom-reading-list t)))

David Kågedal's avatar
David Kågedal committed
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
      ;; Find the footnotes that we should read and enter them into
      ;; the read-list. A slight trick is to increase the priority so
      ;; that they will be read first.
      (lyskom-traverse no flist
	(let ((text-stat (blocking-do 'get-text-stat no)))
	  (if (or review-tree
		  (and text-stat
		       (not (lyskom-text-read-p text-stat))))
	      (setq footnotes (cons no footnotes)))))
      (if footnotes
	  (read-list-enter-read-info
	   (lyskom-create-read-info (if review-tree 'REVIEW-TREE 'FOOTN-IN)
				    conf-stat (1+ priority)
				    (lyskom-create-text-list footnotes)
				    (text-stat->text-no text-stat))
	   lyskom-reading-list t)))))
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431


(defun lyskom-fetch-text-for-cache (text-stat)
  "Fetches the author and other things of a text and does nothing with it."
  (cond
   (text-stat
    (lyskom-fetch-author-for-cache text-stat)
    (initiate-get-text 'fill-cache nil (text-stat->text-no text-stat))
    (lyskom-traverse misc (text-stat->misc-info-list text-stat)
      (cond
       ((eq (misc-info->type misc) 'FOOTN-IN)
	(initiate-get-text-stat 'fill-cache 'lyskom-fetch-author-for-cache
				(misc-info->footn-in misc)))
       ((eq (misc-info->type misc) 'FOOTN-TO)
	(initiate-get-text-stat 'fill-cache 'lyskom-fetch-author-for-cache
				(misc-info->footn-to misc)))
       ((eq (misc-info->type misc) 'COMM-IN)
	(initiate-get-text-stat 'fill-cache 'lyskom-fetch-author-for-cache
				(misc-info->comm-in misc)))
       ((eq (misc-info->type misc) 'COMM-TO)
	(initiate-get-text-stat 'fill-cache 'lyskom-fetch-author-for-cache
				(misc-info->comm-to misc))))))))
Per Cederqvist's avatar
.    
Per Cederqvist committed
432
433


434
435
436
437
438
439

(defun lyskom-fetch-author-for-cache (text-stat)
  "Fetches the author of a text and does nothing with it."
  (if text-stat				;Error check.
      (initiate-get-conf-stat 'fill-cache nil (text-stat->author text-stat))))

Per Cederqvist's avatar
.    
Per Cederqvist committed
440
441
442
443
444
445
446


(defun lyskom-text-read-p (text-stat)
  "Return t if TEXT-STAT has been marked as read in all
recipients to it that the user is a member in."
  (let* ((misc-info-list (text-stat->misc-info-list text-stat))
	 (i (length misc-info-list))
447
	 (res 'not-member))
Per Cederqvist's avatar
.    
Per Cederqvist committed
448
449
450
451
452
    (while (and res (not (zerop i)))
      (setq i (1- i))
      (let* ((misc-info (elt misc-info-list i))
	     (type (misc-info->type misc-info)))
	(cond
David Byers's avatar
David Byers committed
453
454
455
	 ((or (eq type 'RECPT) 
              (eq type 'BCC-RECPT)
              (eq type 'CC-RECPT))
456
457
458
	  ;; Is this function ever called asynchronously? If not, we
	  ;; can use lyskom-get-membership istead.
	  (let ((membership (lyskom-try-get-membership
David Byers's avatar
David Byers committed
459
			     (misc-info->recipient-no misc-info) t))
Per Cederqvist's avatar
.    
Per Cederqvist committed
460
		(loc-no (misc-info->local-no misc-info)))
461
462
463
464
465

	    ;; Make a note that this text really is in a group we are
	    ;; a member of.
	    (if (and res membership) (setq res t))
	    
Per Cederqvist's avatar
.    
Per Cederqvist committed
466
467
468
	    (if (and membership
		     (> loc-no (membership->last-text-read membership))
		     (not (lyskom-vmemq loc-no
469
					(membership->read-texts membership))))
Per Cederqvist's avatar
.    
Per Cederqvist committed
470
		(setq res nil)))))))
471
472
473
    (if (eq res 'not-member)
	(not kom-follow-comments-outside-membership)
      res)))
Per Cederqvist's avatar
.    
Per Cederqvist committed
474
475


476
(defun lyskom-text-read-at-least-once-p (text-stat &optional bg)
David Byers's avatar
David Byers committed
477
  "Return t if TEXT-STAT has been marked as read in any of the recipients
478
479
480
481
the user is a member of. Uses blocking-do. Returns t if TEXT-STAT is nil.

If BG is non-nil, this function is run in the background and must not use
blocking-do."
David Byers's avatar
David Byers committed
482
483
484
485
486
487
488
489
490
491
492
  (if text-stat
      (let* ((misc-info-list (text-stat->misc-info-list text-stat))
             (misc-item nil)
             (type nil)
             (membership nil)
             (is-member nil)
             (result nil))
        (while misc-info-list
          (setq misc-item (car misc-info-list))
          (setq type (misc-info->type misc-item))
          (setq misc-info-list (cdr misc-info-list))
David Byers's avatar
David Byers committed
493
494
495
          (cond ((or (eq type 'RECPT) 
                     (eq type 'BCC-RECPT)
                     (eq type 'CC-RECPT))
496
497
                 (setq membership (if bg
                                      (lyskom-try-get-membership
David Byers's avatar
David Byers committed
498
                                       (misc-info->recipient-no misc-item) t)
499
                                    (lyskom-get-membership
David Byers's avatar
David Byers committed
500
                                     (misc-info->recipient-no misc-item) t)))
David Byers's avatar
David Byers committed
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
                 (when membership
                   (setq is-member t)
                   (when (or (<= (misc-info->local-no misc-item)
                                 (membership->last-text-read membership))
                             (lyskom-vmemq (misc-info->local-no misc-item)
                                           (membership->read-texts
                                            membership)))
                     (setq result t)
                     (setq misc-info-list nil))))))
        (cond (result result)
              ((not is-member) (not kom-follow-comments-outside-membership))
              (t nil)))
    t))


516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
(defun lyskom-subtract-one-day (x)
  (let ((high-x (1- (car x)))
        (low-x (car (cdr x))))
    (if (> 20864 low-x)
        (setq high-x (1- high-x)
              low-x (+ low-x 65536)))
    (setq low-x (- low-x 20864))
    (list high-x low-x nil)))

(defun lyskom-calculate-day-diff (time)
  (let* ((now (current-time))
         (yesterday (lyskom-subtract-one-day now))
         (decnow (decode-time now))
         (decthen (decode-time yesterday)))
    (cond ((and (= (time->mday time) (elt decnow 3))
                (= (1+ (time->mon time)) (elt decnow 4))
                (= (+ (time->year time) 1900) (elt decnow 5)))
           'today)
          ((and (= (time->mday time) (elt decthen 3))
                (= (1+ (time->mon time)) (elt decthen 4))
                (= (+ (time->year time) 1900) (elt decthen 5)))
           'yesterday)
          (t nil))))

David Byers's avatar
David Byers committed
540
541
(defun lyskom-return-date-and-time (time &optional fmt)
  "Return date and time as a string. Arg: TIME."
David Byers's avatar
David Byers committed
542
543
  (let* ((diff (and lyskom-print-complex-dates
		    (lyskom-calculate-day-diff time))))
David Byers's avatar
David Byers committed
544
    (lyskom-format
David Byers's avatar
David Byers committed
545
     (if diff
546
         (intern (concat (symbol-name diff) "-time-format-string"))
David Byers's avatar
David Byers committed
547
       (or fmt 'time-yyyy-mm-dd-hh-mm))
548
549
550
551
552
553
554
     (+ (time->year time) 1900)
     (1+ (time->mon  time))
     (time->mday time)
     (time->hour time)
     (time->min  time)
     (and diff (lyskom-get-string diff)))))
                  
David Byers's avatar
David Byers committed
555
556
557
(defun lyskom-print-date-and-time (time &optional fmt)
  "Print date and time. Arg: TIME"
  (lyskom-insert (lyskom-return-date-and-time time fmt)))
Per Cederqvist's avatar
.    
Per Cederqvist committed
558

559
560
561
562
563
564
565
(defun lyskom-format-text-footer (text author author-name format format-flags)
  "Format the footer of a text."
  (let* ((result "")
         (start 0)
         (format-letter nil)
         (field-width nil)
         (kom-deferred-printing nil)
566
         (author-name-len nil)
567
568
         (have-author (and format (string-match "%=?[0-9]*P" format))))

David Byers's avatar
David Byers committed
569
    (setq author-name-len (lyskom-string-width (or author-name (conf-stat->name author))))
570

571
572
    ;; No user-specified format, so output dashes and stuff

573
    (if (null format)
574
575
576
577
578
        (let* ((format-flag-string
                (if (and format-flags (listp format-flags))
                    (let ((first-flag t))
                      (concat
                       "("
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
                       (mapconcat 
                        (lambda (str)
                          (let ((face nil))
                            ;; If it's a cons, the cdr is property list
                            (when (consp str)
                              (setq face (cdr str)
                                    str (car str)))
                            ;; Get the string
                            (setq str (lyskom-get-string str))
                            ;; Upcase the first in the list
                            (when first-flag 
                              (setq first-flag nil str (upcase-initials str)))
                            ;; If we have a plist, apply it
                            (when face
                              (add-text-properties 0 (length str) face str))
                            ;; Return the string
                            str))
                        format-flags ", ")
597
598
599
600
                       ")"))
                  ""))
               (end-dash-chars
                (- kom-text-footer-dash-length
David Byers's avatar
David Byers committed
601
                   (lyskom-string-width (int-to-string (text-stat->text-no text))) 
602
603
                   3                             ; Parens and space
                   (if kom-show-author-at-end
604
                       (+ author-name-len 2) 
605
                     0)
David Byers's avatar
David Byers committed
606
                   (string-width format-flag-string)))
607
608
609
610
611
612
613
614
615
616
617
618
619
               (end-dash (if (> end-dash-chars 0)
                             (make-string end-dash-chars ?-)
                           "")))
          (lyskom-format
           (cond ((and kom-dashed-lines kom-show-author-at-end)
                  "(%#1n) /%#2P/%#3s%#4s")
                 (kom-dashed-lines
                  "(%#1n) %#3s%#4s")
                 (kom-show-author-at-end
                  "(%#1n) /%#2P/")
                 (t
                  "(%#1n)"))
           text
620
           (or author-name author)
621
622
           end-dash
           format-flag-string))
623

624
625
      ;; User-specified format. Do all kinds of weird stuff

626
627
628
629
630
631
632
633
634
635
636
637
      (while (string-match "%\\(=?-?[0-9]+\\)?\\([-nPpf% ]\\)" format start)
        (setq result (concat result (substring format start 
                                               (match-beginning 0))))
        (setq format-letter (aref format (match-beginning 2)))
        (setq field-width (match-string 1 format))
        (when (null field-width) (setq field-width ""))
        (setq start (match-end 0))
        (setq result
              (concat 
               result
               (cond
                ((eq format-letter ?p)
David Byers's avatar
David Byers committed
638
639
                 (lyskom-format (format "%%%s#1p" field-width) 
                                (or author (text-stat->author text))))
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663

                ((eq format-letter ?P)
                 (lyskom-format (format "%%%s#1P" field-width) 
                                (or author author-name)))

                ((eq format-letter ?n)
                 (lyskom-format (format "%%%s#1n" field-width) 
                                (text-stat->text-no text)))

                ((eq format-letter ?f)
                 (if format-flags
                     (lyskom-format (format "%%%s#1s" field-width) 
                                    (lyskom-get-string format-flags))
                   ""))

                ((eq format-letter ?-)
                 (let ((width 
                        (cond ((null field-width) 42)
                              ((string= "" field-width) 42)
                              ((eq ?= (aref field-width 0))
                               (string-to-int (substring field-width 1)))
                              (t (string-to-int field-width)))))
                 
                   (lyskom-format 
664
                    "%#1s"
665
                    (if have-author
666
667
                        (if (< author-name-len width)
                            (make-string (- width author-name-len) ?-)
668
669
670
671
672
673
674
675
676
677
678
679
680
681
                          "")
                      (make-string width ?-)))))

                ((eq format-letter ?%)
                 "%")
                (t (concat "%" field-width (make-string 1 format-letter))))))
        )
      (setq result (concat result (substring format start)))
      (if (string-match "[ \t]+\\'" result)
          (substring result 0 (match-beginning 0))
        result))))



David Byers's avatar
David Byers committed
682
683
(defun lyskom-deferred-insert-footer (conf-stat defer-info)
  "Insert the name of a conference at a previously reserved place."
684
685
  (let* ((text-stat (elt (defer-info->data defer-info) 0))
         (format-flags (elt (defer-info->data defer-info) 1))
686
         (mx-from (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 17)))
687
688
689
690
         (mx-author (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 16)))
         (name (cond (conf-stat nil)
                      ((= (defer-info->call-par defer-info) 0)
                       (lyskom-get-string 'person-is-anonymous))
691
692
                      (t (lyskom-format 'person-does-not-exist
                                        (text-stat->author text-stat))))))
693
694
695

    (setq name (or (lyskom-format-mx-author mx-from mx-author) name))

696
697
698
699
700
701
    (lyskom-replace-deferred defer-info 
                             (lyskom-format-text-footer text-stat
                                                        conf-stat
                                                        name
                                                        kom-text-footer-format
                                                        format-flags))))
Per Cederqvist's avatar
.    
Per Cederqvist committed
702

703

704
(defun lyskom-print-text (text-stat text mark-as-read text-no flat-review)
Per Cederqvist's avatar
.    
Per Cederqvist committed
705
706
707
  "Print a text. The header must already be printed.
Print an error message if TEXT-STAT or TEXT is nil.
Mark the text as read if (and only if) MARK-AS-READ is non-nil.
708
Args: TEXT-STAT TEXT MARK-AS-READ TEXT-NO FLAT-REVIEW."
709
710
  (let ((lyskom-current-function 'lyskom-print-text))
    (cond
Per Cederqvist's avatar
.    
Per Cederqvist committed
711
     ((or (null text)
712
          (null text-stat))
Per Cederqvist's avatar
.    
Per Cederqvist committed
713
714
715
      (lyskom-format-insert 'no-such-text-no text-no)
      (setq lyskom-previous-text lyskom-current-text)
      (setq lyskom-current-text text-no))
716
     (t
717
718
      (when (eq (text-stat->author text-stat) lyskom-pers-no)
        (setq lyskom-last-seen-written (text-stat->text-no text-stat)))
719
      (let* ((str (text->decoded-text-mass text text-stat))
720
	     (truncated nil)
721
722
             ;; s1 s2 t1 t2
	     body)
723

724
725
726
727
728
729
730
731
        (cond
         ((string-match "\n" str)
          (setq lyskom-current-subject (substring str 0 (match-beginning 0)))
          (setq body (substring str (match-end 0)))
          (lyskom-insert-string 'head-Subject)
          (let ((lyskom-current-function-phase 'subject))
            (lyskom-format-insert "%#1r\n" 
                                  (copy-sequence lyskom-current-subject)))
732
          (when kom-dashed-lines
733
              (lyskom-insert 
734
735
736
               (make-string kom-text-header-dash-length ?-)))

          (lyskom-insert "\n")
737
          ;; (setq t1 (point-max))
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755

	  ;; Truncate body if flat-review and long text
	  (if (and flat-review kom-truncate-show-lines kom-truncate-threshold)
	      (let ((lines 0)
		    (pos 0)
		    (show-lines (min kom-truncate-show-lines
				     kom-truncate-threshold))
		    last-line)
		(while (and pos (setq pos (string-match "\n" body pos)))
		  (setq pos (1+ pos))
		  (setq lines (1+ lines))
		  (if (= lines show-lines)
		      (setq last-line (1- pos)))
		  (if (>= lines kom-truncate-threshold)
		      (setq body (substring body 0 last-line)
			    pos nil
			    truncated t)))))
		    
756
          (let ((lyskom-current-function-phase 'body))
David Byers's avatar
David Byers committed
757
            (lyskom-format-insert "%#1t\n" (cons text-stat body)))
758
759
760

	  ;; Indicate that the text was truncated
	  (if truncated
761
762
763
              (lyskom-signal-reformatted-text
               '(reformat-truncated . (face kom-warning-face))))

764
	  
765
766
          ;; (setq t2 (point-max))
	  )
767
         (t                             ;No \n found. Don't print header.
768
769
770
771
          (when kom-dashed-lines
            (lyskom-insert 
             (make-string kom-text-header-dash-length ?-)))
          (lyskom-insert "\n")
David Byers's avatar
David Byers committed
772
          (lyskom-format-insert "%#1t\n" (cons text-stat str))
773
774
775
776
          (setq lyskom-current-subject "")))
        (if (lyskom-text-p (cache-get-text (text->text-no text)))
            (cache-del-text (text->text-no text)))
        (sit-for 0)
777
778
779
780
781
782
783
784
        (let* ((lyskom-current-function-phase 'footer)
               (mx-from (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 17)))
               (mx-author (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 16)))
               (author-name (lyskom-format-mx-author mx-from mx-author)))

          (if (and kom-deferred-printing
                   (or kom-text-footer-format
                       kom-show-author-at-end))
785
786
787
788
789
790
791
792
793
794
795
796
797
798
              (progn
                (lyskom-format-insert "%#1s\n" lyskom-defer-indicator)
                (lyskom-defer-insertion
                 (lyskom-create-defer-info
                  'get-conf-stat
                  (text-stat->author text-stat)
                  'lyskom-deferred-insert-footer
                  (set-marker (make-marker)
                              (- (point-max) 
                                 (length lyskom-defer-indicator)
                                 1))
                  (length lyskom-defer-indicator)
                  "%#1s"
                  (list text-stat lyskom-last-text-format-flags))))
799
800
801
802
803
            (let* ((conf-stat (and (or kom-text-footer-format
                                       kom-show-author-at-end)
                                   (not (eq 0 (text-stat->author text-stat)))
                                   (blocking-do 'get-conf-stat 
                                                (text-stat->author text-stat)))))
804
805
806
              (lyskom-insert (lyskom-format-text-footer 
                              text-stat
                              conf-stat
807
808
809
810
811
812
                              (cond (author-name author-name)
                                    ((eq (text-stat->author text-stat) 0)
                                     (lyskom-get-string 'person-is-anonymous))
                                    (conf-stat (conf-stat->name conf-stat))
                                    (t (lyskom-format 'person-does-not-exist 
                                                      (text-stat->author text-stat))))
813
814
815
                              kom-text-footer-format
                              lyskom-last-text-format-flags)))
            (lyskom-insert "\n")))
816
817
818
819
        (if mark-as-read
            (lyskom-mark-as-read text-stat))
        (setq lyskom-previous-text lyskom-current-text)
        (setq lyskom-current-text (text-stat->text-no text-stat)))))))
Per Cederqvist's avatar
.    
Per Cederqvist committed
820
821
822


(defun lyskom-mark-as-read (text-stat)
Per Cederqvist's avatar
Per Cederqvist committed
823
  "Mark a text as read in all conferences that are recipients.
Per Cederqvist's avatar
Per Cederqvist committed
824
825
826
827
828
829
Tell the server that it is read.

Args: TEXT-STAT

This function does not remove the text from the internal structures of
the client. That is done by lyskom-is-read."
Per Cederqvist's avatar
.    
Per Cederqvist committed
830
831
832
833
  (let ((misc-info-list (text-stat->misc-info-list text-stat)))
    (lyskom-traverse
     misc-info misc-info-list
     (if (and (or (eq (misc-info->type misc-info) 'RECPT)
David Byers's avatar
David Byers committed
834
                  (eq (misc-info->type misc-info) 'BCC-RECPT)
Per Cederqvist's avatar
.    
Per Cederqvist committed
835
		  (eq (misc-info->type misc-info) 'CC-RECPT))
836
837
838
839
	      ;; The whole membership list might not be fetched
	      ;; yet. So we better mark it as read in all conferences.
	      ;; (lyskom-member-p (misc-info->recipient-no misc-info))
	      )
840
841
	 (initiate-mark-as-read 'background 
                                'lyskom-mark-as-read-callback
Per Cederqvist's avatar
.    
Per Cederqvist committed
842
				(misc-info->recipient-no misc-info)
843
844
845
846
847
848
849
				(list (misc-info->local-no misc-info))
                                text-stat
                                (misc-info->recipient-no misc-info)
                                (list (misc-info->local-no misc-info)))))))

(defun lyskom-mark-as-read-callback (result text-stat recipient local-nos)
  (lp--maybe-update-unreads recipient))
Per Cederqvist's avatar
.    
Per Cederqvist committed
850
851


David Kågedal's avatar
David Kågedal committed
852
(defun lyskom-print-header-recpt (conf-no misc)
Per Cederqvist's avatar
.    
Per Cederqvist committed
853
  "Print a line of info about a recipient (or cc-recipient) of a text."
854
855
856
  (lyskom-format-insert "%#1s: %#2M <%#3d>\n"
			(cond ((eq (misc-info->type misc) 'RECPT)
			       (lyskom-get-string 'Recipient))
David Byers's avatar
David Byers committed
857
858
859
860
861
                              ((eq (misc-info->type misc) 'BCC-RECPT)
                               (lyskom-get-string 'Hidden-recipient))
                              ((eq (misc-info->type misc) 'CC-RECPT)
                               (lyskom-get-string 'Extra-recipient))
                              (t (lyskom-get-string 'Strange-recipient)))
David Kågedal's avatar
David Kågedal committed
862
			conf-no
863
			(misc-info->local-no misc))
Per Cederqvist's avatar
.    
Per Cederqvist committed
864
865
  (if (misc-info->sent-at misc)
      (lyskom-format-insert 'send-at
David Byers's avatar
David Byers committed
866
			    (lyskom-return-date-and-time 
Per Cederqvist's avatar
.    
Per Cederqvist committed
867
868
			     (misc-info->sent-at misc))))
  (if (misc-info->sender misc)
David Kågedal's avatar
David Kågedal committed
869
      (lyskom-format-insert 'sent-by (misc-info->sender misc)))
Per Cederqvist's avatar
.    
Per Cederqvist committed
870
  (if (misc-info->rec-time misc)
David Kågedal's avatar
David Kågedal committed
871
872
873
874
875
      (lyskom-format-insert
       'recieved-at
       (lyskom-return-date-and-time (misc-info->rec-time misc)))))


Per Cederqvist's avatar
.    
Per Cederqvist committed
876
877


878
(defun lyskom-view-text-handle-saved-comments (text-stat)
Per Cederqvist's avatar
.    
Per Cederqvist committed
879
880
  "Ask server for what is needed to print the references to commenting texts 
and prints the references. Used at the bottom of the text.
881
882
883
884
885
886
Args: TEXT-STAT of the text being read."
  (lyskom-traverse misc
      (text-stat->misc-info-list text-stat)
    (let ((type (misc-info->type misc)))
      (cond
       ((eq type 'COMM-IN)
887
        (if lyskom-show-comments        ;+++SOJGE
888
            (lyskom-print-header-comm (misc-info->comm-in misc) misc text-stat)))
889
       ((eq type 'FOOTN-IN)
890
	(lyskom-print-header-comm (misc-info->footn-in misc) misc text-stat))))))
891
892


893

894
(defun lyskom-print-header-comm (text misc read-text-stat)
895
  "Get author of TEXT-NO and print a header line."
896
  (let ((text-stat (if kom-deferred-printing
897
		       (cache-get-text-stat text)
898
		     (blocking-do 'get-text-stat text))))
899
900

    ;; Print information about the link
901
    (cond (text-stat
902
           (lyskom-insert-header-comm text-stat misc read-text-stat))
903
          ((not kom-deferred-printing) 
904
           (lyskom-insert-header-comm text-stat misc read-text-stat))
905
906
907
908
909
910
911
912
          (t
           (let ((defer-info (lyskom-create-defer-info
                              'get-text-stat
                              text
                              'lyskom-insert-deferred-header-comm
                              (point-max-marker)
                              (length lyskom-defer-indicator)
                              nil       ; Filled in later
913
                              (list misc read-text-stat))))
914
915
             (lyskom-format-insert "%#1s\n" lyskom-defer-indicator)
             (lyskom-defer-insertion defer-info))))
916
917
918
919
920
921
922

    ;; Print information about who added the link
    (if (misc-info->sent-at misc)
	(lyskom-format-insert 'send-at (lyskom-return-date-and-time 
					(misc-info->sent-at misc))))
    (if (misc-info->sender misc)
	(lyskom-format-insert 'sent-by (misc-info->sender misc)))))
923
924
925


(defun lyskom-insert-deferred-header-comm (text-stat defer-info)
926
  (let* ((author (if text-stat (text-stat->author text-stat) nil))
927
928
	 (misc (elt (defer-info->data defer-info) 0))
	 (read-text-stat (elt (defer-info->data defer-info) 1))
929
	 (type (misc-info->type misc))
930
931
932
933
934
935
936
937
938
939
         (mx-from (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 17)))
         (mx-author (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 16)))
         (mx-attachments-in (mapcar
                             (lambda (el)
                               (string-to-number (aux-item->data el)))
                             (lyskom-get-aux-item (text-stat->aux-items read-text-stat) 10101)))
         (mx-belongs-to (mapcar
                         (lambda (el)
                           (string-to-number (aux-item->data el)))
                         (lyskom-get-aux-item (text-stat->aux-items read-text-stat) 10100)))
940
         (content-type "")
941
	 fmt data)
942
943

    (setq author (or (lyskom-format-mx-author mx-from mx-author) author))
944
945
946
947
948
949
950
951
952
953
    ;; Extract the content type

    (if (and mx-from
             (setq content-type
                   (car (lyskom-get-aux-item (text-stat->aux-items 
                                              text-stat) 1))))
        (progn (string-match "^\\(\\S-+\\)" (aux-item->data content-type))
               (setq content-type (format "(%s) "
                                          (aux-item->data content-type))))
      (setq content-type ""))
954
    
955
956
    (cond
     ((eq type 'COMM-TO)
957
958
      (setq fmt (cond ((memq (misc-info->comm-to misc) mx-belongs-to)
                       'attachment-to-text)
959
960
                      (author 'comment-to-text-by)
                      (t 'comment-to-text))
961
962
	    data (misc-info->comm-to misc)))
     ((eq type 'FOOTN-TO)
963
964
      (setq fmt (cond ((memq (misc-info->footn-to misc) mx-belongs-to)
                       'attachment-to-text)
965
966
                      (author 'footnote-to-text-by)
                      (t 'footnote-to-text))
967
968
	    data (misc-info->footn-to misc)))
     ((eq type 'COMM-IN)
969
970
      (setq fmt (cond ((memq (misc-info->comm-in misc) mx-attachments-in) 
                       'attachment-in-text)
971
972
                      (author 'comment-in-text-by)
                      (t 'comment-in-text))
973
974
	    data (misc-info->comm-in misc)))
     ((eq type 'FOOTN-IN)
975
976
      (setq fmt (cond ((memq (misc-info->footn-in misc) mx-attachments-in)
                       'attachment-in-text)
977
978
                      (author 'footnote-in-text-by)
                      (t 'footnote-in-text))
979
	    data (misc-info->footn-in misc)))) 
980
981
    (set-defer-info->format defer-info fmt)
    ; Note: author is ignored if fmt is not *-by
982
    (lyskom-replace-deferred defer-info data author content-type)))
983

984
985


986
(defun lyskom-insert-header-comm (text-stat misc read-text-stat)
987
988
  "Get author of TEXT-NO and print a header line."
  ;;+++ error kommer att se annorlunda ut.
989
990
991
  (let ((author (if text-stat
		    (text-stat->author text-stat)
		  nil))
992
993
994
995
996
997
998
999
1000
1001
        (mx-from (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 17)))
        (mx-author (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 16)))
        (mx-attachments-in (mapcar
                            (lambda (el)
                              (string-to-number (aux-item->data el)))
                            (lyskom-get-aux-item (text-stat->aux-items read-text-stat) 10101)))
        (mx-belongs-to (mapcar
                        (lambda (el)
                          (string-to-number (aux-item->data el)))
                        (lyskom-get-aux-item (text-stat->aux-items read-text-stat) 10100)))
1002
1003
        (content-type "")
        (is-attachment nil)
1004
1005
1006
        (type (misc-info->type misc)))

    (setq author (or (lyskom-format-mx-author mx-from mx-author) author))
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018

    ;; Extract the content type

    (if (and mx-from
             (setq content-type
                   (car (lyskom-get-aux-item (text-stat->aux-items 
                                              text-stat) 1))))
        (progn (string-match "^\\(\\S-+\\)" (aux-item->data content-type))
               (setq content-type (format "(%s) "
                                          (aux-item->data content-type))))
      (setq content-type ""))

1019
    
1020
1021
    (cond
     ((eq type 'COMM-TO)
1022
1023
      (lyskom-format-insert (if (and (memq (misc-info->comm-to misc) mx-belongs-to)
                                     (setq is-attachment t))
1024
1025
                                'attachment-to-text
                              'comment-to-text)
1026
1027
1028
                            (misc-info->comm-to misc)
                            nil
                            content-type))
1029
     ((eq type 'FOOTN-TO)
1030
1031
      (lyskom-format-insert (if (and (memq (misc-info->footn-to misc) mx-belongs-to)
                                     (setq is-attachment t))
1032
1033
                                'attachment-to-text
                              'footnote-to-text)
1034
1035
1036
                            (misc-info->footn-to misc)
                            nil
                            content-type))
1037
     ((eq type 'COMM-IN)
1038
1039
      (lyskom-format-insert (if (and (memq (misc-info->comm-in misc) mx-attachments-in)
                                     (setq is-attachment t))
1040
1041
                                'attachment-in-text
                              'comment-in-text)
1042
1043
1044
                            (misc-info->comm-in misc)
                            nil
                            content-type))
1045
     ((eq type 'FOOTN-IN)
1046
1047
      (lyskom-format-insert (if (and (memq (misc-info->footn-in misc) mx-attachments-in)
                                     (setq is-attachment t))
1048
1049
                                'attachment-in-text
                              'footnote-in-text)
1050
1051
1052
1053
                            (misc-info->footn-in misc)
                            nil
                            content-type)))
    (if (and author (not is-attachment))
1054
	(lyskom-format-insert 'written-by author)
1055
      (lyskom-insert "\n"))))
1056

1057
1058
1059
1060
1061
1062
(defun lyskom-format-mx-author (mx-from mx-author)
  (let ((author nil))
    (when (or mx-from mx-author)
      (setq author (lyskom-get-string 'email-name-prefix))
      (when mx-author (setq author (concat author (aux-item->data mx-author))))
      (when (and mx-from mx-author) (setq author (concat author " ")))
1063
1064
1065
1066
1067
1068
      (when mx-from
        (setq author (concat author
                      (lyskom-format 
                       "<%[%#1@%#2s%]>"
                       (lyskom-default-button 'email (aux-item->data mx-from))
                       (aux-item->data mx-from)))))
1069
1070
1071
      (setq author (concat (lyskom-get-string 'email-name-suffix) author))
      )
    author))
1072

1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
(defun lyskom-mx-date-to-time (mx-date)
 "Attempt to convert MX-DATE to a lyskom time structure.
Returns the time structure if successful, otherwise nil."
  (if (and mx-date
           (condition-case nil
               (progn (require 'calendar)
                      (require 'cal-iso)
                      t)
             (error nil))
           (string-match "\\([0-9][0-9][0-9][0-9]\\)-\\([0-9][0-9]\\)-\\([0-9][0-9]\\) \\([0-9][0-9]\\):\\([0-9][0-9]\\):\\([0-9][0-9]\\) \\([-+][0-9][0-9]\\)?\\([0-9][0-9]\\)?"
                         (aux-item->data mx-date)))
      (let* ((secs (string-to-number (match-string 6 (aux-item->data mx-date))))
             (mins (string-to-number (match-string 5 (aux-item->data mx-date))))
             (hour (string-to-number (match-string 4 (aux-item->data mx-date))))
             (mday (string-to-number (match-string 3 (aux-item->data mx-date))))
             (mon  (string-to-number (match-string 2 (aux-item->data mx-date))))
             (year (string-to-number (match-string 1 (aux-item->data mx-date))))
             (tzhr (match-string 7 (aux-item->data mx-date)))
             (tzmin (or (match-string 8 (aux-item->data mx-date)) ""))
             (wday (elt 
                    (calendar-iso-from-absolute
                     (calendar-absolute-from-gregorian
                      (list mon mday year)))
                    1)))
        (lyskom-create-time secs mins hour mday (1- mon) (- year 1900) wday 0 nil tzhr tzmin))))
1098
1099
1100
1101

;;; Local Variables: 
;;; eval: (put 'lyskom-traverse 'lisp-indent-hook 2)
;;; end: