--- a/getAgency.php
+++ b/getAgency.php
@@ -1,39 +1,98 @@
 <?php
 
-include_once('common.inc.php');
+include_once('include/common.inc.php');
 include_header();
 
 function displayValue($key, $value, $mode) {
+    global $db, $schemas;
     if ($mode == "view") {
+
+        echo "<tr>";
+
+        echo "<td>" . $schemas['agency']["properties"][$key]['x-title'] . "<br><small>" . $schemas['agency']["properties"][$key]['description'] . "</small></td><td>";
         if (is_array($value)) {
-            echo "<tr><td>$key</td><td><ol>";
+            echo "<ol>";
             foreach ($value as $subkey => $subvalue) {
-                echo "<li>$subvalue</li>";
+                if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
+                echo '<li itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+            } else {
+                echo "<li>";
+            }
+                echo "$subvalue</li>";
             }
             echo "</ol></td></tr>";
         } else {
-            echo "<tr><td>$key</td><td>$value</td></tr>";
+            if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
+                echo '<span itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+            } else {
+                echo "<span>";
+            }
+              if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+                    echo "<a href='$value'>view</a></span>";
+                } else {
+            echo "$value</span>";
+                }
         }
+        echo "</td></tr>";
     }
     if ($mode == "edit") {
         if (is_array($value)) {
-            echo "<label>$key</label><ol>";
+            echo '<div class="row">
+						<div class="seven columns">
+							<fieldset>
+								<h5>' . $key . '</h5>';
             foreach ($value as $subkey => $subvalue) {
-                echo "<li>$subvalue</li>";
+                echo "<label>$subkey</label><input  class='input-text' type='text' id='$key$subkey' name='$key" . '[' . $subkey . "]' value='$subvalue'/></tr>";
             }
-            echo "</ol>";
+            echo "</fieldset>
+						</div>
+					</div>";
         } else {
-            if (strpos($key,"_") === 0) {
+            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>";
-       
+            } else if ($key == "parentOrg") {
+                echo "<label for='$key'>$key</label><select  id='$key' name='$key'><option value=''> Select... </option>";
+                $rows = $db->get_view("app", "byDeptStateName")->rows;
+                //print_r($rows);
+                foreach ($rows as $row) {
+                    echo "<option value='{$row->value}'" . (($row->value == $value) ? "SELECTED" : "") . " >" . str_replace("Department of ", "", $row->key) . "</option>";
+                }
+                echo" </select>";
+              } else {
+                echo "<label>$key</label><input  class='input-text' type='text' id='$key' name='$key' value='$value'/>";
+                if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+                    echo "<a href='$value'>view</a>";
+                }
+                if ($key == 'abn') {
+                    echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>view abn</a>";
+                }
             }
         }
     }
+    // 
+}
+
+function addDefaultFields($row) {
+    global $schemas;
+    $defaultFields = array_keys($schemas['agency']['properties']);
+    foreach ($defaultFields as $defaultField) {
+        if (!isset($row[$defaultField])) {
+            if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
+               
+                    $row[$defaultField] = "";
+            
+            }
+            if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
+
+                $row[$defaultField] = Array("");
+            }
+        }
+    }
+    return $row;
 }
 
 $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"
@@ -41,35 +100,93 @@
 
     $row = $db->get($_REQUEST['id']);
     //print_r($row);
+    if (sizeof($_POST) > 0) {
+        //print_r($_POST);
+        foreach ($_POST as $postkey => $postvalue) {
+            if ($postvalue == "") {
+                unset($_POST[$postkey]);
+            }
+            if (is_array($postvalue) && count($postvalue) == 1 && $postvalue[0] == "") {
+                unset($_POST[$postkey]);
+            }
+        }
+        if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) {
+            echo "Edited version was latest version, continue saving";
+            $newdoc = $_POST;
+            $newdoc['metadata']['lastModified'] = time();
+            $row = $db->save($newdoc);
+        } else {
+            echo "ALERT doc revised by someone else while editing. Document not saved.";
+        }
+    }
 
     $mode = "edit";
-
+    if ($mode == "edit") {
+        $row = addDefaultFields(object_to_array($row));
+    } else {
+         $row = object_to_array($row);
+    }
+    
     if ($mode == "view") {
-        echo '<table width="100%">';
-        echo '<tr> <td colspan="2"><h3>' . $row->name . "</h3></td></tr>";
+        echo '<div itemscope itemtype ="http://schema.org/GovernmentOrganisation"><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">';
+        ?>
+        <input  id="addfield" type="button" value="Add Field"/>
+        <script>
+            window.onload = function() {
+                $(document).ready(function() {
+                    // put all your jQuery goodness in here.
+                    // http://charlie.griefer.com/blog/2009/09/17/jquery-dynamically-adding-form-elements/
+                    $('#addfield').click(function() {
+                        var field_name=window.prompt("fieldname?","");
+                        if (field_name !="") {
+                            $('#submitbutton').before($('<span></span>')
+                            .append("<label>"+field_name+"</label>")
+                            .append("<input  class='input-text' type='text' id='"+field_name+"' name='"+field_name+"'/>")
+                        );
+                        }
+                    });
+                });
+            };
+        </script>
+        <form id="editform" class="nice" method="post">
+        <?php
+
     }
     foreach ($row as $key => $value) {
         echo displayValue($key, $value, $mode);
     }
     if ($mode == "view") {
-        echo "</table>";
+        echo "</table></div>";
     }
     if ($mode == "edit") {
-        echo '</form>';
+        echo '<input id="submitbutton" type="submit"/></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>';
+    try {
+        /* $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>';
+          } */
+        $rows = $db->get_view("app", "byName")->rows;
+        //print_r($rows);
+        foreach ($rows as $row) {
+            //   print_r($row);
+            echo '<li itemscope itemtype="http://schema.org/GovernmentOrganization"><a href="getAgency.php?id=' . $row->value . '" itemprop="url"><span itemprop="name">' .
+            $row->key
+            . '</span></a></li>';
+        }
+    } catch (SetteeRestClientException $e) {
+        setteErrorHandler($e);
     }
 }
 include_footer();
+?>