--- a/getAgency.php
+++ b/getAgency.php
@@ -13,25 +13,25 @@
if (is_array($value)) {
echo "
";
foreach ($value as $subkey => $subvalue) {
- if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
- echo '- ';
- } else {
- echo "
- ";
- }
+ if (isset($schemas['agency']["properties"][$key]['x-property'])) {
+ echo '
- ';
+ } else {
+ echo "
- ";
+ }
echo "$subvalue
";
}
echo "
";
} else {
- if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
- echo '';
+ if (isset($schemas['agency']["properties"][$key]['x-property'])) {
+ echo '';
} else {
echo "";
}
- if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
- echo "view";
- } else {
- echo "$value";
- }
+ if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+ echo "view";
+ } else {
+ echo "$value";
+ }
}
echo "";
}
@@ -53,13 +53,11 @@
} else if ($key == "parentOrg") {
echo "";
- } else if (strpos($key, "has") === 0) {
- echo "";
} else {
echo "";
if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
@@ -71,7 +69,7 @@
}
}
}
- //
+//
}
function addDefaultFields($row) {
@@ -80,15 +78,17 @@
foreach ($defaultFields as $defaultField) {
if (!isset($row[$defaultField])) {
if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
- if (strpos($defaultField, "has") === 0) {
- $row[$defaultField] = "false";
- } else {
- $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);
}
}
}
@@ -98,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']) {
@@ -128,11 +136,11 @@
if ($mode == "edit") {
$row = addDefaultFields(object_to_array($row));
} else {
- $row = object_to_array($row);
- }
-
+ $row = object_to_array($row);
+ }
+
if ($mode == "view") {
- echo '";
+ }
+ if ($mode == "edit") {
+ echo '';
+ }
+ } else {
+
+ try {
+ /* $rows = $db->get_view("app", "showNamesABNs")->rows;
+ //print_r($rows);
+ foreach ($rows as $row) {
+ // print_r($row);
+ echo '' .
+ (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
+ . '';
+ } */
+ $rows = $db->get_view("app", "byName")->rows;
+ //print_r($rows);
+ echo '";
+ } catch (SetteeRestClientException $e) {
+ setteErrorHandler($e);
+ }
+ }
+ include_footer();
+ ?>
+