Commit 127d034f authored by David Byers's avatar David Byers
Browse files

Speedups in conference name printing (experimental)

parent fa97d72c
1999-06-14 David Byers <davby@ida.liu.se>
* lyskom-buttons.el (lyskom-default-button): Handle uconf-stats.
* lyskom-rest.el (lyskom-format-aux-help): Use uconf-stats instead
of conf-stats. Do not permit alternate names. Do not attempt to
format the xface property.
* parse.el (lyskom-parse-error): Removed message "bug i
lyskom-parse-error" since this would happen frequently when error
messages are sent to a client that has been restarted.
......
......@@ -481,6 +481,11 @@ type TYPE before being send to lyskom-generate-button."
(setq type 'pers))
(setq xarg (conf-stat->conf-no arg)
text (conf-stat->name arg)))
((lyskom-uconf-stat-p arg)
(if (conf-type->letterbox (uconf-stat->conf-type arg))
(setq type 'pers))
(setq xarg (uconf-stat->conf-no arg)
text (uconf-stat->name arg)))
((numberp arg)
(if (setq xarg (cache-get-conf-stat arg))
(progn
......@@ -496,7 +501,9 @@ type TYPE before being send to lyskom-generate-button."
(cond ((lyskom-conf-stat-p arg)
(setq xarg (conf-stat->conf-no arg)
text (conf-stat->name arg)))
((lyskom-pers-stat-p arg)
((lyskom-uconf-stat-p arg)
(setq xarg (uconf-stat->conf-no arg)
text (uconf-stat->name arg))) ((lyskom-pers-stat-p arg)
(setq xarg (pers-stat->pers-no arg)
text
(or (conf-stat->name
......
......@@ -1202,7 +1202,7 @@ Note that it is not allowed to use deferred insertions in the text."
((and allow-defer
kom-deferred-printing
(integerp arg))
(let ((tmp (cache-get-conf-stat arg)))
(let ((tmp (cache-get-uconf-stat arg)))
(if (null tmp)
(let* ((format-element
(concat "%#2@%"
......@@ -1212,7 +1212,7 @@ Note that it is not allowed to use deferred insertions in the text."
(if colon-flag ":" "")
(char-to-string format-letter)))
(defer-info (lyskom-create-defer-info
'get-conf-stat
'get-uconf-stat
arg
'lyskom-deferred-insert-conf
oldpos
......@@ -1232,37 +1232,32 @@ Note that it is not allowed to use deferred insertions in the text."
format-state)))
lyskom-defer-indicator)
(setq arg tmp)
(let ((aux (conf-stat-find-aux arg
10
lyskom-pers-no))
(face (conf-stat-find-aux arg
9)))
(lyskom-maybe-add-face-to-string
face
(if aux
(concat (aux-item->data (car aux)) " *")
(conf-stat->name arg))))
; (let ((aux (conf-stat-find-aux arg
; 10
; lyskom-pers-no))
; (face (conf-stat-find-aux arg
; 9)))
; (lyskom-maybe-add-face-to-string
; face
(uconf-stat->name arg)
)))
;; Find the name and return it
((integerp arg)
(let ((conf-stat (blocking-do 'get-conf-stat arg)))
(let ((conf-stat (blocking-do 'get-uconf-stat arg)))
(if (null conf-stat)
(lyskom-format (if (= format-letter ?P)
'person-does-not-exist
'conference-does-not-exist)
arg)
(let ((aux (conf-stat-find-aux conf-stat 10 lyskom-pers-no)))
(if aux
(concat (aux-item->data (car aux)) " *")
(conf-stat->name conf-stat))))))
(uconf-stat->name conf-stat))))
;; We got a conf-stat, and can use it directly
((lyskom-conf-stat-p arg)
(let ((aux (conf-stat-find-aux arg 10 lyskom-pers-no)))
(if aux
(concat (aux-item->data (car aux)) " *")
(conf-stat->name arg))))
(conf-stat->name arg))
((lyskom-uconf-stat-p arg)
(uconf-stat->name arg))
;; Something went wrong
(t (signal 'lyskom-internal-error
......@@ -1270,6 +1265,7 @@ Note that it is not allowed to use deferred insertions in the text."
": argument error")))))
(if (and (not colon-flag)
(or (lyskom-conf-stat-p arg)
(lyskom-uconf-stat-p arg)
(numberp arg)))
(setq propl
(append
......@@ -1287,6 +1283,8 @@ Note that it is not allowed to use deferred insertions in the text."
(int-to-string arg))
((lyskom-conf-stat-p arg)
(int-to-string (conf-stat->conf-no arg)))
((lyskom-uconf-stat-p arg)
(int-to-string (uconf-stat->conf-no arg)))
(t (signal 'lyskom-internal-error
(list 'lyskom-format
": argument error")))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment