Revert to normal mode only when getting a valid result...

git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@431 959494ce-11ee-0310-bf91-de5d638817bd

diff --git a/lib/guile/autodl b/lib/guile/autodl
index fe454e8..11a5a90 100755 (executable)
--- a/lib/guile/autodl
+++ b/lib/guile/autodl
@@ -326,6 +326,9 @@
   )
 
 (define (handlesr filename fnet peer size slots resptime hash)
   )
 
 (define (handlesr filename fnet peer size slots resptime hash)

+  (if (eq? (cdr (assoc 'search-mode session)) 'wait)
+      (begin (set-cdr! (assoc 'search-mode session) 'normal)
+            (logf "reverting to normal mode")))

   (let ((cl (or (assoc size sr)
                (let ((newp (cons size '()))) (set! sr (append sr (list newp))) newp)))
        (newsr (list
   (let ((cl (or (assoc size sr)
                (let ((newp (cons size '()))) (set! sr (append sr (list newp))) newp)))
        (newsr (list


@@ -515,9 +518,6 @@
                                                        (write-info-file)))))
                                          ((622) ; Search result
                                           (let ((ires (list->vector (dc-intresp resp))))
                                                        (write-info-file)))))
                                          ((622) ; Search result
                                           (let ((ires (list->vector (dc-intresp resp))))

-                                            (if (eq? (cdr (assoc 'search-mode session)) 'wait)
-                                                (begin (set-cdr! (assoc 'search-mode session) 'normal)
-                                                       (logf "reverting to normal mode")))

                                             (if (and ires (= (vector-ref ires 0) srchid)) (apply handlesr (map (lambda (n) (vector-ref ires n)) '(1 2 3 4 5 7 8))))))
                                          
                                          )
                                             (if (and ires (= (vector-ref ires 0) srchid)) (apply handlesr (map (lambda (n) (vector-ref ires n)) '(1 2 3 4 5 7 8))))))
                                          
                                          )