From 37d2649ecfb7c125b489f52be18a3c16700d9b53 Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Tue, 16 May 2006 22:24:58 +0000
Subject: [PATCH] Convert all of the new template code to PHP "classes." This
 was not as much "fun" as the Perl conversion, but nothing about PHP is as
 much fun as it is in perl.

---
 tbsetup/template_create.in |    5 +-
 www/experimentrun_show.php |   26 +-
 www/instance_show.php      |   24 +-
 www/showexp.php3           |   32 +-
 www/showlogfile_sup.php3   |    5 +-
 www/showstuff.php3         |   12 +-
 www/showuser.php3          |    2 +-
 www/spitnsdata.php3        |   16 +-
 www/swapexp.php3           |   28 +-
 www/template_create.php    |   24 +-
 www/template_defs.php      | 1803 ++++++++++++++++++------------------
 www/template_exprun.php    |   90 +-
 www/template_graph.php     |   44 +-
 www/template_history.php   |   15 +-
 www/template_metadata.php  |  123 +--
 www/template_modify.php    |   47 +-
 www/template_show.php      |  138 +--
 www/template_swapin.php    |   55 +-
 18 files changed, 1190 insertions(+), 1299 deletions(-)

diff --git a/tbsetup/template_create.in b/tbsetup/template_create.in
index 998bfc725..7ebe147b7 100644
--- a/tbsetup/template_create.in
+++ b/tbsetup/template_create.in
@@ -34,7 +34,7 @@ sub usage()
 	  "-E <str> - A pithy sentence describing the template\n".
 	  "-g <gid> - The group in which to create the experiment\n".
 	  "<pid>    - The project in which to create the experiment\n".
-	  "<tid>    - The template name (unique, alphanumeric, no blanks)\n".
+	  "<tid>    - The template name (alphanumeric, no blanks)\n".
 	  "<input>  - Input file for experiment.\n");
     exit(-1);
 }
@@ -305,6 +305,9 @@ system("$makegraph $guid");
 fatal(-1, "Error generating template graph.")
     if ($?);
 
+# Web interface depends on this line. Bad; need another way to send
+# back the newly generated guid/version.
+print "Template $guid/$vers has been created\n";
 exit(0);
 
 #
