--- a/getAgency.php
+++ b/getAgency.php
@@ -3,22 +3,73 @@
 include_once('common.inc.php');
 include_header();
 
-$sag->setDatabase("disclosr-agencies", true);
-//get an agency record as json/html, search by name/abn/id
+function displayValue($key, $value, $mode) {
+    if ($mode == "view") {
+        if (is_array($value)) {
+            echo "<tr><td>$key</td><td><ol>";
+            foreach ($value as $subkey => $subvalue) {
+                echo "<li>$subvalue</li>";
+            }
+            echo "</ol></td></tr>";
+        } else {
+            echo "<tr><td>$key</td><td>$value</td></tr>";
+        }
+    }
+    if ($mode == "edit") {
+        if (is_array($value)) {
+            echo "<label>$key</label><ol>";
+            foreach ($value as $subkey => $subvalue) {
+                echo "<li>$subvalue</li>";
+            }
+            echo "</ol>";
+        } else {
+            if (strpos($key,"_") === 0) {
+                echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
+            } else {
+            echo "<label>$key</label><input  class='input-text' type='text' id='$key' name='$key' value='$value'/></tr>";
+       
+            }
+        }
+    }
+}
+
+$db = $server->get_db('disclosr-agencies');
+if (isset($_REQUEST['id'])) {
+    //get an agency record as json/html, search by name/abn/id
 // by name = startkey="Ham"&endkey="Ham\ufff0"
 // edit?
-$rows = $sag->get('/_design/app/_view/byABN?include_docs=true')->body->rows; // &endkey='.$searchVar
-foreach ($rows as $row) {
-    echo "<table>";
-    echo '<tr> <td colspan="2"><h3>' . $row->doc->agencyName . "</h3></td></tr>";
-    echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
-foreach ($row->doc as $key => $value) {
-            if (is_a($value, 'stdClass')) {
-            		echo "<tr><td>$key</td><td>".var_dump($value,true)."</td></tr>";
-            } else echo "<tr><td>$key</td><td>$value</td></tr>";
-	} // also show documents/URLs available
 
-    echo "</table>";
+    $row = $db->get($_REQUEST['id']);
+    //print_r($row);
+
+    $mode = "edit";
+
+    if ($mode == "view") {
+        echo '<table width="100%">';
+        echo '<tr> <td colspan="2"><h3>' . $row->name . "</h3></td></tr>";
+        echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
+    }
+    if ($mode == "edit") {
+        echo '<form class="nice">';
+    }
+    foreach ($row as $key => $value) {
+        echo displayValue($key, $value, $mode);
+    }
+    if ($mode == "view") {
+        echo "</table>";
+    }
+    if ($mode == "edit") {
+        echo '</form>';
+    }
+} else {
+
+    $rows = $db->get_view("app", "showNamesABNs")->rows;
+//print_r($rows);
+    foreach ($rows as $row) {
+        //   print_r($row);
+        echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
+        (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
+        . '</a></li>';
+    }
 }
-
 include_footer();