@@ -14,34 +14,55 @@
 // 
 //     You should have received a copy of the GNU General Public License
 //     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 digraph G {
 
-    subgraph cluster_1 {
+        label = "Server Start Sequences";
+        color=brown;
+
+subgraph cluster_1 {
         node [style=filled,shape=box];
 
-	check_available_queue       -> remove_entries_over_10s_old;
-	remove_entries_over_10s_old -> set_available [label="num_avail < 3"];
-	remove_entries_over_10s_old -> exit [label="num_avail > 2"];
-
-	set_available               -> delay_2s;
-	delay_2s          -> check_place_in_queue;
-
-	check_place_in_queue        -> "http:transport-launch" [label="at head"];
-	check_place_in_queue        -> exit [label="not at head"];
-
-	"client:login"              -> "server:shutdown" [label="login failed"];
-	"server:shutdown"           -> exit;	
+	label="Finding Server";
+
+	START;
+        HaveServ [label="Look at .servinfo\nfiles for prime main"]; 
+	AskPrime [label="Ask Prime for main"];
+	PingPrime [label="Ping Prime"];
+	AskPrime [label="Ask .servinfo prime for server"];
+	StartServ [label="Launch Server Process for main.db"];
+
+      	START -> HaveServ;
+	HaveServ -> PingPrime;
+	PingPrime -> AskPrime [label="Got response"];
+	PingPrime -> StartServ [label="No reponse"];
+	HaveServ -> StartServ [label="No files"];
+	StartServ -> "Delay 2s" -> START;
+        AskPrime -> DONE;
+
+//	check_available_queue       -> remove_entries_over_10s_old;
+//	remove_entries_over_10s_old -> set_available [label="num_avail < 3"];
+//	remove_entries_over_10s_old -> exit [label="num_avail > 2"];
+//
+//	set_available               -> delay_2s;
+//	delay_2s          -> check_place_in_queue;
+//
+//	check_place_in_queue        -> "http:transport-launch" [label="at head"];
+//	check_place_in_queue        -> exit [label="not at head"];
+//
+//	"client:login"              -> "server:shutdown" [label="login failed"];
+//	"server:shutdown"           -> exit;
+	}
 
 	subgraph cluster_2 {
-		"http:transport-launch"       -> "http:transport-run";
-		"http:transport-launch"       -> "http:transport-keep-running";
-
-		"http:transport-keep-running" -> "tests running?";
-		"tests running?"              -> "client:login" [label=yes];
-		"tests running?"              -> "server:shutdown" [label=no];
-		"client:login"                -> delay_5s [label="login ok"];
+//		"http:transport-launch"       -> "http:transport-run";
+//		"http:transport-launch"       -> "http:transport-keep-running";
+//
+//		"http:transport-keep-running" -> "tests running?";
+//		"tests running?"              -> "client:login" [label=yes];
+//		"tests running?"              -> "server:shutdown" [label=no];
+//		"client:login"                -> delay_5s [label="login ok"];
 		delay_5s                      -> "http:transport-keep-running";
 	}
 
 	// start_server -> "server_running?";
 	// "server_running?" -> set_available [label="no"];
@@ -66,13 +87,6 @@
 	// handle_requests -> shutdown_request;
 	// start_shutdown -> shutdown_delay;
 	// shutdown_request -> shutdown_delay;
 	// shutdown_delay -> exit;
 	
-        label = "server:launch";
-        color=brown;
-    }
-
-//     client_start_server -> start_server;
-//     handle_requests -> read_write;
-//     read_write -> handle_requests;
-}
+    }