diff --git a/www/experimentrun_show.php b/www/experimentrun_show.php
index c7955b6d1..db86c237d 100644
--- a/www/experimentrun_show.php
+++ b/www/experimentrun_show.php
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # Only known and logged in users ...
@@ -52,28 +52,26 @@ if (!TBvalid_integer($runidx)) {
 PAGEHEADER("Experiment Run");
 
 #
-# Check to make sure this is a valid template.
+# Check to make sure this is a valid template and user has permission.
 #
-if (! TBValidExperimentTemplate($guid, $version)) {
+$template = Template::Lookup($guid, $version);
+if (!$template) {
     USERERROR("The experiment template $guid/$version is not a valid ".
               "experiment template!", 1);
 }
-if (! TBIsTemplateInstanceExperiment($exptidx)) {
+if (! $template->AccessCheck($uid, $TB_EXPT_READINFO)) {
+    USERERROR("You do not have permission to view experiment template ".
+	      "$guid/$version!", 1);
+}
+$instance = TemplateInstance::LookupByExptidx($exptidx);
+if (!$instance) {
     USERERROR("The instance $exptidx is not a valid instance in ".
               "template $guid/$version!", 1);
 }
-if (! TBValidExperimentRun($exptidx, $runidx)) {
+if (! $instance->ValidRun($runidx)) {
     USERERROR("The run $runidx is not a valid experiment run!", 1);
 }
 
-#
-# Verify Permission.
-#
-if (! TBExptTemplateAccessCheck($uid, $guid, $TB_EXPT_READINFO)) {
-    USERERROR("You do not have permission to view experiment template ".
-	      "$guid/$version!", 1);
-}
-
 echo "<font size=+2>Experiment Run<b> " .
          MakeLink("instance",
 		  "guid=$guid&version=$version&exptidx=$exptidx",
@@ -82,7 +80,7 @@ echo "<font size=+2>Experiment Run<b> " .
 echo "<br><br>\n";
 
 
-SHOWEXPERIMENTRUN($exptidx, $runidx);
+$instance->ShowRun($runidx);
 
 #
 # Standard Testbed Footer
diff --git a/www/instance_show.php b/www/instance_show.php
index 91da197ea..42bd9dd45 100644
--- a/www/instance_show.php
+++ b/www/instance_show.php
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # Only known and logged in users ...
@@ -45,24 +45,22 @@ if (!TBvalid_integer($exptidx)) {
 PAGEHEADER("Template Instance");
 
 #
-# Check to make sure this is a valid template.
+# Check to make sure this is a valid template and user has permission.
 #
-if (! TBValidExperimentTemplate($guid, $version)) {
+$template = Template::Lookup($guid, $version);
+if (!$template) {
     USERERROR("The experiment template $guid/$version is not a valid ".
               "experiment template!", 1);
 }
-if (! TBIsTemplateInstanceExperiment($exptidx)) {
-    USERERROR("The instance $exptidx is not a valid instance in ".
-              "template $guid/$version!", 1);
-}
-
-#
-# Verify Permission.
-#
-if (! TBExptTemplateAccessCheck($uid, $guid, $TB_EXPT_READINFO)) {
+if (! $template->AccessCheck($uid, $TB_EXPT_READINFO)) {
     USERERROR("You do not have permission to view experiment template ".
 	      "$guid/$version!", 1);
 }
+$instance = TemplateInstance::LookupByExptidx($exptidx);
+if (!$instance) {
+    USERERROR("The instance $exptidx is not a valid instance in ".
+              "template $guid/$version!", 1);
+}
 
 echo "<font size=+2>Template Instance <b>" .
          MakeLink("template",
@@ -70,7 +68,7 @@ echo "<font size=+2>Template Instance <b>" .
       "</b></font>\n";
 echo "<br><br>\n";
 
-SHOWTEMPLATEINSTANCE($guid, $version, $exptidx, 1);
+$instance->Show(1);
 
 #
 # Standard Testbed Footer
diff --git a/www/showexp.php3 b/www/showexp.php3
index a64165a19..ff4546cac 100644
--- a/www/showexp.php3
+++ b/www/showexp.php3
@@ -72,7 +72,7 @@ sajax_handle_client_request();
 
 # Faster to do this after the sajax stuff
 include("showstuff.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # Need some DB info.
@@ -97,11 +97,15 @@ $panic_date = $row["panic_date"];
 $lockdown   = $row["lockdown"];
 
 # Template Instance Experiments get special treatment in this page.
-$isinstance = ($EXPOSETEMPLATES &&
-	       TBIsTemplateInstanceExperiment($expindex) ? 1 : 0);
-if ($isinstance) {
-    $tag = "Template Instance";
-    TBPidEid2Template($pid, $eid, $guid, $version, $instance_idx);
+$instance = NULL;
+if ($EXPOSETEMPLATES) {
+     $instance = TemplateInstance::LookupByExptidx($expindex);
+
+     if (! is_null($instance)) {
+	 $tag = "Template Instance";
+	 $guid = $instance->guid();
+	 $vers = $instance->vers();
+     }
 }
 
 #
@@ -189,7 +193,7 @@ if ($expstate) {
 	    }
 	    elseif ($expstate == $TB_EXPTSTATE_ACTIVE ||
 		    ($expstate == $TB_EXPTSTATE_PANICED && $isadmin)) {
-		WRITESUBMENUBUTTON(($isinstance ?
+		WRITESUBMENUBUTTON(($instance ?
 				    "Terminate Instance" :
 				    "Swap Experiment Out"),
 			 "swapexp.php3?inout=out&pid=$exp_pid&eid=$exp_eid");
@@ -201,23 +205,23 @@ if ($expstate) {
 	    }
 	}
     
-	if (!$isinstance && $expstate != $TB_EXPTSTATE_PANICED) {
+	if (!$instance && $expstate != $TB_EXPTSTATE_PANICED) {
 	    WRITESUBMENUBUTTON("Terminate Experiment",
 			       "endexp.php3?pid=$exp_pid&eid=$exp_eid");
 	}
 
         # Batch experiments can be modifed only when paused.
-	if (!$isinstance && ($expstate == $TB_EXPTSTATE_SWAPPED ||
+	if (!$instance && ($expstate == $TB_EXPTSTATE_SWAPPED ||
 	    (!$isbatch && $expstate == $TB_EXPTSTATE_ACTIVE))) {
 	    WRITESUBMENUBUTTON("Modify Experiment",
 			       "modifyexp.php3?pid=$exp_pid&eid=$exp_eid");
 	}
     }
 
-    if ($isinstance && $expstate == $TB_EXPTSTATE_ACTIVE) {
+    if ($instance && $expstate == $TB_EXPTSTATE_ACTIVE) {
 	WRITESUBMENUBUTTON("Start New Experiment Run",
 			   "template_exprun.php?action=start&guid=$guid".
-			   "&version=$version&eid=$exp_eid");
+			   "&version=$vers&eid=$exp_eid");
     }
     
     if ($expstate == $TB_EXPTSTATE_ACTIVE) {
@@ -293,7 +297,7 @@ WRITESUBMENUDIVIDER();
 WRITESUBMENUBUTTON("Show History",
 		   "showstats.php3?showby=expt&which=$expindex");
 
-if (!$isinstance && STUDLY()) {
+if (!$instance && STUDLY()) {
     WRITESUBMENUBUTTON("Duplicate Experiment",
 		       "beginexp_html.php3?copyid=${exp_pid},${exp_eid}");
 }
@@ -408,11 +412,11 @@ if (TBExptFirewall($exp_pid, $exp_eid) &&
 }
 SUBPAGEEND();
 
-if ($isinstance &&
+if ($instance &&
     ($expstate == $TB_EXPTSTATE_ACTIVE ||
      $expstate == $TB_EXPTSTATE_PANICED ||
      $expstate == $TB_EXPTSTATE_ACTIVATING)) {
-    SHOWTEMPLATEINSTANCEBINDINGS($guid, $version, $instance_idx);
+    $instance->ShowBindings();
 }
 
 #
diff --git a/www/showlogfile_sup.php3 b/www/showlogfile_sup.php3
index ce7d3ca96..1d2669229 100644
--- a/www/showlogfile_sup.php3
+++ b/www/showlogfile_sup.php3
@@ -129,7 +129,10 @@ function STARTLOG($pid, $eid)
           </script>\n";
 
     echo "<br>\n";
-    echo "<img id='busy' src='busy.gif'><span id='loading'> Loading...</span>";
+    echo "<center>\n";
+    echo "<img id='busy' src='busy.gif'>
+                   <span id='loading'> Working ...</span>";
+    echo "</center>\n";
     echo "<br>\n";
     
     echo "<div><iframe id='outputframe' src='busy.gif' ".
diff --git a/www/showstuff.php3 b/www/showstuff.php3
index c074875ba..524259ca4 100644
--- a/www/showstuff.php3
+++ b/www/showstuff.php3
@@ -9,6 +9,7 @@
 #
 # Functions to dump out various things.  
 #
+include_once("template_defs.php");
 
 #
 # A project
@@ -863,16 +864,17 @@ function SHOWEXP($pid, $eid, $short = 0, $sortby = "") {
           </tr>\n";
 
     if (!$short) {
-	$isinstance = (TBIsTemplateInstanceExperiment($exptidx) ? 1 : 0);
+	$instance = TemplateInstance::LookupByExptidx($exptidx);
 
-	if ($isinstance) {
-	    TBPidEid2Template($pid, $eid, $guid, $version, $instance_idx);
+	if (! is_null($instance)) {
+	    $guid = $instance->guid();
+	    $vers = $instance->vers();
 	
 	    echo "<tr>
                     <td>Template: </td>
                     <td class=\"left\">
-                       <a href='template_show.php?guid=$guid&version=$version'>
-                          $guid/$version</a></td>
+                       <a href='template_show.php?guid=$guid&version=$vers'>
+                          $guid/$vers</a></td>
                   </tr>\n";
 	}
 
diff --git a/www/showuser.php3 b/www/showuser.php3
index 314a54cb4..bc42e7daa 100644
--- a/www/showuser.php3
+++ b/www/showuser.php3
@@ -6,7 +6,7 @@
 #
 include("defs.php3");
 include("showstuff.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # Only known and logged in users can do this.
diff --git a/www/spitnsdata.php3 b/www/spitnsdata.php3
index ba0c8ff1a..a4d5262d0 100644
--- a/www/spitnsdata.php3
+++ b/www/spitnsdata.php3
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # Only known and logged in users can begin experiments.
@@ -109,19 +109,17 @@ if (isset($guid) && isset($version)) {
     if (!TBvalid_tinyint($version)) {
 	PAGEARGERROR("Invalid GUID version");
     }
+
     #
-    # Check to make sure this is a valid template.
+    # Check to make sure this is a valid template and user has permission.
     #
-    if (! TBValidExperimentTemplate($guid, $version)) {
+    $template = Template::Lookup($guid, $version);
+    if (!$template) {
 	USERERROR("The experiment template $guid/$version is not a valid ".
 		  "experiment template!", 1);
     }
-
-    #
-    # Verify Permission.
-    #
-    if (! TBExptTemplateAccessCheck($uid, $guid, $TB_EXPT_READINFO)) {
-	USERERROR("You do not have permission to view experiment template ".
+    if (! $template->AccessCheck($uid, $TB_EXPT_READINFO)) {
+	USERERROR("You do not have permission to modify experiment template ".
 		  "$guid/$version!", 1);
     }
     header("Content-Type: text/plain");
diff --git a/www/swapexp.php3 b/www/swapexp.php3
index 02b8692ff..649b60404 100644
--- a/www/swapexp.php3
+++ b/www/swapexp.php3
@@ -6,7 +6,7 @@
 #
 include("defs.php3");
 include("showstuff.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # Only known and logged in users can end experiments.
@@ -100,9 +100,13 @@ if (! TBExptAccessCheck($uid, $exp_pid, $exp_eid, $TB_EXPT_MODIFY)) {
 }
 
 # Template Instance Experiments get special treatment in this page.
-$isinstance = $EXPOSETEMPLATES && TBIsTemplateInstanceExperiment($exptidx);
-if ($isinstance && $inout != "out") {
-    PAGEARGERROR("Invalid action for template instance");
+$instance = NULL;
+if ($EXPOSETEMPLATES) {
+     $instance = TemplateInstance::LookupByExptidx($exptidx);
+
+     if (! is_null($instance) && $inout != "out") {
+	 PAGEARGERROR("Invalid action for template instance");
+     }
 }
 
 # Convert inout to informative text.
@@ -133,7 +137,7 @@ elseif (!strcmp($inout, "restart")) {
     $action = "restart";
 }
 
-if ($isinstance) {
+if ($instance) {
     echo "<font size=+2>Template Instance <b>";
 }
 else {
@@ -162,7 +166,7 @@ if (!$confirmed) {
     if ($force) {
 	echo "<font color=red><br>forcibly</br></font> ";
     }
-    if ($isinstance) {
+    if ($instance) {
 	echo "terminate template instance";
     }
     else {
@@ -226,10 +230,10 @@ if (!$confirmed) {
 #
 TBGroupUnixInfo($exp_pid, $exp_gid, $unix_gid, $unix_name);
 
-if ($isinstance) {
-    if (! TBPidEid2Template($exp_pid, $exp_eid, $guid, $version, $instidx)) {
-	TBERROR("Could not map $pid/$eid to its template!", 1);
-    }
+if ($instance) {
+    $guid = $instance->guid();
+    $version = $instance->vers();
+    
     echo "<br>\n";
     echo "<b>Terminating template instance!</b> ... ";
     echo "this will take a few minutes; please be patient.";
@@ -253,7 +257,7 @@ $args = ($idleswap ? "-i" : ($autoswap ? "-a" : ""));
 $retval = SUEXEC($uid, "$exp_pid,$unix_gid",
 		  ($force ?
 		   "webidleswap $args $exp_pid $exp_eid" :
-		   ($isinstance ?
+		   ($instance ?
 		    "webtemplate_swapout -e $exp_eid $guid/$version" :
 		    "webswapexp -s $inout $exp_pid $exp_eid")),
 		 SUEXEC_ACTION_IGNORE);
@@ -279,7 +283,7 @@ if ($retval) {
     echo "<blockquote><pre>$suexec_output<pre></blockquote>";
 }
 else {
-    if ($isinstance) {
+    if ($instance) {
 	STARTLOG($pid, $eid);
     }
     elseif ($isbatch) {
diff --git a/www/template_create.php b/www/template_create.php
index e1162699d..686df6e27 100644
--- a/www/template_create.php
+++ b/www/template_create.php
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # No PAGEHEADER since we spit out a Location header later. See below.
@@ -310,9 +310,6 @@ if (!isset($formfields[tid]) || $formfields[tid] == "") {
 elseif (!TBvalid_eid($formfields[tid])) {
     $errors["Template ID"] = TBFieldErrorString();
 }
-elseif (TBValidExperimentTemplate($formfields[pid], $formfields[tid])) {
-    $errors["Template ID"] = "Already in use";
-}
 
 #
 # Description:
@@ -507,23 +504,26 @@ if ($retval) {
     return;
 }
 
-unset($guid);
-if (TBPidTid2Template($pid, $tid, $guid, $version)) {
+#
+# Parse the last line of output. Ick.
+#
+if (preg_match("/^Template\s+(\w+)\/(\w+)\s+/",
+	       $suexec_output_array[count($suexec_output_array)-1],
+	       $matches)) {
+    $guid = $matches[1];
+    $vers = $matches[2];
+    
     echo "<script type='text/javascript' language='javascript'>\n";
-    echo "PageReplace('template_show.php?guid=$guid&version=$version');\n";
+    echo "PageReplace('template_show.php?guid=$guid&version=$vers');\n";
     echo "</script>\n";
 }
 
 #
 # In case the above fails.
 #
-echo "Done!";
+echo "<center><b>Done!</b></center>";
 echo "<br><br>\n";
 
-if (isset($guid)) {
-    SHOWTEMPLATE($guid, $version);
-}
-
 #
 # Standard Testbed Footer
 # 
diff --git a/www/template_defs.php b/www/template_defs.php
index 4973ebefd..61fd600ee 100644
--- a/www/template_defs.php
+++ b/www/template_defs.php
@@ -4,280 +4,257 @@
 # Copyright (c) 2006 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 #
-# Grab a new GUID.
+# The template class is really just a wrapper around the DB data, plus
+# some access routines and printing functions. 
 #
-function TBNewGUID(&$newguid)
+class Template
 {
-    DBQueryFatal("lock tables emulab_indicies write");
-
-    $query_result = 
-	DBQueryFatal("select idx from emulab_indicies ".
-		     "where name='next_guid'");
-
-    $row = mysql_fetch_array($query_result);
-    $newguid = $row['idx'];
-    $nextidx = $newguid + 1;
+    var	$template;
     
-    DBQueryFatal("update emulab_indicies set idx='$nextidx' ".
-		 "where name='next_guid'");
-
-    DBQueryFatal("unlock tables");
-    return 0;
-}
-
-#
-# Confirm a valid experiment template
-#
-# usage TBValidExperimentTemplate($guid, $version)
-#       returns 1 if valid
-#       returns 0 if not valid
-#
-function TBValidExperimentTemplate($guid, $version)
-{
-    $guid    = addslashes($guid);
-    $version = addslashes($version);
-
-    $query_result =
-	DBQueryFatal("select guid from experiment_templates ".
-		     "where guid='$guid' and vers='$version'");
+    function Template($guid, $vers) {
+	$guid = addslashes($guid);
+	$vers = addslashes($vers);
+	
+	$query_result =
+	    DBQueryWarn("select * from experiment_templates ".
+			"where guid='$guid' and vers='$vers'");
 
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+	if (!$query_result || !mysql_num_rows($query_result)) {
+	    $this->template = NULL;
+	    return;
+	}
+	$this->template = mysql_fetch_array($query_result);
     }
-    return 1;
-}
 
-#
-# Check if a template is hidden.
-#
-# usage TBIsExperimentTemplateHidden($guid, $version)
-#       returns 1 if hidden
-#       returns 0 if visible
-#
-function TBIsExperimentTemplateHidden($guid, $version)
-{
-    $guid    = addslashes($guid);
-    $version = addslashes($version);
-
-    $query_result =
-	DBQueryFatal("select hidden from experiment_templates ".
-		     "where guid='$guid' and vers='$version'");
-
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+    # Hmm, how does one cause an error in a php constructor?
+    function IsValid() {
+	return !is_null($this->template);
     }
-    
-    $row  = mysql_fetch_array($query_result);
-    
-    return $row[hidden];
-}
-
-#
-# Check if a template is the root template (cannot be hidden)
-#
-# usage TBIsRootTemplate($guid, $version)
-#       returns 1 if hidden
-#       returns 0 if visible
-#
-function TBIsRootTemplate($guid, $version)
-{
-    $guid    = addslashes($guid);
-    $version = addslashes($version);
 
-    $query_result =
-	DBQueryFatal("select parent_guid from experiment_templates ".
-		     "where guid='$guid' and vers='$version' and ".
-		     "      parent_guid is null");
+    # Do class level lookup.
+    function Lookup($guid, $vers) {
+	$foo = new Template($guid, $vers);
 
-    return mysql_num_rows($query_result);
-}
+	if ($foo->IsValid())
+	    return $foo;
+	return null;
+    }
+    # Do class level lookup for the root template.
+    function LookupRoot($guid) {
+	$foo = new Template($guid, 1); 
 
-#
-# Experiment Template permission checks; using the experiment access checks.
-#
-# Usage: TBExptTemplateAccessCheck($uid, $guid, $access_type)
-#	 returns 0 if not allowed.
-#        returns 1 if allowed.
-# 
-function TBExptTemplateAccessCheck($uid, $guid, $access_type)
-{
-    global $TB_EXPT_READINFO;
-    global $TB_EXPT_MODIFY;
-    global $TB_EXPT_DESTROY;
-    global $TB_EXPT_UPDATE;
-    global $TB_EXPT_MIN;
-    global $TB_EXPT_MAX;
-    global $TBDB_TRUST_USER;
-    global $TBDB_TRUST_LOCALROOT;
-    global $TBDB_TRUST_GROUPROOT;
-    global $TBDB_TRUST_PROJROOT;
-    $mintrust;
-
-    if ($access_type < $TB_EXPT_MIN ||
-	$access_type > $TB_EXPT_MAX) {
-	TBERROR("Invalid access type: $access_type!", 1);
+	if ($foo->IsValid())
+	    return $foo;
+	return null;
     }
 
     #
-    # Admins do whatever they want!
-    # 
-    if (ISADMIN()) {
-	return 1;
-    }
-    $guid = addslashes($guid);
+    # Refresh a template instance by reloading from the DB.
+    #
+    function Refresh() {
+	if (! $this->IsValidTemplate())
+	    return -1;
 
-    $query_result =
-	DBQueryFatal("select pid,gid,uid from experiment_templates where ".
-		     "guid='$guid' limit 1");
+	$guid = $this->guid();
+	$vers = $this->vers();
     
-    if (mysql_num_rows($query_result) == 0) {
+	$query_result =
+	    DBQueryWarn("select * from experiment_templates ".
+			"where guid='$guid' and vers='$vers'");
+
+	if (!$query_result || !mysql_num_rows($query_result)) {
+	    $this->template = NULL;
+	    return -1;
+	}
+	$this->template = mysql_fetch_array($query_result);
 	return 0;
     }
-    $row  = mysql_fetch_array($query_result);
-    $pid  = $row[pid];
-    $gid  = $row[gid];
-    $head = $row[uid];
 
-    if ($access_type == $TB_EXPT_READINFO) {
-	$mintrust = $TBDB_TRUST_USER;
+    # accessors
+    function guid() {
+	return (is_null($this->template) ? -1 : $this->template['guid']);
     }
-    else {
-	$mintrust = $TBDB_TRUST_LOCALROOT;
+    function vers() {
+	return (is_null($this->template) ? -1 : $this->template['vers']);
     }
-
-    #
-    # Either proper permission in the group, or group_root in the project.
-    # This lets group_roots muck with other peoples experiments, including
-    # those in groups they do not belong to.
-    #
-    return TBMinTrust(TBGrpTrust($uid, $pid, $gid), $mintrust) ||
-	TBMinTrust(TBGrpTrust($uid, $pid, $pid), $TBDB_TRUST_GROUPROOT);
-}
-
-# Helper function
-function ShowItem($tag, $value, $default = "&nbsp")
-{
-    if (!isset($value)) {
-	$value = $default;
+    function pid() {
+	return (is_null($this->template) ? -1 : $this->template['pid']);
     }
-    echo "<tr><td>${tag}: </td><td class=left>$value</td></tr>\n";
-}
-
-function MakeLink($which, $args, $text)
-{
-    $page = "";
-    
-    if ($which == "project") {
-	$page = "showproject.php3";
+    function gid() {
+	return (is_null($this->template) ? -1 : $this->template['gid']);
     }
-    elseif ($which == "user") {
-	$page = "showuser.php3";
+    function eid() {
+	return (is_null($this->template) ? -1 : $this->template['eid']);
     }
-    elseif ($which == "template") {
-	$page = "template_show.php";
+    function tid() {
+	return (is_null($this->template) ? -1 : $this->template['tid']);
     }
-    elseif ($which == "metadata") {
-	$page = "template_metadata.php";
+    function uid() {
+	return (is_null($this->template) ? -1 : $this->template['uid']);
     }
-    elseif ($which == "instance") {
-	$page = "instance_show.php";
+    function IsHidden() {
+	return (is_null($this->template) ? -1 : $this->template['hidden']);
     }
-    elseif ($which == "run") {
-	$page = "experimentrun_show.php";
+    function created() {
+	return (is_null($this->template) ? -1 : $this->template['created']);
+    }
+    function description() {
+	return (is_null($this->template) ? -1 :
+		$this->template['description']);
+    }
+    function parent_guid() {
+	return (is_null($this->template) ? -1 :$this->template['parent_guid']);
+    }
+    function parent_vers() {
+	return (is_null($this->template) ? -1 :$this->template['parent_vers']);
     }
-    return "<a href=${page}?${args}>$text</a>";
-}
 
-#
-# Display a template in its own table.
-#
-function SHOWTEMPLATE($guid, $version)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_templates ".
-		     "where guid='$guid' and vers='$version'");
+    # The root template has no parent guid.
+    function IsRoot() {
+	if (is_null($this->template))
+	    return -1;
 
-    if (!mysql_num_rows($query_result)) {
-	USERERROR("Experiment Template $guid/$version is no longer a ".
-		  "valid template!", 1);
+	return is_null($this->template['parent_guid']);
     }
 
-    $row = mysql_fetch_array($query_result);
+    function AccessCheck($uid, $access_type) {
+	global $TB_EXPT_READINFO;
+	global $TB_EXPT_MODIFY;
+	global $TB_EXPT_DESTROY;
+	global $TB_EXPT_UPDATE;
+	global $TB_EXPT_MIN;
+	global $TB_EXPT_MAX;
+	global $TBDB_TRUST_USER;
+	global $TBDB_TRUST_LOCALROOT;
+	global $TBDB_TRUST_GROUPROOT;
+	global $TBDB_TRUST_PROJROOT;
+	$mintrust;
+
+	if ($access_type < $TB_EXPT_MIN ||
+	    $access_type > $TB_EXPT_MAX) {
+	    TBERROR("Invalid access type: $access_type!", 1);
+	}
 
-    #
-    # We need the metadata guid/version for the TID and description since
-    # they are mungable metadata.
-    #
-    if (! TBTemplateMetadataLookupGUID($guid, $version, "TID",
-				       &$tid_guid, &$tid_version)) {
-	TBERROR("Could not find TID guid/vers for $guid/$version", 1);
-    }
-    if (! TBTemplateMetadataLookupGUID($guid, $version, "description",
-				       &$desc_guid, &$desc_version)) {
-	TBERROR("Could not find description guid/vers for $guid/$version", 1);
+        #
+        # Admins do whatever they want!
+        # 
+	if (ISADMIN()) {
+	    return 1;
+	}
+	$pid = $this->pid();
+	$gid = $this->gid();
+
+	if ($access_type == $TB_EXPT_READINFO) {
+	    $mintrust = $TBDB_TRUST_USER;
+	}
+	else {
+	    $mintrust = $TBDB_TRUST_LOCALROOT;
+	}
+
+        #
+        # Either proper permission in the group, or group_root in the project.
+        # This lets group_roots muck with other peoples experiments, including
+        # those in groups they do not belong to.
+        #
+	return TBMinTrust(TBGrpTrust($uid, $pid, $gid), $mintrust) ||
+	    TBMinTrust(TBGrpTrust($uid, $pid, $pid), $TBDB_TRUST_GROUPROOT);
     }
-    
+
     #
-    # Generate the table.
+    # Display a template in its own table.
     #
-    echo "<center>
-           <h3>Details</h3>
-          </center>\n";
-
-    echo "<table align=center cellpadding=2 cellspacing=2 border=1>\n";
-    
-    ShowItem("GUID",
-	     MakeLink("template",
-		      "guid=$guid&version=$version", "$guid/$version"));
-    ShowItem("ID",
-	     MakeLink("metadata",
-		      "action=modify&guid=$guid&version=$version".
-		      "&metadata_guid=$tid_guid&metadata_vers=$tid_version",
-		      $row['tid']));
-    ShowItem("Project",
-	     MakeLink("project", "pid=" . $row['pid'], $row['pid']));
-    ShowItem("Group",       $row['gid']);
-    ShowItem("Creator",
-	     MakeLink("user", "target_uid=" . $row['uid'], $row['uid']));
-    ShowItem("Created",     $row['created']);
-
-    if (strlen($row['description']) > 40) {
-	$row['description'] = substr($row['description'], 0, 40) .
-	    " <b>... </b>";
-    }
+    function Show() {
+	$guid        = $this->guid();
+	$vers        = $this->vers();
+	$pid         = $this->pid();
+	$gid         = $this->gid();
+	$uid         = $this->uid();
+	$tid         = $this->tid();
+	$created     = $this->created();
+	$description = $this->description();
+
+	if (strlen($description) > 40) {
+	    $description = substr($description, 0, 40) . " <b>... </b>";
+	}
+	
+        #
+        # We need the metadata guid/version for the TID and description since
+        # they are mungable metadata.
+        #
+	$tid_metadata  = $this->LookupMetadataByName("TID");
+	$desc_metadata = $this->LookupMetadataByName("description");
+	
+	if ($tid_metadata == NULL) {
+	    TBERROR("Could not find Metadata 'TID' for $guid/$vers", 1);
+	}
+	if ($desc_metadata == NULL) {
+	    TBERROR("Could not find Metadata 'description' for $guid/$vers",1);
+	}
+	$tid_guid  = $tid_metadata->guid();
+	$tid_vers  = $tid_metadata->vers();
+	$desc_guid = $desc_metadata->guid();
+	$desc_vers = $desc_metadata->vers();
     
-    ShowItem("Description", 
-	     MakeLink("metadata",
-		      "action=modify&guid=$guid&version=$version".
-		      "&metadata_guid=$desc_guid&metadata_vers=$desc_version",
-		      $row['description']));
+        #
+        # Generate the table.
+        #
+	echo "<center>
+               <h3>Details</h3>
+              </center>\n";
+
+	echo "<table align=center cellpadding=2 cellspacing=2 border=1>\n";
     
-    if (isset($row['parent_guid'])) {
-	$parent_guid = $row['parent_guid'];
-	$parent_vers = $row['parent_vers'];
-	ShowItem("Parent Template",
+	ShowItem("GUID",
 		 MakeLink("template",
-			  "guid=$parent_guid&version=$parent_vers",
-			  "$parent_guid/$parent_vers"));
-    }
-    echo "</table>\n";
-}
+			  "guid=$guid&version=$vers", "$guid/$vers"));
+	
+	ShowItem("ID",
+		 MakeLink("metadata",
+			  "action=modify&guid=$guid&version=$vers".
+			  "&metadata_guid=$tid_guid&metadata_vers=$tid_vers",
+			  $tid));
+	
+	ShowItem("Project", MakeLink("project", "pid=$pid", $pid));
+	ShowItem("Group",   $gid);
+	ShowItem("Creator", MakeLink("user", "target_uid=$uid", $uid));
+	ShowItem("Created", $created);
 
-#
-# Display template parameters and default values in a table
-#
-function SHOWTEMPLATEPARAMETERS($guid, $version)
-{
-    if (!TBTemplatePidEid($guid, $version, &$pid, &$eid))
-	return;
+	ShowItem("Description", 
+		 MakeLink("metadata",
+			  "action=modify&guid=$guid&version=$vers".
+			  "&metadata_guid=$desc_guid&metadata_vers=$desc_vers",
+			  $description));
     
-    $query_result =
-	DBQueryFatal("select * from virt_parameters ".
-		     "where pid='$pid' and eid='$eid'");
+	if (! $this->IsRoot()) {
+	    $parent_guid = $this->parent_guid();
+	    $parent_vers = $this->parent_vers();
+	    
+	    ShowItem("Parent Template",
+		     MakeLink("template",
+			      "guid=$parent_guid&version=$parent_vers",
+			      "$parent_guid/$parent_vers"));
+	}
+	echo "</table>\n";
+    }
+
+    #
+    # Display template parameters and default values in a table
+    #
+    function ShowParameters() {
+	$guid = $this->guid();
+	$vers = $this->vers();
+	
+	$query_result =
+	    DBQueryFatal("select name,value ".
+			 "   from experiment_template_parameters ".
+			 "where parent_guid='$guid' and ".
+			 "      parent_vers='$vers'");
+
+	if (!$query_result ||
+	    !mysql_num_rows($query_result))
+	    return 0;
 
-    if (mysql_num_rows($query_result)) {
 	echo "<center>
                <h3>Parameters</h3>
              </center> 
@@ -303,22 +280,24 @@ function SHOWTEMPLATEPARAMETERS($guid, $version)
 	echo "</table>\n";
 	return 1;
     }
-    return 0;
-}
 
-#
-# Display template metadata and values in a table
-#
-function SHOWTEMPLATEMETADATA($guid, $version)
-{
-    $query_result =
-	DBQueryFatal("select i.* from experiment_template_metadata as m ".
+    #
+    # Display template metadata and values in a table
+    #
+    function ShowMetadata() {
+	$guid = $this->guid();
+	$vers = $this->vers();
+	
+	$query_result =
+	    DBQueryFatal("select i.* from experiment_template_metadata as m ".
 		     "left join experiment_template_metadata_items as i on ".
 		     "     m.metadata_guid=i.guid and m.metadata_vers=i.vers ".
 		     "where m.parent_guid='$guid' and ".
-		     "      m.parent_vers='$version' and m.internal=0");
+		     "      m.parent_vers='$vers' and m.internal=0");
+
+	if (! mysql_num_rows($query_result))
+	    return 0;
 
-    if (mysql_num_rows($query_result)) {
 	echo "<center>
                <h3>Metadata</h3>
              </center> 
@@ -345,14 +324,14 @@ function SHOWTEMPLATEMETADATA($guid, $version)
 	    echo "<tr>
    	           <td align=center>
                      <a href='template_metadata.php?action=modify".
-		        "&guid=$guid&version=$version".
+		        "&guid=$guid&version=$vers".
 		        "&metadata_guid=$metadata_guid".
 		        "&metadata_vers=$metadata_vers'>
                      <img border=0 alt='modify' src='greenball.gif'></A></td>
                    <td>$name</td>
                    <td>
                        <a href='template_metadata.php?action=modify".
-		          "&guid=$guid&version=$version".
+		          "&guid=$guid&version=$vers".
 		          "&metadata_guid=$metadata_guid".
 		          "&metadata_vers=$metadata_vers'>
                          $value</a></td>
@@ -361,140 +340,29 @@ function SHOWTEMPLATEMETADATA($guid, $version)
 	echo "</table>\n";
 	return 1;
     }
-    return 0;
-}
-
-#
-# Display template instance binding values in a table
-#
-function SHOWTEMPLATEINSTANCEBINDINGS($guid, $version, $instance_idx)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_template_instance_bindings ".
-		     "where parent_guid='$guid' and parent_vers='$version' ".
-		     "      and instance_idx='$instance_idx'");
-
-
-    if (mysql_num_rows($query_result)) {
-	echo "<center>
-               <h3>Template Instance Bindings</h3>
-             </center> 
-             <table align=center border=1 cellpadding=5 cellspacing=2>\n";
-
- 	echo "<tr>
-                <th>Name</th>
-                <th>Value</th>
-              </tr>\n";
-
-	while ($row = mysql_fetch_array($query_result)) {
-	    $name	= $row['name'];
-	    $value	= $row['value'];
-	    if (!isset($value)) {
-		$value = "&nbsp";
-	    }
-
-	    echo "<tr>
-                   <td>$name</td>
-                   <td>$value</td>
-                  </tr>\n";
-  	}
-	echo "</table>\n";
-	return 1;
-    }
-    return 0;
-}
 
-#
-# Display a list of templates in its own table. Optional 
-#
-function SHOWTEMPLATELIST($which, $all, $myuid, $id, $gid = "")
-{
-    $extraclause = ($all ? "" : "and parent_guid is null");
-	
-    if ($which == "USER") {
-	$where = "t.uid='$id'";
-	$title = "Current";
-    }
-    elseif ($which == "PROJ") {
-	$where = "t.pid='$id'";
-	$title = "Project";
-    }
-    elseif ($which == "GROUP") {
-	$where = "t.pid='$id' and t.gid='$gid'";
-	$title = "Group";
-    }
-    elseif ($which == "TEMPLATE") {
-	$where = "t.guid='$id' or t.parent_guid='$id'";
-	$title = "Template";
-    }
-    else {
-	$where = "1";
-    }
+    #
+    # Show the instance list for a template.
+    #
+    function ShowInstances() {
+	$guid = $this->guid();
+	$vers = $this->vers();
 
-    if (ISADMIN()) {
-	$query_result =
-	    DBQueryFatal("select t.* from experiment_templates as t ".
-			 "where ($where) $extraclause ".
-			 "order by t.pid,t.tid,t.created ");
-    }
-    else {
 	$query_result =
-	    DBQueryFatal("select t.* from experiment_templates as t ".
-			 "left join group_membership as g on g.pid=t.pid and ".
-			 "     g.gid=t.gid and g.uid='$myuid' ".
-			 "where g.uid is not null and ($where) $extraclause ".
-			 "order by t.pid,t.tid,t.created");
-    }
-
-    if (mysql_num_rows($query_result)) {
-	echo "<center>
-               <h3>Experiment Templates</h3>
-             </center> 
-             <table align=center border=1 cellpadding=5 cellspacing=2>\n";
-
- 	echo "<tr>
-                <th>GUID</th>
-                <th>TID</th>
-                <th>PID/GID</th>
-              </tr>\n";
-
-	while ($row = mysql_fetch_array($query_result)) {
-	    $guid	= $row['guid'];
-	    $pid	= $row['pid'];
-	    $gid	= $row['gid'];
-	    $tid	= $row['tid'];
-	    $vers       = $row['vers'];
-
-	    echo "<tr>
-                   <td>" . MakeLink("template",
-				    "guid=$guid&version=$vers", "$guid/$vers")
-		      . "</td>
-                   <td>$tid</td>
-                   <td>" . MakeLink("project", "pid=$pid", "$pid/$gid") ."</td>
-                  </tr>\n";
-  	}
-	echo "</table>\n";
-    }
-}
-
-#
-# Show the instance list for a template.
-#
-function SHOWTEMPLATEINSTANCES($guid, $version)
-{
-    $query_result =
-	DBQueryFatal("select e.*,count(r.node_id) as nodes, ".
-		     "    round(minimum_nodes+.1,0) as min_nodes ".
-		     "from experiment_template_instances as i ".
-		     "left join experiments as e on e.idx=i.exptidx ".
-		     "left join reserved as r on e.pid=r.pid and ".
-		     "     e.eid=r.eid ".
-		     "where e.pid is not null and ".
-		     "      (i.parent_guid='$guid' and ".
-		     "       i.parent_vers='$version') ".
-		     "group by e.pid,e.eid order by e.state,e.eid");
-
-    if (mysql_num_rows($query_result)) {
+	    DBQueryFatal("select e.*,count(r.node_id) as nodes, ".
+			 "    round(minimum_nodes+.1,0) as min_nodes ".
+			 "from experiment_template_instances as i ".
+			 "left join experiments as e on e.idx=i.exptidx ".
+			 "left join reserved as r on e.pid=r.pid and ".
+			 "     e.eid=r.eid ".
+			 "where e.pid is not null and ".
+			 "      (i.parent_guid='$guid' and ".
+			 "       i.parent_vers='$vers') ".
+			 "group by e.pid,e.eid order by e.state,e.eid");
+
+	if (! mysql_num_rows($query_result))
+	    return;
+	
 	echo "<center>
                <h3>Template Instances</h3>
              </center> 
@@ -549,20 +417,23 @@ function SHOWTEMPLATEINSTANCES($guid, $version)
 	}
 	echo "</table>\n";
     }
-}
 
-#
-# Show the historical instance list for a template.
-#
-function SHOWTEMPLATEHISTORY($guid, $version, $expand)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_template_instances as i ".
-		     "where (i.parent_guid='$guid' and ".
-		     "       i.parent_vers='$version') ".
-		     "order by i.start_time");
+    #
+    # Show the historical instance list for a template.
+    #
+    function ShowHistory($expand) {
+	$guid = $this->guid();
+	$vers = $this->vers();
 
-    if (mysql_num_rows($query_result)) {
+	$query_result =
+	    DBQueryFatal("select * from experiment_template_instances as i ".
+			 "where (i.parent_guid='$guid' and ".
+			 "       i.parent_vers='$vers') ".
+			 "order by i.start_time");
+
+	if (! mysql_num_rows($query_result))
+	    return 0;
+	
 	echo "<center>
                <h3>Template History (Swapins)</h3>
              </center> 
@@ -600,12 +471,12 @@ function SHOWTEMPLATEHISTORY($guid, $version, $expand)
 	    echo " <td align=center>";
 	    if ($expandit) {
 		echo "<a href=template_history.php".
-                         "?guid=$guid&version=$version>".
+                         "?guid=$guid&version=$vers>".
 		         "<img border=0 alt='c' src='/icons/down.png'></a>\n";
 	    }
 	    else {
  		echo "<a href=template_history.php".
-                         "?guid=$guid&version=$version&expand=$idx#$idx>".
+                         "?guid=$guid&version=$vers&expand=$idx#$idx>".
 		         "<img border=0 alt='e' src='/icons/right.png'></a>\n";
 	    }
 	    echo " </td>
@@ -613,7 +484,7 @@ function SHOWTEMPLATEHISTORY($guid, $version, $expand)
 	    
 	    echo " <td align=center>".
  		    MakeLink("instance",
-			     "guid=$guid&version=$version&exptidx=$exptidx",
+			     "guid=$guid&version=$vers&exptidx=$exptidx",
 			     "$idx");
 	    echo " </td>
   		   <td>$uid</td>
@@ -625,33 +496,279 @@ function SHOWTEMPLATEHISTORY($guid, $version, $expand)
                  </tr>\n";
 
 	    if ($expandit) {
+		$instance = new TemplateInstance($exptidx);
+		
 		echo "<tr>\n";
 		echo " <a NAME=$idx></a>\n";
 		echo "<td>&nbsp</td>\n";
 		echo " <td colspan=6>\n";
-		SHOWTEMPLATEINSTANCERUNS($guid, $version, $exptidx, 0);
+		$instance->ShowRunList(0);
 		echo " </td>\n";
 		echo "</tr>\n";
 	    }
 	}
 	echo "</table>\n";
     }
+
+    #
+    # Dump the image map for a template to the output.
+    #
+    function ShowGraph() {
+	$guid = $this->guid();
+
+	$query_result =
+	    DBQueryFatal("select imap from experiment_template_graphs ".
+			 "where parent_guid='$guid'");
+
+	if (!mysql_num_rows($query_result)) {
+	    USERERROR("Experiment Template $guid is no longer in the DB!", 1);
+	}
+	$row  = mysql_fetch_array($query_result);
+	$imap = $row['imap'];
+
+	echo "<center>";
+	echo "<div id=fee style='display: block; overflow: hidden; ".
+	    "position: relative; z-index:1010; height: 400px; ".
+	    "width: 700px; border: 2px solid black;'>\n";
+	echo "<div id=\"D$guid\" style='position:relative;'>\n";
+
+	echo $imap;
+	echo "<img id=\"G$guid\" border=0 usemap=\"#TemplateGraph\" ";
+	echo "      src='template_graph.php?guid=$guid'>\n";
+	echo "</div>\n";
+	echo "</div>\n";
+
+	echo "<script type='text/javascript'>
+               <!--
+                 SET_DHTML(\"D$guid\");
+               //-->
+              </script>\n";
+    
+	echo "</center>\n";
+    }
+
+    #
+    # Grab array of input files for a template, indexed by input_idx.
+    #
+    function InputFiles() {
+	$guid = $this->guid();
+	$vers = $this->vers();
+	
+	$input_list = array();
+
+	$query_result =
+	    DBQueryFatal("select * from experiment_template_inputs ".
+			 "where parent_guid='$guid' and parent_vers='$vers'");
+
+	while ($row = mysql_fetch_array($query_result)) {
+	    $input_idx = $row['input_idx'];
+
+	    $input_query =
+		DBQueryFatal("select input ".
+			     "  from experiment_template_input_data ".
+			     "where idx='$input_idx'");
+
+	    $input_row = mysql_fetch_array($input_query);
+	    $input_list[] = $input_row['input'];
+	}
+	return $input_list;
+    }
+
+    #
+    # Return number of parameters.
+    #
+    function ParameterCount() {
+	$guid = $this->guid();
+	$vers = $this->vers();
+	
+	$query_result =
+	    DBQueryFatal("select name,value ".
+			 "   from experiment_template_parameters ".
+			 "where parent_guid='$guid' and ".
+			 "      parent_vers='$vers'");
+
+	return mysql_num_rows($query_result);
+    }
+
+    #
+    # Return number of metadata items
+    #
+    function MetadataCount() {
+	$guid = $this->guid();
+	$vers = $this->vers();
+
+	$query_result =
+	    DBQueryFatal("select internal ".
+			 "  from experiment_template_metadata as m ".
+			 "where m.parent_guid='$guid' and ".
+			 "      m.parent_vers='$vers' and m.internal=0");
+
+	return mysql_num_rows($query_result);
+    }
+
+    #
+    # Return number of instances
+    #
+    function InstanceCount() {
+	$guid = $this->guid();
+	$vers = $this->vers();
+
+	$query_result =
+	    DBQueryFatal("select * from experiment_template_instances as i ".
+			 "where (i.parent_guid='$guid' and ".
+			 "       i.parent_vers='$vers')");
+
+	return mysql_num_rows($query_result);
+    }
+
+    #
+    # Look for a metadata item in a template, by the guid/vers of the
+    # metadata. Returns a class instance (see below).
+    #
+    function LookupMetadataByGUID($metadata_guid, $metadata_vers) {
+	return TemplateMetadata::TemplateLookupByGUID($this,
+						      $metadata_guid,
+						      $metadata_vers);
+    }
+    # Ditto by name,
+    function LookupMetadataByName($metadata_name) {
+	return TemplateMetadata::TemplateLookupByName($this, $metadata_name);
+    }
+
+    # Grab the graph data.
+    function GraphImage(&$image) {
+	$guid = $this->guid();
+
+	$query_result =
+	    DBQueryWarn("select image from experiment_template_graphs ".
+			"where parent_guid='$guid'");
+
+	if (!$query_result || !mysql_num_rows($query_result)) {
+	    return -1;
+	}
+	$row   = mysql_fetch_array($query_result);
+	$image = $row['image'];
+	return 0;
+    }
+
+    #
+    # Return an array of the formal parameters for a template.
+    #
+    function FormalParameters(&$parameters) {
+	$parameters = array();
+	$guid = $this->guid();
+	$vers = $this->vers();
+	
+	$query_result =
+	    DBQueryFatal("select name,value ".
+			 "   from experiment_template_parameters ".
+			 "where parent_guid='$guid' and ".
+			 "      parent_vers='$vers'");
+
+	while ($row = mysql_fetch_array($query_result)) {
+	    $name	= $row['name'];
+	    $value	= $row['value'];
+
+	    $parameters[$name] = $value;
+	}
+	return 0;
+    }
 }
 
 #
-# Show the historical instance list for a template.
+# This is the class for a template instance (swapin).
 #
-function SHOWTEMPLATEINSTANCE($guid, $version, $exptidx, $withruns)
+class TemplateInstance
 {
-    $query_result =
-	DBQueryFatal("select * from experiment_template_instances as i ".
-		     "where (i.parent_guid='$guid' and ".
-		     "       i.parent_vers='$version' and ".
-		     "       i.exptidx='$exptidx') ".
-		     "order by i.start_time");
+    var	$template;
+    var $instance;
 
-    if (mysql_num_rows($query_result)) {
-	$irow = mysql_fetch_array($query_result);
+    #
+    # Instances are found by their experiment index. 
+    #
+    function TemplateInstance($exptidx) {
+	$exptidx = addslashes($exptidx);
+
+	$query_result =
+	    DBQueryFatal("select * ".
+			 "  from experiment_template_instances ".
+			 "where exptidx='$exptidx'");
+	
+	if (!$query_result || !mysql_num_rows($query_result)) {
+	    $this->template = NULL;
+	    $this->instance = NULL;
+	    return;
+	}
+	$this->instance = mysql_fetch_array($query_result);
+	$this->template = new Template($this->instance['parent_guid'],
+				       $this->instance['parent_vers']);
+    }
+    
+    # Hmm, how does one cause an error in a php constructor?
+    function IsValid() {
+	return !is_null($this->instance);
+    }
+
+    # Do class level lookup.
+    function LookupByExptidx($exptidx) {
+	$foo = new TemplateInstance($exptidx);
+
+	if ($foo->IsValid())
+	    return $foo;
+	return null;
+    }
+
+    # accessors
+    function idx() {
+	return (is_null($this->instance) ? -1 : $this->instance['idx']);
+    }
+    function exptidx() {
+	return (is_null($this->instance) ? -1 : $this->instance['exptidx']);
+    }
+    function runidx() {
+	return (is_null($this->instance) ? -1 : $this->instance['runidx']);
+    }
+    function pid() {
+	return (is_null($this->instance) ? -1 : $this->instance['pid']);
+    }
+    function eid() {
+	return (is_null($this->instance) ? -1 : $this->instance['eid']);
+    }
+    function uid() {
+	return (is_null($this->instance) ? -1 : $this->instance['uid']);
+    }
+    function guid() {
+	return (is_null($this->instance) ? -1 :
+		$this->instance['parent_guid']);
+    }
+    function vers() {
+	return (is_null($this->instance) ? -1 :
+		$this->instance['parent_vers']);
+    }
+    function start_time() {
+	return (is_null($this->instance) ? -1 :
+		$this->instance['start_time']);
+    }
+    function stop_time() {
+	return (is_null($this->instance) ? -1 :
+		$this->instance['stop_time']);
+    }
+    function template() {
+	return (is_null($this->instance) ? -1 : $this->template);
+    }
+
+    #
+    # Show an instance.
+    #
+    function Show($withruns) {
+	$exptidx = $this->exptidx();
+	$runidx   = $this->runidx();
+	$guid    = $this->guid();
+	$vers    = $this->vers();
+	$pid     = $this->pid();
+	$uid     = $this->uid();
+	$start   = $this->start_time();
+	$stop    = $this->stop_time();
 	
 	echo "<center>
                <h3>Template Instance</h3>
@@ -661,17 +778,13 @@ function SHOWTEMPLATEINSTANCE($guid, $version, $exptidx, $withruns)
     
 	ShowItem("Template",
 		 MakeLink("template",
-			  "guid=$guid&version=$version", "$guid/$version"));
-	ShowItem("ID",          $irow['exptidx']);
-	ShowItem("Project",
-		 MakeLink("project", "pid=" . $irow['pid'], $irow['pid']));
-	ShowItem("Creator",
-		 MakeLink("user", "target_uid=" . $irow['uid'], $irow['uid']));
-	ShowItem("Started",     $irow['start_time']);
-	ShowItem("Stopped",     (isset($irow['stop_time']) ?
-				 $irow['stop_time'] : "&nbsp"));
-	ShowItem("Current Run", (isset($irow['runidx']) ?
-				 $irow['runidx'] : "&nbsp"));
+			  "guid=$guid&version=$vers", "$guid/$vers"));
+	ShowItem("ID",          $exptidx);
+	ShowItem("Project",     MakeLink("project", "pid=$pid", $pid));
+	ShowItem("Creator",     MakeLink("user", "target_uid=$uid", $uid));
+	ShowItem("Started",     $start_time);
+	ShowItem("Stopped",     (isset($stop_time) ? $stop_time : "&nbsp"));
+	ShowItem("Current Run", (isset($runidx) ? $runidx : "&nbsp"));
 	echo "</table>\n";
 
 	if ($withruns) {
@@ -711,7 +824,7 @@ function SHOWTEMPLATEINSTANCE($guid, $version, $exptidx, $withruns)
 		    echo "<tr>\n";
 		    echo " <td align=center>".
 			MakeLink("run",
-				 "guid=$guid&version=$version".
+				 "guid=$guid&version=$vers".
 				 "&exptidx=$exptidx&runidx=$runidx",
 				 "<img border=0 alt='i' src='greenball.gif'>");
 		    echo " </td>
@@ -731,18 +844,61 @@ function SHOWTEMPLATEINSTANCE($guid, $version, $exptidx, $withruns)
 	    }
 	}
     }
-}
+    
+    #
+    # Display instance bindings in a table
+    #
+    function ShowBindings() {
+	$instance_idx = $this->idx();
 
-#
-# Show the run list for an instance.
-#
-function SHOWTEMPLATEINSTANCERUNS($guid, $version, $exptidx, $withheader)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_runs ".
-		     "where exptidx='$exptidx'");
+	$query_result =
+	    DBQueryWarn("select * from experiment_template_instance_bindings ".
+			"where instance_idx='$instance_idx'");
 
-    if (mysql_num_rows($query_result)) {
+	if (!mysql_num_rows($query_result))
+	    return 0;
+
+	echo "<center>
+               <h3>Template Instance Bindings</h3>
+             </center> 
+             <table align=center border=1 cellpadding=5 cellspacing=2>\n";
+
+ 	echo "<tr>
+                <th>Name</th>
+                <th>Value</th>
+              </tr>\n";
+
+	while ($row = mysql_fetch_array($query_result)) {
+	    $name	= $row['name'];
+	    $value	= $row['value'];
+	    if (!isset($value)) {
+		$value = "&nbsp";
+	    }
+
+	    echo "<tr>
+                   <td>$name</td>
+                   <td>$value</td>
+                  </tr>\n";
+  	}
+	echo "</table>\n";
+	return 1;
+    }
+
+    #
+    # Show the run list for an instance.
+    #
+    function ShowRunList($withheader) {
+	$exptidx = $this->exptidx();
+	$guid    = $this->guid();
+	$vers    = $this->vers();
+	
+	$query_result =
+	    DBQueryFatal("select * from experiment_runs ".
+			 "where exptidx='$exptidx'");
+	
+	if (! mysql_num_rows($query_result))
+	    return 0;
+	
 	if ($withheader) {
 	    echo "<center>
                     <h3>Instance History (Runs)</h3>
@@ -775,7 +931,7 @@ function SHOWTEMPLATEINSTANCERUNS($guid, $version, $exptidx, $withheader)
 	    echo "<tr>\n";
 	    echo " <td align=center>".
 		    MakeLink("run",
-			     "guid=$guid&version=$version".
+			     "guid=$guid&version=$vers".
 			     "&exptidx=$exptidx&runidx=$runidx",
 			     "<img border=0 alt='i' src='greenball.gif'>");
 	    echo " </td>
@@ -793,26 +949,42 @@ function SHOWTEMPLATEINSTANCERUNS($guid, $version, $exptidx, $withheader)
 	}
 	echo "</table>\n";
     }
-}
 
-#
-# Show the historical instance list for a template.
-#
-function SHOWEXPERIMENTRUN($exptidx, $runidx)
-{
-    $query_result =
-	DBQueryFatal("select r.*,i.parent_guid,i.parent_vers ".
-		     "  from experiment_runs as r ".
-		     "left join experiment_template_instances as i on ".
-		     "     i.exptidx=r.exptidx ".
-		     "where r.exptidx='$exptidx' and r.idx='$runidx'");
+    #
+    # Check if a valid run.
+    #
+    function ValidRun($runidx) {
+	$exptidx = $this->exptidx();
+	$runidx  = addslashes($runidx);
+	
+	$query_result =
+	    DBQueryFatal("select * from experiment_runs ".
+			 "where exptidx='$exptidx' and idx='$runidx'");
 
-    if (mysql_num_rows($query_result)) {
-	$row = mysql_fetch_array($query_result);
-	$guid     = $row['parent_guid'];
-	$version  = $row['parent_vers'];
-	$start    = $row['start_time'];
-	$stop     = $row['stop_time'];
+	return mysql_num_rows($query_result);
+    }
+
+    #
+    # Show details for an experiment run
+    #
+    function ShowRun($runidx) {
+	$runidx  = addslashes($runidx);
+	$exptidx = $this->exptidx();
+	$guid    = $this->guid();
+	$vers    = $this->vers();
+	
+	$query_result =
+	    DBQueryFatal("select r.* from experiment_runs as r ".
+			 "left join experiment_template_instances as i on ".
+			 "     i.exptidx=r.exptidx ".
+			 "where r.exptidx='$exptidx' and r.idx='$runidx'");
+
+	if (!mysql_num_rows($query_result))
+	    return;
+	
+	$row   = mysql_fetch_array($query_result);
+	$start = $row['start_time'];
+	$stop  = $row['stop_time'];
 
 	if (!isset($stop))
 	    $stop = "&nbsp";
@@ -825,10 +997,10 @@ function SHOWEXPERIMENTRUN($exptidx, $runidx)
     
 	ShowItem("Template",
 		 MakeLink("template",
-			  "guid=$guid&version=$version", "$guid/$version"));
+			  "guid=$guid&version=$vers", "$guid/$vers"));
 	ShowItem("Experiment",
 		 MakeLink("instance",
-			  "guid=$guid&version=$version&exptidx$exptidx",
+			  "guid=$guid&version=$vers&exptidx$exptidx",
 			  "$exptidx"));
 	ShowItem("ID",          $runidx);
 	ShowItem("Started",     $start);
@@ -866,545 +1038,340 @@ function SHOWEXPERIMENTRUN($exptidx, $runidx)
 	    echo "</table>\n";
 	}
     }
-}
 
-#
-# Display a metadata item in its own table.
-#
-function SHOWMETADATAITEM($metadata_guid, $metadata_version)
-{
     #
-    # See if this item is a current template item.
+    # Find next candidate for an experiment run. 
     #
-    unset($template_guid);
-    unset($template_vers);
-    
-    $query_result =
-	DBQueryFatal("select * from experiment_template_metadata ".
-		     "where metadata_guid='$metadata_guid' and ".
-		     "      metadata_vers='$metadata_version'");
-    
-    if (mysql_num_rows($query_result)) {
-	$row = mysql_fetch_array($query_result);
-	$template_guid = $row['parent_guid'];
-	$template_vers = $row['parent_vers'];
-    }
+    function NextRunID() {
+	$exptidx = $this->exptidx();
+	$eid     = $this->eid();
 
-    # Now the metadata info.
-    $query_result =
-	DBQueryFatal("select * from experiment_template_metadata_items ".
-		     "where guid='$metadata_guid' and ".
-		     "      vers='$metadata_version'");
+	$query_result =
+	    DBQueryFatal("select MAX(idx) from experiment_runs ".
+			 "where exptidx='$exptidx'");
 
-    if (!mysql_num_rows($query_result)) {
-	USERERROR("Experiment Template Metadata $guid/$version is no longer ".
-		  "a valid metadata item!", 1);
+	if (mysql_num_rows($query_result) == 0) {
+	    return 0;
+	}
+	$row = mysql_fetch_array($query_result);
+	$foo = $row[0] + 1;
+	return "${eid}-R${foo}"; 
     }
-    $row = mysql_fetch_array($query_result);
 
     #
-    # Generate the table.
+    # Return an array of the bindings for a template instance.
     #
-    echo "<table align=center cellpadding=2 cellspacing=2 border=1>\n";
-    
-    ShowItem("GUID",       "$metadata_guid/$metadata_version");
-    ShowItem("Name",        $row['name']);
-    ShowItem("Created",     $row['created']);
-
-    if (isset($template_guid)) {
-	ShowItem("Template",
-		 MakeLink("template",
-			  "guid=$template_guid&version=$template_vers",
-			  "$template_guid/$template_vers"));
-    }
-    
-    if (isset($row['parent_guid'])) {
-	$parent_guid = $row['parent_guid'];
-	$parent_vers = $row['parent_vers'];
-	ShowItem("Parent Version",
-		 MakeLink("metadata",
-			  "action=show&guid=$parent_guid&version=$parent_vers",
-			  "$parent_guid/$parent_vers"));
-    }
-
-    echo "<tr>
-              <td align=center colspan=2>
-               Metadata Value
-              </td>
-          </tr>
-          <tr>
-              <td colspan=2 align=center class=left>
-                  <textarea readonly
-                    rows=10 cols=80>" .
-	            ereg_replace("\r", "", $row['value']) .
-	           "</textarea>
-              </td>
-          </tr>\n";
-
-
-    
-    echo "</table>\n";
-}
-
-#
-# Dump the image map for a template to the output.
-#
-function SHOWTEMPLATEGRAPH($guid)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_template_graphs ".
-		     "where parent_guid='$guid'");
-
-    if (!mysql_num_rows($query_result)) {
-	USERERROR("Experiment Template graph for $guid is no longer ".
-		  "in the DB!", 1);
-    }
-    $row = mysql_fetch_array($query_result);
-
-    $imap = $row['imap'];
-
-    echo "<center>";
-#    echo "<h3>Template Graph</h3>\n";
-    echo "<div id=fee style='display: block; overflow: hidden; position: relative; z-index:1010; height: 400px; width: 700px; border: 2px solid black;'>\n";
-    echo "<div id=\"D$guid\" style='position:relative;'>\n";
-
-    echo $imap;
-    echo "<img id=\"G$guid\" border=0 usemap=\"#TemplateGraph\" ";
-    echo "      src='template_graph.php?guid=$guid'>\n";
-    echo "</div>\n";
-    echo "</div>\n";
-
-    echo "<script type='text/javascript'>
-           <!--
-             SET_DHTML(\"D$guid\");
-           //-->
-          </script>\n";
-    
-    echo "</center>\n";
-}
+    function Bindings(&$bindings) {
+	$bindings = array();
 
-#
-# Map pid/tid to a template guid. This only makes sense after a new
-# template is created. Needs more thought.
-#
-function TBPidTid2Template($pid, $tid, &$guid, &$version)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_templates ".
-		     "where pid='$pid' and tid='$tid'");
-
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
-    }
-    $row = mysql_fetch_array($query_result);
-    $guid    = $row['guid'];
-    $version = $row['vers'];
-    return 1;
-}
+	$guid = $this->guid();
+	$vers = $this->vers();
+	$instance_idx = $this->idx();
+	
+	$query_result =
+	    DBQueryFatal("select * ".
+			 "   from experiment_template_instance_bindings ".
+			 "where parent_guid='$guid' and parent_vers='$vers' ".
+			 "      and instance_idx='$instance_idx'");
 
-function TBTemplateInstanceIndex($guid, $version, $exptidx, &$instidx)
-{
-    $query_result =
-	DBQueryFatal("select idx from experiment_template_instances ".
-		     "where parent_guid='$guid' and parent_vers='$version' ".
-		     "      and exptidx='$exptidx'");
+	while ($row = mysql_fetch_array($query_result)) {
+	    $name	= $row['name'];
+	    $value	= $row['value'];
 
-    if (mysql_num_rows($query_result) == 0) {
+	    $bindings[$name] = $value;
+	}
 	return 0;
     }
-    $row = mysql_fetch_array($query_result);
-    $instidx  = $row['idx'];
-    return 1;
 }
 
 #
-# Map guid to pid/gid.
+# This is the class for metadata.
 #
-function TBGuid2PidGid($guid, &$pid, &$gid)
+class TemplateMetadata
 {
-    $query_result =
-	DBQueryFatal("select pid,gid from experiment_templates ".
-		     "where guid='$guid' limit 1");
+    var	$template;
+    var $metadata;
 
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+    #
+    # Instances are found by their experiment index. 
+    #
+    function TemplateMetadata($guid, $vers) {
+	$guid = addslashes($guid);
+	$vers = addslashes($vers);
+	
+	$query_result =
+	    DBQueryFatal("select * from experiment_template_metadata_items ".
+			 "where guid='$guid' and ".
+			 "      vers='$vers'");
+
+	if (!$query_result || !mysql_num_rows($query_result)) {
+	    $this->template = NULL;
+	    $this->metadata = NULL;
+	    return;
+	}
+	$this->metadata = mysql_fetch_array($query_result);
+	$this->template = NULL;
     }
-    $row = mysql_fetch_array($query_result);
-    $pid = $row['pid'];
-    $gid = $row['gid'];
-    return 1;
-}
-
-#
-# Map guid/version to its underlying experiment.
-#
-function TBTemplatePidEid($guid, $version, &$pid, &$eid)
-{
-    $query_result =
-	DBQueryFatal("select pid from experiment_templates ".
-		     "where guid='$guid' and vers='$version'");
-
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+    
+    # Hmm, how does one cause an error in a php constructor?
+    function IsValid() {
+	return !is_null($this->metadata);
     }
-    $row = mysql_fetch_array($query_result);
-    $pid = $row['pid'];
-    $eid = "T${guid}-${version}";
-    return 1;
-}
 
-#
-# Map guid/version/exptidx to its run, if any.
-#
-function TBTemplateCurrentExperimentRun($guid, $version, $exptidx, &$runidx)
-{
-    $query_result =
-	DBQueryFatal("select runidx from experiment_template_instances ".
-		     "where parent_guid='$guid' and parent_vers='$version' ".
-		     "      and exptidx='$exptidx'");
+    # Do class level lookup.
+    function Lookup($guid, $vers) {
+	$foo = new TemplateMetadata($guid, $vers);
 
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+	if ($foo->IsValid())
+	    return $foo;
+	return null;
     }
-    $row = mysql_fetch_array($query_result);
-    $runidx = $row['runidx'];
-    return 1;
-}
+    function TemplateLookupByGUID($template, $guid, $vers) {
+	$metadata_guid = addslashes($guid);
+	$metadata_vers = addslashes($vers);
+	$template_guid = $template->guid();
+	$template_vers = $template->vers();
 
-#
-# Find next candidate for an experiment run. 
-#
-function TBTemplateNextExperimentRun($guid, $version, $exptidx, &$runidx)
-{
-    $query_result =
-	DBQueryFatal("select MAX(idx) from experiment_runs ".
-		     "where exptidx='$exptidx'");
-
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
-    }
-    $row = mysql_fetch_array($query_result);
-    $runidx = $row[0] + 1;
-    return 1;
-}
+	$query_result =
+	    DBQueryFatal("select internal from experiment_template_metadata ".
+			 "where parent_guid='$template_guid' and ".
+			 "      parent_vers='$template_vers' and ".
+			 "      metadata_guid='$metadata_guid' and ".
+			 "      metadata_vers='$metadata_vers'");
 
-#
-# Map guid/version to the template tid.
-#
-function TBTemplateTid($guid, $version, &$tid)
-{
-    $query_result =
-	DBQueryFatal("select tid from experiment_templates ".
-		     "where guid='$guid' and vers='$version'");
+	if (! mysql_num_rows($query_result))
+	    return null;
 
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
-    }
-    $row = mysql_fetch_array($query_result);
-    $tid = $row['tid'];
-    return 1;
-}
+	$foo = new TemplateMetadata($guid, $vers);
 
-#
-# Map guid/version to the template description
-#
-function TBTemplateDescription($guid, $version, &$description)
-{
-    $query_result =
-	DBQueryFatal("select description from experiment_templates ".
-		     "where guid='$guid' and vers='$version'");
+	if (! $foo->IsValid())
+	    return null;
 
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+	$foo->template = $template;
+	return $foo;
     }
-    $row = mysql_fetch_array($query_result);
-    $description = $row['description'];
-    return 1;
-}
 
-#
-# Grab array of input files for a template, indexed by input_idx.
-#
-function TBTemplateInputFiles($guid, $version)
-{
-    $input_list = array();
+    function TemplateLookupByName($template, $name) {
+	$metadata_name = addslashes($name);
+	$template_guid = $template->guid();
+	$template_vers = $template->vers();
 
-    $query_result =
-	DBQueryFatal("select * from experiment_template_inputs ".
-		     "where parent_guid='$guid' and parent_vers='$version'");
+	$query_result =
+	    DBQueryFatal("select i.guid,i.vers ".
+		     "    from experiment_template_metadata as m ".
+		     "left join experiment_template_metadata_items as i on ".
+		     "     i.guid=m.metadata_guid and i.vers=m.metadata_vers ".
+		     "where m.parent_guid='$template_guid' and ".
+		     "      m.parent_vers='$template_vers' and ".
+		     "      i.name='$metadata_name'");
 
-    while ($row = mysql_fetch_array($query_result)) {
-	$input_idx = $row['input_idx'];
+	if (! mysql_num_rows($query_result))
+	    return null;
+	
+	$row = mysql_fetch_array($query_result);
+	$metadata_guid = $row['guid'];
+	$metadata_vers = $row['vers'];
+	
+	$foo = new TemplateMetadata($metadata_guid, $metadata_vers);
 
-	$input_query =
-	    DBQueryFatal("select input from experiment_template_input_data ".
-			 "where idx='$input_idx'");
+	if (! $foo->IsValid())
+	    return null;
 
-	$input_row = mysql_fetch_array($input_query);
-	$input_list[] = $input_row['input'];
+	$foo->template = $template;
+	return $foo;
     }
-    return $input_list;
-}
-
-#
-# Find out if an experiment is a template instantiation; used by existing
-# pages to alter what they do.
-#
-function TBIsTemplateInstanceExperiment($exptidx)
-{
-    $query_result =
-	DBQueryFatal("select pid,eid from experiment_template_instances ".
-		     "where exptidx='$exptidx'");
-
-    return mysql_num_rows($query_result);
-}
-
-#
-# Map pid/eid to a template guid.
-#
-function TBPidEid2Template($pid, $eid, &$guid, &$version, &$instidx)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_template_instances ".
-		     "where pid='$pid' and eid='$eid'");
 
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+    # accessors
+    function guid() {
+	return (is_null($this->metadata) ? -1 : $this->metadata['guid']);
     }
-    $row = mysql_fetch_array($query_result);
-    $guid    = $row['parent_guid'];
-    $version = $row['parent_vers'];
-    $instidx = $row['idx'];
-    return 1;
-}
-
-#
-# Map metadata to its template. This must be a current item associated with
-# a template.
-#
-function TBValidTemplateMetadata($metadata_guid, $metadata_version,
-				 $template_guid, $template_version)
-{
-    $query_result =
-	DBQueryFatal("select internal from experiment_template_metadata ".
-		     "where parent_guid='$template_guid' and ".
-		     "      parent_vers='$template_version' and ".
-		     "      metadata_guid='$metadata_guid' and ".
-		     "      metadata_vers='$metadata_version'");
-
-    return mysql_num_rows($query_result);
-}
-
-#
-# Map metadata to its template GUID only, as for permission purposes.
-#
-function TBMetadataTemplate($metadata_guid, $metadata_version, &$template_guid)
-{
-    $query_result =
-	DBQueryFatal("select template_guid ".
-		     "    from experiment_template_metadata_items ".
-		     "where guid='$metadata_guid' and ".
-		     "      vers='$metadata_version'");
-
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+    function vers() {
+	return (is_null($this->metadata) ? -1 : $this->metadata['vers']);
     }
-    $row = mysql_fetch_array($query_result);
-    $template_guid = $row['template_guid'];
-    return 1;
-}
-
-#
-# Return array of metadata data. 
-#
-function TBMetadataData($metadata_guid, $metadata_version, &$metadata_data)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_template_metadata_items ".
-		     "where guid='$metadata_guid' and ".
-		     "      vers='$metadata_version'");
-
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+    function name() {
+	return (is_null($this->metadata) ? -1 : $this->metadata['name']);
     }
-    $metadata_data = mysql_fetch_array($query_result);
-    return 1;
-}
-
-#
-# Get a metadata value given a name and a template. 
-#
-function TBTemplateMetadataLookup($template_guid, $template_version,
-				  $metadata_name, &$metadata_value)
-{
-    $metadata_name = addslashes($metadata_name);
-    
-    $query_result =
-	DBQueryFatal("select i.value from experiment_template_metadata as m ".
-		     "left join experiment_template_metadata_items as i on ".
-		     "     i.guid=m.metadata_guid and i.vers=m.metadata_vers ".
-		     "where m.parent_guid='$template_guid' and ".
-		     "      m.parent_vers='$template_version' and ".
-		     "      i.name='$metadata_name'");
-
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+    function value() {
+	return (is_null($this->metadata) ? -1 : $this->metadata['value']);
     }
-    $row = mysql_fetch_array($query_result);
-    $metadata_value = $row['value'];
-    return 1;
-}
-
-#
-# Get a metadata guid/version given a name and a template. 
-#
-function TBTemplateMetadataLookupGUID($template_guid, $template_version,
-				      $metadata_name,
-				      &$metadata_guid, &$metadata_version)
-{
-    $metadata_name = addslashes($metadata_name);
-
-    $query_result =
-	DBQueryFatal("select i.guid,i.vers ".
-		     "    from experiment_template_metadata as m ".
-		     "left join experiment_template_metadata_items as i on ".
-		     "     i.guid=m.metadata_guid and i.vers=m.metadata_vers ".
-		     "where m.parent_guid='$template_guid' and ".
-		     "      m.parent_vers='$template_version' and ".
-		     "      i.name='$metadata_name'");
-
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+    function parent_guid() {
+	return (is_null($this->metadata) ? -1 :
+		$this->metadata['parent_guid']);
+    }
+    function parent_vers() {
+	return (is_null($this->metadata) ? -1 :
+		$this->metadata['parent_vers']);
+    }
+    function template_guid() {
+	return (is_null($this->metadata) ? -1 :
+		$this->metadata['template_guid']);
+    }
+    function created() {
+	return (is_null($this->metadata) ? -1 : $this->metadata['created']);
+    }
+    function uid() {
+	return (is_null($this->metadata) ? -1 : $this->metadata['uid']);
     }
-    $row = mysql_fetch_array($query_result);
-    $metadata_guid    = $row['guid'];
-    $metadata_version = $row['vers'];
-    return 1;
-}
 
-#
-# Return an array of the formal parameters for a template.
-#
-function TBTemplateFormalParameters($guid, $version, &$parameters)
-{
-    $parameters = array();
+    #
+    # Display a metadata item in its own table.
+    #
+    function Show() {
+	$metadata_guid  = $this->guid();
+	$metadata_vers  = $this->vers();
+	$created        = $this->created();
+	$metadata_name  = $this->name();
+	$metadata_value = $this->value();
 
-    if (!TBTemplatePidEid($guid, $version, &$pid, &$eid))
-	return -1;
+	echo "<table align=center cellpadding=2 cellspacing=2 border=1>\n";
+	
+	ShowItem("GUID",     "$metadata_guid/$metadata_vers");
+	ShowItem("Name",     $metadata_name);
+	ShowItem("Created",  $created);
+
+	if (! is_null($this->template)) {
+	    $template_guid  = $template->guid();
+	    $template_vers  = $template->vers();
+
+	    ShowItem("Template",
+		     MakeLink("template",
+			      "guid=$template_guid&version=$template_vers",
+			      "$template_guid/$template_vers"));
+	}
     
-    $query_result =
-	DBQueryFatal("select * from virt_parameters ".
-		     "where pid='$pid' and eid='$eid'");
-
-    while ($row = mysql_fetch_array($query_result)) {
-	$name	= $row['name'];
-	$value	= $row['value'];
+	if ($this->parent_guid()) {
+	    $parent_guid = $this->parent_guid();
+	    $parent_vers = $this->parent_vers();
+	    
+	    ShowItem("Parent Version",
+		     MakeLink("metadata",
+			      "action=show&guid=$parent_guid".
+			      "&version=$parent_vers",
+			      "$parent_guid/$parent_vers"));
+	}
 
-	$parameters[$name] = $value;
+	echo "<tr>
+                  <td align=center colspan=2>
+                   Metadata Value
+                  </td>
+              </tr>
+              <tr>
+                  <td colspan=2 align=center class=left>
+                      <textarea readonly
+                        rows=10 cols=80>" .
+	                ereg_replace("\r", "", $metadata_value) .
+	             "</textarea>
+                  </td>
+              </tr>\n";
+	echo "</table>\n";
     }
-    return 0;
 }
 
-#
-# Return an array of the bindings for a template instance.
-#
-function TBTemplateInstanceBindings($guid, $version, $instance_idx, &$bindings)
+# Helper function
+function ShowItem($tag, $value, $default = "&nbsp")
 {
-    $bindings = array();
-
-    $query_result =
-	DBQueryFatal("select * from experiment_template_instance_bindings ".
-		     "where parent_guid='$guid' and parent_vers='$version' ".
-		     "      and instance_idx='$instance_idx'");
-
-    while ($row = mysql_fetch_array($query_result)) {
-	$name	= $row['name'];
-	$value	= $row['value'];
-
-	$bindings[$name] = $value;
+    if (!isset($value)) {
+	$value = $default;
     }
-    return 0;
+    echo "<tr><td>${tag}: </td><td class=left>$value</td></tr>\n";
 }
 
-#
-# Confirm a valid experiment template instance
-#
-# usage TBValidExperimentTemplateInstance($guid, $version, $exptidx)
-#       returns 1 if valid
-#       returns 0 if not valid
-#
-function TBValidExperimentTemplateInstance($guid, $version, $exptidx)
+function MakeLink($which, $args, $text)
 {
-    $guid    = addslashes($guid);
-    $version = addslashes($version);
-    $exptidx = addslashes($exptidx);
-
-    $query_result =
-	DBQueryFatal("select parent_guid ".
-		     "  from experiment_template_instances as i ".
-		     "left join experiments as e on e.idx=i.exptidx ".
-		     "where (i.parent_guid='$guid' and ".
-		     "       i.parent_vers='$version' and ".
-		     "       i.exptidx='$exptidx') and ".
-		     "      (e.eid is not null and e.state='active')");
-
-    if (mysql_num_rows($query_result) == 0) {
-	return 0;
+    $page = "";
+    
+    if ($which == "project") {
+	$page = "showproject.php3";
     }
-    return 1;
-}
-
-#
-# Check to see if a runidx is a valid run.
-#
-function TBValidExperimentRun($exptidx, $runidx)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_runs ".
-		     "where exptidx='$exptidx' and idx='$runidx'");
-
-    return mysql_num_rows($query_result);
+    elseif ($which == "user") {
+	$page = "showuser.php3";
+    }
+    elseif ($which == "template") {
+	$page = "template_show.php";
+    }
+    elseif ($which == "metadata") {
+	$page = "template_metadata.php";
+    }
+    elseif ($which == "instance") {
+	$page = "instance_show.php";
+    }
+    elseif ($which == "run") {
+	$page = "experimentrun_show.php";
+    }
+    return "<a href=${page}?${args}>$text</a>";
 }
 
 #
-# Return number of parameters.
+# Display a list of templates in its own table. Optional 
 #
-function TemplateParameterCount($guid, $version)
+function SHOWTEMPLATELIST($which, $all, $myuid, $id, $gid = "")
 {
-    if (!TBTemplatePidEid($guid, $version, &$pid, &$eid))
-	return;
-    
-    $query_result =
-	DBQueryFatal("select * from virt_parameters ".
-		     "where pid='$pid' and eid='$eid'");
+    $extraclause = ($all ? "" : "and parent_guid is null");
+	
+    if ($which == "USER") {
+	$where = "t.uid='$id'";
+	$title = "Current";
+    }
+    elseif ($which == "PROJ") {
+	$where = "t.pid='$id'";
+	$title = "Project";
+    }
+    elseif ($which == "GROUP") {
+	$where = "t.pid='$id' and t.gid='$gid'";
+	$title = "Group";
+    }
+    elseif ($which == "TEMPLATE") {
+	$where = "t.guid='$id' or t.parent_guid='$id'";
+	$title = "Template";
+    }
+    else {
+	$where = "1";
+    }
 
-    return mysql_num_rows($query_result);
-}
+    if (ISADMIN()) {
+	$query_result =
+	    DBQueryFatal("select t.* from experiment_templates as t ".
+			 "where ($where) $extraclause ".
+			 "order by t.pid,t.tid,t.created ");
+    }
+    else {
+	$query_result =
+	    DBQueryFatal("select t.* from experiment_templates as t ".
+			 "left join group_membership as g on g.pid=t.pid and ".
+			 "     g.gid=t.gid and g.uid='$myuid' ".
+			 "where g.uid is not null and ($where) $extraclause ".
+			 "order by t.pid,t.tid,t.created");
+    }
 
-#
-# Return number of metadata items
-#
-function TemplateMetadataCount($guid, $version)
-{
-    $query_result =
-	DBQueryFatal("select internal from experiment_template_metadata as m ".
-		     "where m.parent_guid='$guid' and ".
-		     "      m.parent_vers='$version' and m.internal=0");
+    if (mysql_num_rows($query_result)) {
+	echo "<center>
+               <h3>Experiment Templates</h3>
+             </center> 
+             <table align=center border=1 cellpadding=5 cellspacing=2>\n";
 
-    return mysql_num_rows($query_result);
-}
+ 	echo "<tr>
+                <th>GUID</th>
+                <th>TID</th>
+                <th>PID/GID</th>
+              </tr>\n";
 
-#
-# Return number of instances
-#
-function TemplateInstanceCount($guid, $version)
-{
-    $query_result =
-	DBQueryFatal("select * from experiment_template_instances as i ".
-		     "where (i.parent_guid='$guid' and ".
-		     "       i.parent_vers='$version')");
+	while ($row = mysql_fetch_array($query_result)) {
+	    $guid	= $row['guid'];
+	    $pid	= $row['pid'];
+	    $gid	= $row['gid'];
+	    $tid	= $row['tid'];
+	    $vers       = $row['vers'];
 
-    return mysql_num_rows($query_result);
+	    echo "<tr>
+                   <td>" . MakeLink("template",
+				    "guid=$guid&version=$vers", "$guid/$vers")
+		      . "</td>
+                   <td>$tid</td>
+                   <td>" . MakeLink("project", "pid=$pid", "$pid/$gid") ."</td>
+                  </tr>\n";
+  	}
+	echo "</table>\n";
+    }
 }
 
 #
diff --git a/www/template_exprun.php b/www/template_exprun.php
index e91f81baf..a1439fbce 100644
--- a/www/template_exprun.php
+++ b/www/template_exprun.php
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # No PAGEHEADER since we spit out a Location header later. See below.
@@ -28,7 +28,7 @@ $deletexmlfile = 0;
 #
 # Spit the form out using the array of data.
 #
-function SPITFORM($formfields, $parameters, $errors)
+function SPITFORM($instance, $formfields, $parameters, $errors)
 {
     global $TBDB_EIDLEN;
     global $guid, $version, $eid;
@@ -36,7 +36,8 @@ function SPITFORM($formfields, $parameters, $errors)
     PAGEHEADER("Start an Experiment Run");
 
     echo "<center>\n";
-    SHOWTEMPLATE($guid, $version);
+    $template = $instance->template();
+    $template->Show();
     echo "</center>\n";
     echo "<br><br>\n";
 
@@ -171,38 +172,33 @@ if (!TBvalid_eid($eid)) {
 }
 
 #
-# Check to make sure this is a valid template.
+# Check to make sure this is a valid template and user has permission.
 #
-if (! TBValidExperimentTemplate($guid, $version)) {
+$template = Template::Lookup($guid, $version);
+if (!$template) {
     USERERROR("The experiment template $guid/$version is not a valid ".
               "experiment template!", 1);
 }
-
-# Need this below.
-if (! TBGuid2PidGid($guid, $pid, $gid)) {
-    TBERROR("Could not get template pid,gid for template $guid", 1);
+if (! $template->AccessCheck($uid, $TB_EXPT_MODIFY)) {
+    USERERROR("You do not have permission to modify experiment template ".
+	      "$guid/$version!", 1);
 }
+
+# Need these below.
+$pid = $template->pid();
+$gid = $template->gid();
+
 if (($exptidx = TBExptIndex($pid, $eid)) < 0) {
-    TBERROR("Could not instance IDX for template instance $guid/$eid", 1);
+    TBERROR("No such experiment '$eid' for template $guid/$version/$eid", 1);
 }
 
 #
 # Check to make sure and a valid instance that is actually swapped in.
 #
-if (! TBValidExperimentTemplateInstance($guid, $version, $exptidx)) {
-    USERERROR("Experiment Template Instance $guid/$version/$exptidx is not ".
-              "a valid experiment template instance!", 1);
-}
-TBTemplateInstanceIndex($guid, $version, $exptidx, $instance_idx);
-
-# We need the eid for passing to the shell.
-
-#
-# Verify Permission.
-#
-if (! TBExptTemplateAccessCheck($uid, $guid, $TB_EXPT_UPDATE)) {
-    USERERROR("You do not have permission to instantiate experiment template ".
-	      "$guid/$version!", 1);
+$instance = TemplateInstance::LookupByExptidx($exptidx);
+if (!$instance) {
+    TBERROR("Template Instance $guid/$version/$exptidx is not ".
+	    "a valid experiment template instance!", 1);
 }
 
 #
@@ -212,14 +208,12 @@ if (!isset($exprun)) {
     #
     # 
     #
-    TBTemplateNextExperimentRun($guid, $version, $exptidx, $nextidx);
-    
-    $defaults['runid'] = "T${nextidx}";
+    $defaults['runid'] = $instance->NextRunID();
 
     #
     # Get the current bindings for the template instance.
     #
-    TBTemplateInstanceBindings($guid, $version, $instance_idx, $bindings);
+    $instance->Bindings($bindings);
     
     #
     # Allow formfields that are already set to override defaults
@@ -230,7 +224,7 @@ if (!isset($exprun)) {
 	}
     }
 
-    SPITFORM($defaults, $bindings, 0);
+    SPITFORM($instance, $defaults, $bindings, 0);
     PAGEFOOTER();
     return;
 }
@@ -238,11 +232,6 @@ elseif (! isset($formfields)) {
     PAGEARGERROR();
 }
 
-# Need this below.
-if (! TBGuid2PidGid($guid, $pid, $gid)) {
-    TBERROR("Could not get template pid,gid for template $guid", 1);
-}
-
 #
 # Okay, validate form arguments.
 #
@@ -283,7 +272,7 @@ else {
 #
 # Parameters. The XML file overrides stuff in the form. 
 #
-TBTemplateFormalParameters($guid, $version, $parameter_masterlist);
+$template->FormalParameters($parameter_masterlist);
 if (count($parameter_masterlist)) {
     if (isset($formfields[parameter_xmlfile]) &&
 	$formfields[parameter_xmlfile] != "") {
@@ -338,7 +327,7 @@ if (count($parameter_masterlist)) {
 }
 
 if (count($errors)) {
-    SPITFORM($formfields, $parameters, $errors);
+    SPITFORM($instance, $formfields, $parameters, $errors);
     PAGEFOOTER();
     exit(1);
 }
@@ -346,9 +335,6 @@ if (count($errors)) {
 #
 # Grab the unix GID for running scripts.
 #
-if (! TBGuid2PidGid($guid, $pid, $gid)) {
-    TBERROR("Could not get template pid,gid for template $guid", 1);
-}
 TBGroupUnixInfo($pid, $gid, $unix_gid, $unix_name);
 
 #
@@ -365,8 +351,17 @@ echo "<font size=+2>Experiment Template <b>" .
       "</b></font>\n";
 echo "<br><br>\n";
 
-echo "<b>Starting Experiment run</b> ... ";
+echo "<script type='text/javascript' language='javascript' ".
+     "        src='template_sup.js'>\n";
+echo "</script>\n";
+
+echo "<center>\n";
+echo "<b>Starting experiment run!</b> ...<br>\n";
+echo "This will take a few moments; please be patient.<br>\n";
+echo "<br><br>\n";
+echo "<img id='busy' src='busy.gif'><span id='loading'> Working ...</span>";
 echo "<br><br>\n";
+echo "</center>\n";
 flush();
 
 #
@@ -376,6 +371,11 @@ $retval = SUEXEC($uid, "$pid,$unix_gid",
 		 "webtemplate_exprun $command_options $guid/$version",
 		 SUEXEC_ACTION_IGNORE);
 
+/* Clear the 'loading' indicators above */
+echo "<script type='text/javascript' language='javascript'>\n";
+echo "ClearLoadingIndicators();\n";
+echo "</script>\n";
+
 if ($deletexmlfile) {
     unlink($parameter_xmlfile);
 }
@@ -394,7 +394,15 @@ if ($retval) {
     return;
 }
 
-STARTLOG($pid, $eid);
+echo "<script type='text/javascript' language='javascript'>\n";
+echo "PageReplace('template_show.php?guid=$guid&version=$version');\n";
+echo "</script>\n";
+
+#
+# In case the above fails.
+#
+echo "<center><b>Done!</b></center>";
+echo "<br><br>\n";
 
 #
 # Standard Testbed Footer
diff --git a/www/template_graph.php b/www/template_graph.php
index 83473bfa8..592b1a75a 100644
--- a/www/template_graph.php
+++ b/www/template_graph.php
@@ -5,12 +5,11 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # This script generates the contents of an image. No headers or footers,
-# just spit back an image. The thumbs are public, so no checking is done.
-# To obfuscate, do not use pid/eid, but rather use the resource index. 
+# just spit back an image. 
 #
 
 #
@@ -39,38 +38,31 @@ function SPITERROR()
     readfile("coming-soon-thumb.gif");
 }
 
-function SPITGRAPH($guid)
+function SPITGRAPH($template)
 {
-    #
-    # Get the data from the DB.
-    #
-    $query_result =
-	DBQueryWarn("select image from experiment_template_graphs ".
-		    "where parent_guid='$guid'");
+    $data = NULL;
 
-    if (!$query_result || !mysql_num_rows($query_result)) {
-        # No Data. Spit back a stub image.
+    if ($template->GraphImage($data) != 0 || $data == NULL || $data == "") {
 	SPITERROR();
-	return;
     }
-    $row  = mysql_fetch_array($query_result);
-    $data = $row['image'];
-
-    if ($data != "") {
+    else {
 	header("Content-type: image/png");
 	echo "$data";
     }
-    else {
-	SPITERROR();
-    }
 }
-    
+
+$template = Template::LookupRoot($guid);
+if (!$template) {
+# Bad template; spit back a stub image.
+    SPITERROR();
+    return;
+}
 
 #
 # If the request did not specify a zoom, return whatever we have.
 #
 if (!isset($zoom)) {
-    SPITGRAPH($guid);
+    SPITGRAPH($template);
     return;
 }
 
@@ -79,10 +71,8 @@ if (!isset($zoom)) {
 #
 $optarg = "-z " . ($zoom == "in" ? "in" : "out");
 
-if (! TBGuid2PidGid($guid, $pid, $gid)) {
-    TBERROR("Could not get template pid,gid for template $guid", 0);
-    SPITERROR();
-}
+$pid = $template->pid();
+$gid = $template->gid();
 TBGroupUnixInfo($pid, $gid, $unix_gid, $unix_name);
 
 $retval = SUEXEC($uid, "$pid,$unix_gid", "webtemplate_graph $optarg $guid",
@@ -92,7 +82,7 @@ if ($retval) {
     SPITERROR();
 }
 else {
-    SPITGRAPH();
+    SPITGRAPH($template);
 }
 
 #
diff --git a/www/template_history.php b/www/template_history.php
index aa8998f59..79535e4a7 100644
--- a/www/template_history.php
+++ b/www/template_history.php
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # Only known and logged in users can look at experiments.
@@ -46,17 +46,14 @@ else {
 PAGEHEADER("Experiment Template History");
 
 #
-# Check to make sure this is a valid template.
+# Check to make sure this is a valid template and user has permission.
 #
-if (! TBValidExperimentTemplate($guid, $version)) {
+$template = Template::Lookup($guid, $version);
+if (!$template) {
     USERERROR("The experiment template $guid/$version is not a valid ".
               "experiment template!", 1);
 }
-
-#
-# Verify Permission.
-#
-if (! TBExptTemplateAccessCheck($uid, $guid, $TB_EXPT_READINFO)) {
+if (! $template->AccessCheck($uid, $TB_EXPT_READINFO)) {
     USERERROR("You do not have permission to view experiment template ".
 	      "$guid/$version!", 1);
 }
@@ -67,7 +64,7 @@ echo "<font size=+2>Experiment Template <b>" .
       "</b></font>\n";
 echo "<br><br>\n";
 
-SHOWTEMPLATEHISTORY($guid, $version, $expand);
+$template->ShowHistory($expand);
 
 #
 # Standard Testbed Footer
diff --git a/www/template_metadata.php b/www/template_metadata.php
index 7361fc92b..bb0c9dd98 100644
--- a/www/template_metadata.php
+++ b/www/template_metadata.php
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # No PAGEHEADER since we spit out a Location header later. See below.
@@ -16,7 +16,7 @@ include("template_defs.php");
 #
 $uid = GETLOGIN();
 LOGGEDINORDIE($uid);
-$isadmin = ISADMIN($uid);
+$isadmin  = ISADMIN($uid);
 
 #
 # Spit the form out using the array of data.
@@ -127,6 +127,10 @@ function SPITFORM($action, $formfields, $errors)
         </table>\n";
 }
 
+# Objects
+$metadata = NULL;
+$template = NULL;
+
 #
 # On first load, display virgin form and exit.
 #
@@ -158,11 +162,29 @@ if (!isset($submit)) {
 	$metadata_vers = $version;
 
 	#
-	# Find template associated with this metadata item (for perm check).
+	# Find this metadata item.
 	#
-	if (! TBMetadataTemplate($guid, $version, $template_guid)) {
+	$metadata = TemplateMetadata::Lookup($metadata_guid, $metadata_vers);
+	
+	if (! $metadata) {
 	    USERERROR("Invalid metadata $guid/$version", 1);
 	}
+
+        #
+        # Verify Permission. Need permission for the template, any version.
+        #
+	$template = Template::Lookup($metadata->template_guid(), 1);
+
+	if (!$template ||
+	    !$template->AccessCheck($uid, $TB_EXPT_READINFO)) {
+	    USERERROR("You do not have permission to view metadata in ".
+		      " template $template_guid!", 1);
+	}
+
+	PAGEHEADER("Show Metadata");
+	$metadata->Show();
+	PAGEFOOTER();
+	return;
     }
     elseif ($action == "modify") {
 	$template_guid = $guid;
@@ -185,9 +207,17 @@ if (!isset($submit)) {
 	#
 	# Verify this metadata is attached to the template.
 	#
-	if (! TBValidTemplateMetadata($metadata_guid, $metadata_vers,
-				      $template_guid, $template_vers)) {
-	    USERERROR("Invalid metadata $guid/$version", 1);
+	$template = Template::Lookup($template_guid, $template_vers);
+
+	if (!$template) {
+	    USERERROR("Invalid template $template_guid/$template_vers", 1);
+	}
+
+	$metadata = $template->LookupMetadataByGUID($metadata_guid,
+						    $metadata_vers);
+
+	if (!$template) {
+	    USERERROR("Invalid metadat $metadata_guid/$metadata_vers", 1);
 	}
     }
     else {
@@ -197,37 +227,24 @@ if (!isset($submit)) {
         #
         # Check to make sure this is a valid template.
         #
-	if (! TBValidExperimentTemplate($guid, $version)) {
-	    USERERROR("The experiment template $guid/$version is not a valid ".
-		      "experiment template!", 1);
+	$template = Template::Lookup($template_guid, $template_vers);
+
+	if (!$template) {
+	    USERERROR("Invalid template $template_guid/$template_vers", 1);
 	}
     }
-    
-    #
-    # Verify Permission.
-    #
-    if (! TBExptTemplateAccessCheck($uid, $template_guid, $TB_EXPT_MODIFY)) {
+
+    # Perm check for add/modify to the template.
+    if (!$template->AccessCheck($uid, $TB_EXPT_MODIFY)) {
 	USERERROR("You do not have permission to $action metadata in ".
 		  " template $template_guid!", 1);
     }
 
-    #
-    # For plain show ...
-    #
-    if ($action == "show") {
-	PAGEHEADER("Show Metadata");
-	SHOWMETADATAITEM($guid, $version);	
-	PAGEFOOTER();
-	return;
-    }
-
+    # Defaults from the form come from the DB.
+    $defaults = array();
     if ($action == "modify") {
-	if (! TBMetadataData($metadata_guid, $metadata_vers, $defaults)) {
-	    USERERROR("Could not retrieve metadata data", 1);
-	}
-    }
-    else {
-	$defaults = array();
+	$defaults["name"]  = $metadata->name();
+	$defaults["value"] = $metadata->value();
     }
     
     #
@@ -279,14 +296,16 @@ if ($action == "modify") {
     #
     # Verify this metadata is attached to the template.
     #
-    if (! TBValidTemplateMetadata($metadata_guid, $metadata_vers,
-				  $template_guid, $template_vers)) {
-	USERERROR("Invalid metadata $guid/$version", 1);
+    $template = Template::Lookup($template_guid, $template_vers);
+
+    if (!$template) {
+	USERERROR("Invalid template $template_guid/$template_vers", 1);
     }
 
-    # Need this below.
-    if (! TBMetadataData($metadata_guid, $metadata_vers, $metadata_data)) {
-	USERERROR("Could not retrieve metadata data", 1);
+    $metadata = $template->LookupMetadataByGUID($metadata_guid,$metadata_vers);
+
+    if (!$template) {
+	USERERROR("Invalid metadat $metadata_guid/$metadata_vers", 1);
     }
 }
 else {
@@ -306,18 +325,17 @@ else {
     #
     # Check to make sure this is a valid template.
     #
-    if (! TBValidExperimentTemplate($template_guid, $template_vers)) {
-	USERERROR("The experiment template $template_guid/$template_vers ".
-		  "is not a valid experiment template!", 1);
+    $template = Template::Lookup($template_guid, $template_vers);
+    
+    if (!$template) {
+	USERERROR("Invalid template $template_guid/$template_vers", 1);
     }
 }
 
-#
-# Verify Permission.
-#
-if (! TBExptTemplateAccessCheck($uid, $template_guid, $TB_EXPT_MODIFY)) {
-    USERERROR("You do not have permission to modify experiment template ".
-	      "$template_guid/$template_vers!", 1);
+# Perm check for add/modify to the template.
+if (!$template->AccessCheck($uid, $TB_EXPT_MODIFY)) {
+    USERERROR("You do not have permission to $action metadata in ".
+	      " template $template_guid!", 1);
 }
 
 #
@@ -337,17 +355,13 @@ elseif (!TBvalid_template_metadata_name($formfields[name])) {
 }
 
 if ($action == "add") {
-    if (TBTemplateMetadataLookup($template_guid, $template_vers,
-				 $formfields[name], $metadata_value)) {
+    if ($template->LookupMetadataByName($formfields[name])) {
 	$errors["Metadata Name"] = "Name already in use";
     }
     $command_opts .= "-a add " . escapeshellarg($formfields[name]);
 }
 else {
-    if (!TBTemplateMetadataLookup($template_guid, $template_vers,
-				  $formfields[name], $metadata_value)) {
-	$errors["Metadata Name"] = "Name does not exist to modify";
-    }
+    # Had to already exist above. 
     $command_opts .= "-a modify " . escapeshellarg($formfields[name]);
 }
 
@@ -407,9 +421,8 @@ chmod($datafile, 0666);
 #
 # The backend does the actual work.
 #
-if (!TBGuid2PidGid($template_guid, $pid, $gid)) {
-    TBERROR("Could not determine pid/gid of template $template_guid", 1);
-}
+$pid = $template->pid();
+$gid = $template->gid();
 TBGroupUnixInfo($pid, $gid, $unix_gid, $unix_name);
 
 $retval = SUEXEC($uid, "$pid,$unix_gid",
diff --git a/www/template_modify.php b/www/template_modify.php
index facfb4f98..06552103a 100644
--- a/www/template_modify.php
+++ b/www/template_modify.php
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # Only known and logged in users.
@@ -126,17 +126,14 @@ if (!TBvalid_integer($version)) {
 }
 
 #
-# Check to make sure this is a valid template.
+# Check to make sure this is a valid template and user has permission.
 #
-if (! TBValidExperimentTemplate($guid, $version)) {
+$template = Template::Lookup($guid, $version);
+if (!$template) {
     USERERROR("The experiment template $guid/$version is not a valid ".
               "experiment template!", 1);
 }
-
-#
-# Verify Permission.
-#
-if (! TBExptTemplateAccessCheck($uid, $guid, $TB_EXPT_MODIFY)) {
+if (! $template->AccessCheck($uid, $TB_EXPT_MODIFY)) {
     USERERROR("You do not have permission to modify experiment template ".
 	      "$guid/$version!", 1);
 }
@@ -148,12 +145,11 @@ if (! isset($modify)) {
     #
     # Grab NS file for the template.
     #
-    $input_list  = TBTemplateInputFiles($guid, $version);
-    TBTemplateDescription($guid, $version, $description);
+    $input_list  = $template->InputFiles();
 
     $defaults = array();
     $defaults["nsdata"] = $input_list[0];
-    $defaults["description"] = $description;
+    $defaults["description"] = $template->description();
     SPITFORM($defaults, 0);
     PAGEFOOTER();
     exit();
@@ -176,11 +172,10 @@ srand((float) $sec + ((float) $usec * 100000));
 $foo = rand();
 
 #
-# Get template group so we can get the unix_gid.
+# Need these below,
 #
-if (! TBGuid2PidGid($guid, $pid, $gid)) {
-    TBERROR("Could not get pid,gid for experiment template $guid/$version", 1);
-}
+$pid = $template->pid();
+$gid = $template->gid();
     
 #
 # TID
@@ -194,9 +189,6 @@ if (!isset($formfields[tid]) || $formfields[tid] == "") {
 elseif (!TBvalid_eid($formfields[tid])) {
     $errors["Template ID"] = TBFieldErrorString();
 }
-elseif (TBValidExperimentTemplate($pid, $formfields[tid])) {
-    $errors["Template ID"] = "Already in use";
-}
 else {
     $tid = $formfields[tid];
 }
@@ -282,23 +274,26 @@ if ($retval) {
     return;
 }
 
-unset($guid);
-if (TBPidTid2Template($pid, $tid, $guid, $version)) {
+#
+# Parse the last line of output. Ick.
+#
+if (preg_match("/^Template\s+(\w+)\/(\w+)\s+/",
+	       $suexec_output_array[count($suexec_output_array)-1],
+	       $matches)) {
+    $guid = $matches[1];
+    $vers = $matches[2];
+    
     echo "<script type='text/javascript' language='javascript'>\n";
-    echo "PageReplace('template_show.php?guid=$guid&version=$version');\n";
+    echo "PageReplace('template_show.php?guid=$guid&version=$vers');\n";
     echo "</script>\n";
 }
 
 #
 # In case the above redirect fails.
 #
-echo "Done!";
+echo "<center><b>Done!</b></center>";
 echo "<br><br>\n";
 
-if (isset($guid)) {
-    SHOWTEMPLATE($guid, $version);
-}
-
 #
 # Standard Testbed Footer
 # 
diff --git a/www/template_show.php b/www/template_show.php
index 780aff288..5e6553449 100644
--- a/www/template_show.php
+++ b/www/template_show.php
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # Only known and logged in users ...
@@ -18,10 +18,11 @@ $isadmin = ISADMIN($uid);
 $pid = "";
 $eid = "";
 $gid = "";
+$template = NULL;
 
 function CheckArguments($guid, $version) {
     global $TB_EXPT_READINFO;
-    global $uid, $pid, $eid, $gid;
+    global $uid, $pid, $eid, $gid, $template;
 
     #
     # Verify page arguments.
@@ -45,117 +46,23 @@ function CheckArguments($guid, $version) {
     #
     # Check to make sure this is a valid template.
     #
-    if (! TBValidExperimentTemplate($guid, $version)) {
+    if (($template = new Template($guid, $version)) == NULL) {
 	USERERROR("The experiment template $guid/$version is not a ".
 		  "valid experiment template!", 1);
     }
-    TBTemplatePidEid($guid, $version, $pid, $eid);
+    $pid = $template->pid();
+    $gid = $template->gid();
+    $eid = $template->eid();
   
     #
     # Verify Permission.
     #
-    if (! TBExptTemplateAccessCheck($uid, $guid, $TB_EXPT_READINFO)) {
+    if (! $template->AccessCheck($uid, $TB_EXPT_READINFO)) {
 	USERERROR("You do not have permission to view experiment ".
 		  "template $guid/$version!", 1);
     }
 }
 
-/**
- * Get the template versions associated with the given GUID.
- *
- * @param $guid The template GUID.
- * @return An array of template "objects".
- */
-function GetTemplates($guid) {
-    CheckArguments($guid, 1); /* XXX bogus version number. */
-
-    $query_result =
-	DBQueryFatal("SELECT vers,parent_vers,tid,hidden ".
-		     "FROM experiment_templates ".
-		     "WHERE guid='$guid' ".
-		     "ORDER BY vers");
-
-    $retval = array();
-    while ($row = mysql_fetch_array($query_result)) {
-	$metadata_result =
-	    DBQueryFatal("SELECT name,value ".
-			 "FROM experiment_template_metadata ".
-			 "WHERE template_guid='$guid' and ".
-			 "      template_vers='$row[vers]' ".
-			 "ORDER BY created DESC");
-
-	$metadata = array();
-	while ($mrow = mysql_fetch_array($metadata_result)) {
-	    $metadata[$mrow[name]] = $mrow[value];
-	}
-
-	if (count($metadata) > 0) {
-	    $row[metadata] = $metadata;
-	}
-	
-	if (TBTemplatePidEid($guid, $row[vers], &$pid, &$eid)) {
-	    $parameter_result =
-		DBQueryFatal("SELECT name,value FROM virt_parameters ".
-			     "WHERE pid='$pid' and eid='$eid'");
-	    
-	    $parameters = array();
-	    while ($prow = mysql_fetch_array($parameter_result)) {
-		$parameters[$prow[name]] = $prow[value];
-	    }
-	    
-	    if (count($parameters) > 0) {
-		$row[parameters] = $parameters;
-	    }
-	}
-	
-	$retval[] = $row;
-    }
-    
-    return $retval;
-}
-
-function queryFilter($v) {
-    return ($v != "");
-}
-
-function SearchTemplates($guid, $terms) {
-    /* XXX */
-    CheckArguments($guid, 1);
-
-    $matches = array();
-    $retval = array();
-
-    $terms = split(" ", $terms);
-    $terms = array_filter($terms, "queryFilter");
-
-    foreach ($terms as $term) {
-	$term = "'%" . mysql_real_escape_string($term) . "%'";
-
-	$query_result =
-	    DBQueryFatal("SELECT template_vers ".
-			 "FROM experiment_template_metadata ".
-			 "WHERE template_guid='$guid' and ".
-			 "      (name like ". $term . " or " .
-			 "       value like ". $term . ") " .
-			 "GROUP BY template_vers");
-
-	while ($row = mysql_fetch_array($query_result)) {
-	    if (!isset($matches[$row[template_vers]])) {
-		$matches[$row[template_vers]] = 0;
-	    }
-	    $matches[$row[template_vers]] += 1;
-	}
-    }
-
-    foreach ($matches as $key => $match) {
-	if ($match == count($terms)) {
-	    $retval[] = $key;
-	}
-    }
-
-    return $retval;
-}
-
 CheckArguments($guid, $version);
 
 if (isset($action) || isset($zoomin) || isset($zoomout)) {
@@ -181,9 +88,6 @@ if (isset($action) || isset($zoomin) || isset($zoomout)) {
 	$optarg = "-z out";
     }
 
-    if (! TBGuid2PidGid($guid, $pid, $gid)) {
-	TBERROR("Could not get template pid,gid for template $guid", 1);
-    }
     # Need to update the template graph.
     TBGroupUnixInfo($pid, $gid, $unix_gid, $unix_name);
 
@@ -206,10 +110,8 @@ WRITESUBMENUBUTTON("Show NS File &nbsp &nbsp",
 WRITESUBMENUBUTTON("Modify Template",
 		   "template_modify.php?guid=$guid&version=$version");
 
-if (! TBIsRootTemplate($guid, $version)) {
-    $hidden = TBIsExperimentTemplateHidden($guid, $version);
-    
-    if ($hidden) {
+if (! $template->IsRoot()) {
+    if ($template->IsHidden()) {
 	WRITESUBMENUBUTTON("Show Template",
 			   "template_show.php?guid=$guid".
 			   "&version=$version&action=show");
@@ -245,15 +147,15 @@ echo "<br>
       <img border=1 alt='template visualization'
            src='showthumb.php3?idx=$rsrcidx'>";
 
-if (TemplateInstanceCount($guid, $version)) {
-    SHOWTEMPLATEINSTANCES($guid, $version);
+if ($template->InstanceCount()) {
+    $template->ShowInstances();
 }
 
 SUBMENUEND_2B();
 
 echo "<script type='text/javascript' src='js/wz_dragdrop.js'></script>";
 
-SHOWTEMPLATEGRAPH($guid);
+$template->ShowGraph();
 
 #
 # Define the zoom buttons. This should go elsewhere.
@@ -274,8 +176,8 @@ SUBPAGEEND();
 
 echo "<script type='text/javascript' src='js/wz_tooltip.js'></script>";
 
-$paramcount = TemplateParameterCount($guid, $version);
-$metacount  = TemplateMetadataCount($guid, $version);
+$paramcount = $template->ParameterCount();
+$metacount  = $template->MetadataCount();
 $rowspan    = (($paramcount && $metacount) ? 2 : 1);
 
 echo "<center>\n";
@@ -283,7 +185,7 @@ echo "<table border=0 bgcolor=#000 color=#000 class=stealth ".
      " cellpadding=0 cellspacing=0>\n";
 echo "<tr valign=top><td rowspan=$rowspan class=stealth align=center>\n";
 
-SHOWTEMPLATE($guid, $version);
+$template->Show();
 
 echo "</td>\n";
 
@@ -292,19 +194,19 @@ if ($paramcount || $metacount) {
     echo "<td align=center class=stealth> \n";
     
     if ($paramcount && $metacount) {
-	SHOWTEMPLATEPARAMETERS($guid, $version);
+	$template->ShowParameters();
 	echo "</td>\n";
 	echo "</tr>\n";
 	echo "<tr valign=top>";
 	echo "<td align=center class=stealth> &nbsp &nbsp &nbsp </td>\n";
 	echo "<td class=stealth align=center>\n";
-	SHOWTEMPLATEMETADATA($guid, $version);
+	$template->ShowMetadata();
     }
     elseif ($paramcount) {
-	SHOWTEMPLATEPARAMETERS($guid, $version);
+	$template->ShowParameters();
     }
     else {
-	SHOWTEMPLATEMETADATA($guid, $version);
+	$template->ShowMetadata();
     }
     echo "</td>\n";
 }
diff --git a/www/template_swapin.php b/www/template_swapin.php
index 63e5de826..199073aa3 100644
--- a/www/template_swapin.php
+++ b/www/template_swapin.php
@@ -5,7 +5,7 @@
 # All rights reserved.
 #
 include("defs.php3");
-include("template_defs.php");
+include_once("template_defs.php");
 
 #
 # No PAGEHEADER since we spit out a Location header later. See below.
@@ -29,18 +29,20 @@ $batchmode     = 0;
 #
 # Spit the form out using the array of data.
 #
-function SPITFORM($formfields, $parameters, $errors)
+function SPITFORM($template, $formfields, $parameters, $errors)
 {
     global $TBDB_EIDLEN;
-    global $guid, $version;
 
     PAGEHEADER("Instantiate an Experiment Template");
 
     echo "<center>\n";
-    SHOWTEMPLATE($guid, $version);
+    $template->Show();
     echo "</center>\n";
     echo "<br>\n";
 
+    $guid = $template->guid();
+    $version = $template->vers();
+
     if ($errors) {
 	echo "<table class=nogrid
                      align=center border=0 cellpadding=6 cellspacing=0>
@@ -266,17 +268,14 @@ if (!TBvalid_integer($version)) {
 }
 
 #
-# Check to make sure this is a valid template.
+# Check to make sure this is a valid template and enough permission.
 #
-if (! TBValidExperimentTemplate($guid, $version)) {
+$template = Template::Lookup($guid, $version);
+if (!$template) {
     USERERROR("The experiment template $guid/$version is not a valid ".
               "experiment template!", 1);
 }
-
-#
-# Verify Permission.
-#
-if (! TBExptTemplateAccessCheck($uid, $guid, $TB_EXPT_UPDATE)) {
+if (! $template->AccessCheck($uid, $TB_EXPT_UPDATE)) {
     USERERROR("You do not have permission to instantiate experiment template ".
 	      "$guid/$version!", 1);
 }
@@ -285,9 +284,7 @@ if (! TBExptTemplateAccessCheck($uid, $guid, $TB_EXPT_UPDATE)) {
 # On first load, display virgin form and exit.
 #
 if (!isset($swapin)) {
-    TBTemplateTid($guid, $version, $tid);
-    
-    $defaults[eid]		     = $tid;
+    $defaults[eid]		     = $template->tid();
     $defaults[exp_swappable]         = "1";
     $defaults[exp_noswap_reason]     = "";
     $defaults[exp_idleswap]          = "1";
@@ -298,7 +295,7 @@ if (!isset($swapin)) {
     #
     # Look for formal parameters that the user can specify.
     #
-    TBTemplateFormalParameters($guid, $version, $parameters);
+    $template->FormalParameters($parameters);
     
     #
     # Allow formfields that are already set to override defaults
@@ -309,7 +306,7 @@ if (!isset($swapin)) {
 	}
     }
 
-    SPITFORM($defaults, $parameters, 0);
+    SPITFORM($template, $defaults, $parameters, 0);
     PAGEFOOTER();
     return;
 }
@@ -318,9 +315,8 @@ elseif (! isset($formfields)) {
 }
 
 # Need this below.
-if (! TBGuid2PidGid($guid, $pid, $gid)) {
-    TBERROR("Could not get template pid,gid for template $guid", 1);
-}
+$pid = $template->pid();
+$gid = $template->gid();
 
 #
 # Okay, validate form arguments.
@@ -451,7 +447,7 @@ if (isset($formfields[exp_savedisk]) &&
 #
 # Parameters. The XML file overrides stuff in the form. 
 #
-TBTemplateFormalParameters($guid, $version, $parameter_masterlist);
+$template->FormalParameters($parameter_masterlist);
 if (count($parameter_masterlist)) {
     if (isset($formfields[parameter_xmlfile]) &&
 	$formfields[parameter_xmlfile] != "") {
@@ -514,7 +510,7 @@ if (isset($formfields[batched]) && $formfields[batched] == "Yep") {
 }
 
 if (count($errors)) {
-    SPITFORM($formfields, $parameters, $errors);
+    SPITFORM($template, $formfields, $parameters, $errors);
     PAGEFOOTER();
     exit(1);
 }
@@ -538,9 +534,17 @@ echo "<font size=+2>Experiment Template <b>" .
       "</b></font>\n";
 echo "<br><br>\n";
 
-echo "<b>Starting template instantiation!</b> ... ";
-echo "this will take several minutes at least; please be patient.";
+echo "<script type='text/javascript' language='javascript' ".
+     "        src='template_sup.js'>\n";
+echo "</script>\n";
+
+echo "<center>\n";
+echo "<b>Starting template instantiation!</b> ...<br>\n";
+echo "This will take several minutes; please be patient.<br>\n";
 echo "<br><br>\n";
+echo "<img id='busy' src='busy.gif'><span id='loading'> Working ...</span>";
+echo "<br><br>\n";
+echo "</center>\n";
 flush();
 
 #
@@ -550,6 +554,11 @@ $retval = SUEXEC($uid, "$pid,$unix_gid",
 		 "webtemplate_swapin $command_options -e $eid $guid/$version",
 		 SUEXEC_ACTION_IGNORE);
 
+/* Clear the 'loading' indicators above */
+echo "<script type='text/javascript' language='javascript'>\n";
+echo "ClearLoadingIndicators();\n";
+echo "</script>\n";
+
 if ($deletexmlfile) {
     unlink($parameter_xmlfile);
 }
-- 
GitLab