Integrate new xdump

[eow] / empire.lisp

diff --git a/empire.lisp b/empire.lisp
index 2f3452e3af8113b120fd87fd0a6873c70231ae7e..8a1689be7899a089754b8eb98127cd2f2b4bab94 100644 (file)
--- a/empire.lisp
+++ b/empire.lisp
@@ -48,7 +48,8 @@
    (send-queue
     :accessor send-queue
     :initform (locked-queue:create)
-    :documentation "lines outstanding to be sent at next prompt")))
+    :documentation "lines outstanding to be sent at next prompt")
+   (xdump :accessor xdump :initform (xdump:make-parser))))
 
 (defun make-connection (&key (user nil)
                        (password nil)
@@ -303,20 +304,42 @@
        (char= +special-command-char+ (aref line 0))))
 
 (defclass xdump-mode (play-mode)
-  ((table-buffer
-    :initform nil
-    :accessor table-buffer
-    :documentation "Intermediate storage for incomplete table dump.")))
+  ((phase :initform :meta-meta)
+   (dump-queue :initform nil)
+   (dump-index :initform 0)))
 
 (defmethod handle-data ((m xdump-mode) message)
-  (with-slots (connection table-buffer) m
-    (if (char= #\/ (aref message 0))
-       (progn
-         (format t "table: ~a~%" table-buffer)
-         (set-new-mode m 'play-mode)))
-                                       ;XXX check table size
-    (with-input-from-string (s (format nil "(~a)" message))
-      (setf table-buffer (cons (read s) table-buffer)))))
+  (with-slots (connection phase dump-queue dump-index) m
+    (if (xdump:parse-line (xdump connection) message)
+       ;;XXX consider something like a 'pop-mode function
+       (ccase phase
+         (:meta-meta 
+          (setf phase :meta-table)
+          (send-message connection "xdump meta table"))
+         (:meta-table
+          (setf phase :table-table)
+          (send-message connection "xdump table *"))
+         (:table-table
+          (setf phase :tables-meta
+                dump-queue (xdump::table-entries (xdump::get-table "table"))
+                dump-index 0)
+          (send-message connection (format nil "xdump meta ~a" (xdump-data::table-name (aref dump-queue 0)))))
+         (:tables-meta
+          (setf phase :tables-content)
+          (send-message connection (format nil "xdump ~a *" (xdump-data::table-name (aref dump-queue dump-index)))))
+         (:tables-content
+          (if (< dump-index (fill-pointer dump-queue))
+              (progn (setf phase :tables-meta)
+                     (incf dump-index)
+                     (loop while (and (< dump-index (fill-pointer dump-queue))
+                                      (let ((dump-queue-entry (aref dump-queue dump-index)))
+                                        (or (null dump-queue-entry)
+                                            (string= "meta" (xdump-data::table-name dump-queue-entry)))))
+                        do (incf dump-index))
+                     (if (and (<= dump-index (fill-pointer dump-queue))
+                              (not (null (aref dump-queue dump-index))))
+                         (send-message connection (format nil "xdump meta ~a" (xdump-data::table-name (aref dump-queue dump-index))))))
+              (set-new-mode (connection-mode connection) 'play-mode)))))))
 
 (defmethod special-xup ((c connection))
   (send-message c "xdump meta meta" :next-mode 'xdump-mode))