--- a/getAgency.php +++ b/getAgency.php @@ -14,10 +14,10 @@ echo "<ol>"; foreach ($value as $subkey => $subvalue) { if (isset($schemas['agency']["properties"][$key]['x-property'])) { - echo '<li property="' . $schemas['agency']["properties"][$key]['x-property'] . '">'; - } else { - echo "<li>"; - } + echo '<li property="' . $schemas['agency']["properties"][$key]['x-property'] . '">'; + } else { + echo "<li>"; + } echo "$subvalue</li>"; } echo "</ol></td></tr>"; @@ -27,11 +27,11 @@ } else { echo "<span>"; } - if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { - echo "<a href='$value'>view</a></span>"; - } else { - echo "$value</span>"; - } + if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { + echo "<a href='$value'>view</a></span>"; + } else { + echo "$value</span>"; + } } echo "</td></tr>"; } @@ -53,12 +53,12 @@ } 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); +//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 { + } 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>"; @@ -69,7 +69,7 @@ } } } - // +// } function addDefaultFields($row) { @@ -78,13 +78,17 @@ foreach ($defaultFields as $defaultField) { if (!isset($row[$defaultField])) { if ($schemas['agency']['properties'][$defaultField]['type'] == "string") { - - $row[$defaultField] = ""; - + $row[$defaultField] = ""; } if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { - $row[$defaultField] = Array(""); + } + } else if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { + if (is_array($row[$defaultField])) { + $row[$defaultField][] = ""; + } else { + $value = $row[$defaultField]; + $row[$defaultField] = Array($value); } } } @@ -94,20 +98,28 @@ $db = $server->get_db('disclosr-agencies'); if (isset($_REQUEST['id'])) { - //get an agency record as json/html, search by name/abn/id +//get an agency record as json/html, search by name/abn/id // by name = startkey="Ham"&endkey="Ham\ufff0" // edit? $row = $db->get($_REQUEST['id']); - //print_r($row); +//print_r($row); if (sizeof($_POST) > 0) { - //print_r($_POST); +//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 (is_array($postvalue)) { + if (count($postvalue) == 1 && $postvalue[0] == "") { + unset($_POST[$postkey]); + } else { + foreach ($_POST[$postkey] as $key => &$value) { + if ($value == "") { + unset($_POST[$postkey][$key]); + } + } + } } } if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) { @@ -124,9 +136,9 @@ if ($mode == "edit") { $row = addDefaultFields(object_to_array($row)); } else { - $row = object_to_array($row); - } - + $row = object_to_array($row); + } + if ($mode == "view") { echo '<div typeof="schema:GovernmentOrganisation" about="#' . $row['_id'] . '"><table width="100%">'; echo '<tr> <td colspan="2"><h3>' . $row['name'] . "</h3></td></tr>"; @@ -153,44 +165,44 @@ }; </script> <form id="editform" class="nice" method="post"> - <?php - - } - foreach ($row as $key => $value) { - echo displayValue($key, $value, $mode); - } - if ($mode == "view") { - echo "</table></div>"; - } - if ($mode == "edit") { - echo '<input id="submitbutton" type="submit"/></form>'; - } -} else { - - 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); -echo '<ul>'; - foreach ($rows as $row) { - // print_r($row); - echo '<li typeof="schema:GovernmentOrganisation foaf:Organization" about="getAgency.php?id=' . $row->value . '"> + <?php + + } + foreach ($row as $key => $value) { + echo displayValue($key, $value, $mode); + } + if ($mode == "view") { + echo "</table></div>"; + } + if ($mode == "edit") { + echo '<input id="submitbutton" type="submit"/></form>'; + } + } else { + + 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); + echo '<ul>'; + foreach ($rows as $row) { + // print_r($row); + echo '<li typeof="schema:GovernmentOrganisation foaf:Organization" about="getAgency.php?id=' . $row->value . '"> <a href="getAgency.php?id=' . $row->value . '" rel="schema:url foaf:page" property="schema:name foaf:name">' . - $row->key - . '</a></li>'; - } -echo "</ul>"; - } catch (SetteeRestClientException $e) { - setteErrorHandler($e); - } -} -include_footer(); -?> - + $row->key + . '</a></li>'; + } + echo "</ul>"; + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } + } + include_footer(); + ?> +