suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Added a message-final that can be used to leave a message when handin is

Browse Source 
done.
* A little more pleasant error messages on submission errors.

svn: r1026
This commit is contained in:
Eli Barzilay 2005-10-09 01:03:49 +00:00
parent e323d15247
commit 0946433c82
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
collects/handin-client/client-gui.ss
View File

@ -93,23 +93,27 @@
[parent button-panel])) [parent button-panel]))
(define (submit-file) (define (submit-file)
(define final-message "Handin successful.")
(submit-assignment (submit-assignment
connection connection
(send username get-value) (send username get-value)
(send passwd get-value) (send passwd get-value)
(send assignment get-string (send assignment get-selection)) (send assignment get-string (send assignment get-selection))
content content
;; on-commit
(lambda () (lambda ()
(semaphore-wait commit-lock) (semaphore-wait commit-lock)
(send status set-label "Comitting...") (send status set-label "Comitting...")
(set! committing? #t) (set! committing? #t)
(semaphore-post commit-lock)) (semaphore-post commit-lock))
;; message/message-final/message-box handlers
(lambda (msg) (send status set-label msg)) (lambda (msg) (send status set-label msg))
(lambda (msg) (set! final-message msg))
(lambda (msg styles) (message-box "Handin" msg this styles))) (lambda (msg styles) (message-box "Handin" msg this styles)))
(queue-callback (queue-callback
(lambda () (lambda ()
(when abort-commit-dialog (send abort-commit-dialog show #f)) (when abort-commit-dialog (send abort-commit-dialog show #f))
(send status set-label "Handin successful.") (send status set-label final-message)
(set! committing? #f) (set! committing? #f)
(done-interface)))) (done-interface))))
(define (retrieve-file) (define (retrieve-file)

5
collects/handin-client/client.ss
View File

@ -64,12 +64,13 @@
v))) v)))
(define (submit-assignment h username passwd assignment content (define (submit-assignment h username passwd assignment content
on-commit message message-box) on-commit message message-final message-box)
(let ([r (handin-r h)] [w (handin-w h)]) (let ([r (handin-r h)] [w (handin-w h)])
(define (read/message) (define (read/message)
(let ([v (read r)]) (let ([v (read r)])
(case v (case v
[(message) (message (read r)) (read/message)] [(message) (message (read r)) (read/message)]
[(message-final) (message-final (read r)) (read/message)]
[(message-box) [(message-box)
(write+flush w (message-box (read r) (read r))) (read/message)] (write+flush w (message-box (read r) (read r))) (read/message)]
[else v]))) [else v])))
@ -93,7 +94,7 @@
;; the resulting value written back ;; the resulting value written back
(let ([v (read/message)]) (let ([v (read/message)])
(unless (eq? 'confirm v) (unless (eq? 'confirm v)
(error 'handin-connect "submit error: ~a" v))) (error (format "submit error: ~a" v))))
(on-commit) (on-commit)
(write+flush w 'check) (write+flush w 'check)
(wait-for-ok r "commit" read/message) (wait-for-ok r "commit" read/message)