Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -386,6 +386,51 @@
 		 (run-n-wait bup-exe params: bup-restore-params print-cmd: #f)
 		 ;; (mutex-unlock! bup-mutex)
 		 (mt:test-set-state-status-by-id run-id test-id "COMPLETED" #f #f)))
 	     (debug:print-error 0 *default-log-port* "No archive path in the record for run-id=" run-id " test-id=" test-id))))
      (filter vector? tests))))
-	 
+
+;; from an archive get a specific path - works ONLY with bup for now
+;;
+(define (archive:bup-get-data archive-command run-id run-name tests rp-mutex bup-mutex)
+  (if (null? tests)
+      (debug:print-info 0 *default-log-port* "get-data called with no matching tests to operate on.")
+      (let* ((bup-exe      (or (configf:lookup *configdat* "archive" "bup") "bup"))
+	     (linktree     (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree")))
+	     (test-dat     (car tests))
+	     (destpath     (args:get-arg "-dest")))
+
+	;; When restoring test-dat will initially contain an old and invalid path to the test
+	(let* ((item-path         (db:test-get-item-path test-dat))
+	       (test-name         (db:test-get-testname  test-dat))
+	       (test-id           (db:test-get-id        test-dat))
+	       (run-id            (db:test-get-run_id    test-dat))
+	       (keyvals           (rmt:get-key-val-pairs run-id))
+	       (target            (string-intersperse (map cadr keyvals) "/"))
+	       
+	       (toplevel/children (and (db:test-get-is-toplevel test-dat)
+				       (> (rmt:test-toplevel-num-items run-id test-name) 0)))
+	       (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path)))
+	       ;; note the trailing slash to get the dir inspite of it being a link
+	       (test-path         (conc linktree "/" test-partial-path))
+	       (mutex-lock! rp-mutex)
+	       (mutex-unlock! rp-mutex)
+	       (archive-block-id        (db:test-get-archived test-dat))
+	       (archive-block-info      (rmt:test-get-archive-block-info archive-block-id))
+	       (archive-path            (if (vector? archive-block-info)
+					    (vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info
+					    #f)) ;; no archive found?
+	       (archive-internal-path   (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path)))
+	  
+	  (if (and archive-path ;; no point in proceeding if there is no actual archive
+		   (not toplevel/children))
+	      (begin
+		;; bup -d /tmp/matt/adisk1/2015_q1/fullrun_e1a40/ restore -C /tmp/seeme fullrun-30/latest/ubuntu/nfs/none/w02.1.20.54_b/
+		
+		;; DO BUP RESTORE
+		(let* (;; new-test-path won't work - must use best-disk instead? Nope, new-test-path but tack on /..
+		       (bup-restore-params  (list "-d" archive-path "restore" "-C" (or destpath "data") " " archive-internal-path)))
+		  (debug:print-info 0 *default-log-port* "Restoring archived data to " (or destpath "data") " from archive in " archive-path " ... " archive-internal-path)
+		  ;; (mutex-lock! bup-mutex)
+		  (run-n-wait bup-exe params: bup-restore-params print-cmd: #f)))
+	      (debug:print-error 0 *default-log-port* "No archive path in the record for run-id=" run-id " test-id=" test-id))))))
+

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -240,11 +240,11 @@
                             will substitute %s for the sheet name in generating 
                             multiple sheets)
   -o                      : output file for refdb2dat (defaults to stdout)
   -archive cmd            : archive runs specified by selectors to one of disks specified
                             in the [archive-disks] section.
-                            cmd: keep-html, restore, save, save-remove
+                            cmd: keep-html, restore, save, save-remove, get (use -dest to set destination)
   -generate-html          : create a simple html dashboard for browsing your runs
   -generate-html-structure  : create a top level html veiw to list targets/runs and a Run view within each run directory.  
   -list-run-time          : list time requered to complete runs. It supports following switches
                             -run-patt <patt> -target-patt <patt> -dumpmode <csv,json,plain-text>
   -list-test-time	  : list time requered to complete each test in a run. It following following arguments
@@ -312,10 +312,11 @@
 			"-rerun"
 
 			"-days"
 			"-rename-run"
 			"-to"
+			"-dest"
 			;; values and messages
 			":category"
 			":variable"
 			":value"
 			":expected"

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -2169,18 +2169,21 @@
 		   ((archive)
 		    (debug:print 1 *default-log-port* "Archiving/restoring (" (args:get-arg "-archive") ") data for run: " runkey " " (db:get-value-by-header run header "runname"))
 		    (set! worker-thread
 			  (make-thread
 			   (lambda ()
-			     (case (string->symbol (args:get-arg "-archive"))
+			     (let ((op (string->symbol (args:get-arg "-archive"))))
+			       (case op
 			       ((save save-remove keep-html)
-				(archive:run-bup (args:get-arg "-archive") run-id run-name tests rp-mutex bup-mutex))
+				(archive:run-bup op run-id run-name tests rp-mutex bup-mutex))
 			       ((restore)
-				(archive:bup-restore (args:get-arg "-archive") run-id run-name tests rp-mutex bup-mutex))
+				(archive:bup-restore op run-id run-name tests rp-mutex bup-mutex))
+			       ((get)
+				(archive:bup-get-data op run-id run-name tests rp-mutex bup-mutex))
 			       (else 
-				(debug:print-error 0 *default-log-port* "unrecognised sub command to -archive. Run \"megatest\" to see help")
-				(exit))))
+				(debug:print-error 0 *default-log-port* "unrecognised sub command " op " for -archive. Run \"megatest\" to see help")
+				(exit)))))
 			   "archive-bup-thread"))
 		    (thread-start! worker-thread))
 		   (else
 		    (debug:print-info 0 *default-log-port* "action not recognised " action)))