--- a/getAgency.php +++ b/getAgency.php @@ -1,20 +1,47 @@ <?php include_once('include/common.inc.php'); -include_header(); + function displayValue($key, $value, $mode) { - global $db; + global $db, $schemas; if ($mode == "view") { +if (strpos($key, "_") === 0 || $key== "metadata") return; + echo "<tr>"; + + echo "<td>"; + if (isset($schemas['agency']["properties"][$key])) { + echo $schemas['agency']["properties"][$key]['x-title'] . "<br><small>" . $schemas['agency']["properties"][$key]['description']."</small>"; + } + echo "</td><td>"; if (is_array($value)) { - echo "<tr><td>$key</td><td><ol>"; + echo "<ol>"; foreach ($value as $subkey => $subvalue) { - echo "<li>$subvalue</li>"; + + echo "<li "; + if (isset($schemas['agency']["properties"][$key]['x-property'])) { + echo ' property="' . $schemas['agency']["properties"][$key]['x-property'] . '" '; + } if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) { + echo ' itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '" '; + } + echo " >"; + + echo "$subvalue</li>"; } echo "</ol></td></tr>"; } else { - echo "<tr><td>$key</td><td>$value</td></tr>"; - } + if (isset($schemas['agency']["properties"][$key]['x-property'])) { + echo '<span property="' . $schemas['agency']["properties"][$key]['x-property'] . '">'; + } else { + echo "<span>"; + } + if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { + echo "<a ".($key == 'website' ? 'itemprop="url"':'')." href='$value'>$value</a>"; + } else { + echo "$value</span>"; + } + } + echo "</td></tr>"; } if ($mode == "edit") { if (is_array($value)) { @@ -31,29 +58,27 @@ } else { if (strpos($key, "_") === 0) { echo"<input type='hidden' id='$key' name='$key' value='$value'/>"; - } 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 if (strpos($key, "has") === 0) { - echo "<label for='$key'><input type='checkbox' id='$key' name='$key' ".(($value=='on' || $value=='true')?"checked='$value'":"")."> $key</label>"; + $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 ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { + echo "<a ".($key == 'website' ? 'itemprop="url"':'')." href='$value'>view</a>"; + } if ($key == 'abn') { - echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>view abn</a>"; - } - } - } - } - // + echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>view abn</a>"; + } + } + } + } +// } function addDefaultFields($row) { @@ -62,17 +87,22 @@ foreach ($defaultFields as $defaultField) { if (!isset($row[$defaultField])) { if ($schemas['agency']['properties'][$defaultField]['type'] == "string") { - if (strpos($defaultField, "has") === 0) { - $row[$defaultField] = "false"; + $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][] = ""; + $row[$defaultField][] = ""; + $row[$defaultField][] = ""; + } else { + $value = $row[$defaultField]; + $row[$defaultField] = Array($value); + $row[$defaultField][] = ""; + $row[$defaultField][] = ""; - } else { - $row[$defaultField] = ""; - } - - } - if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { - - $row[$defaultField] = Array(""); } } } @@ -82,37 +112,53 @@ $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); + $obj = $db->get($_REQUEST['id']); + include_header($obj->name); +//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']) { echo "Edited version was latest version, continue saving"; $newdoc = $_POST; $newdoc['metadata']['lastModified'] = time(); - $row = $db->save($newdoc); + $obj = $db->save($newdoc); } else { echo "ALERT doc revised by someone else while editing. Document not saved."; } } - $mode = "edit"; - $row = addDefaultFields(object_to_array($row)); + $mode = "view"; + $rowArray = object_to_array($obj); +ksort($rowArray); + if ($mode == "edit") { + $row = addDefaultFields($rowArray); + } else { + $row = $rowArray; + } + 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/GovernmentOrganization" typeof="schema:GovernmentOrganization" about="#' . $row['_id'] . '"><table width="100%">'; + echo '<tr> <td colspan="2"><h3 itemprop="name">' . $row['name'] . "</h3></td></tr>"; echo "<tr><th>Field Name</th><th>Field Value</th></tr>"; } if ($mode == "edit") { @@ -143,33 +189,38 @@ echo displayValue($key, $value, $mode); } if ($mode == "view") { - echo "</table>"; + echo "</table></div>"; } if ($mode == "edit") { echo '<input id="submitbutton" type="submit"/></form>'; } } else { - +// show all list + include_header('Agencies'); try { - /*$rows = $db->get_view("app", "showNamesABNs")->rows; + /* $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", "byCanonicalName")->rows; //print_r($rows); + echo '<ul>'; 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><a href="getAgency.php?id=' . $row->value . '">' . - $row->key - . '</a></li>'; - } + echo '<li itemscope itemtype="http://schema.org/GovernmentOrganization" typeof="schema:GovernmentOrganization foaf:Organization" about="getAgency.php?id=' . $row->value->_id . '"> +<a href="getAgency.php?id=' . $row->value->_id . '" rel="schema:url foaf:page" property="schema:name foaf:name" itemprop="url"><span itemprop="name">' . + $row->value->name + . '</span></a></li>'; + } + echo "</ul>"; } catch (SetteeRestClientException $e) { setteErrorHandler($e); } } include_footer(); ?> +