X-Git-Url: http://git.pond.sub.org/?p=eow;a=blobdiff_plain;f=empire.lisp;h=edb8316846ed5ede51dadfbd2b9eac86c7a77118;hp=2f3452e3af8113b120fd87fd0a6873c70231ae7e;hb=96d5b46f8a408652757fb21a801c005697dc45f7;hpb=a4f36e2bf190fa6f14347a00e309af5a3d74f159;ds=sidebyside

diff --git a/empire.lisp b/empire.lisp
index 2f3452e..edb8316 100644
--- a/empire.lisp
+++ b/empire.lisp
@@ -303,20 +303,48 @@
        (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.")))
+  ((parser :initform (xdump:make-parser))
+   (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 parser phase dump-queue dump-index) m
+    (if (xdump:parse-line parser message)
+	;;XXX consider something like a 'pop-mode function
+	(ccase phase
+	  (:meta-meta 
+	   (setf phase :meta-table
+		 parser (xdump:make-parser))
+	   (send-message connection "xdump meta table"))
+	  (:meta-table
+	   (setf phase :table-table
+		 parser (xdump:make-parser))
+	   (send-message connection "xdump table *"))
+	  (:table-table
+	   (setf phase :tables-meta
+		 dump-queue (xdump::table-entries (xdump::get-table "table"))
+		 dump-index 0
+		 parser (xdump:make-parser))
+	   (send-message connection (format nil "xdump meta ~a" (xdump-data::table-name (aref dump-queue 0)))))
+	  (:tables-meta
+	   (setf phase :tables-content
+		 parser (xdump:make-parser))
+	   (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
+			    parser (xdump:make-parser))
+		      (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))