From: Alexander Sadleir Date: Mon, 23 Jan 2012 13:50:37 +0000 Subject: Semantic schemas.org on agency viewing X-Git-Url: http://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=ad938fa74aa3bdc8215ca3f88149f2f670c4264b --- Semantic schemas.org on agency viewing Former-commit-id: 4a2f4b2fce4ec7cb97237d515c58f064787b0211 --- --- a/getAgency.php +++ b/getAgency.php @@ -4,17 +4,36 @@ include_header(); function displayValue($key, $value, $mode) { - global $db; + global $db, $schemas; if ($mode == "view") { + + echo ""; + + echo "" . $schemas['agency']["properties"][$key]['x-title'] . "
" . $schemas['agency']["properties"][$key]['description'] . ""; if (is_array($value)) { - echo "$key
    "; + echo "
      "; foreach ($value as $subkey => $subvalue) { - echo "
    1. $subvalue
      2. "; + if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) { + echo '
    2. '; + } else { + echo "
    3. "; + } + echo "$subvalue
      4. "; } echo "
    "; } else { - echo "$key$value"; + if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) { + echo ''; + } else { + echo ""; + } + if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { + echo "view"; + } else { + echo "$value"; + } } + echo ""; } if ($mode == "edit") { if (is_array($value)) { @@ -31,24 +50,23 @@ } else { if (strpos($key, "_") === 0) { echo""; - } else if ($key == "parentOrg") { echo ""; + $rows = $db->get_view("app", "byDeptStateName")->rows; + //print_r($rows); + foreach ($rows as $row) { + echo ""; + } + echo" "; } else if (strpos($key, "has") === 0) { - echo ""; + echo ""; } else { echo ""; - if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") { - echo "view"; + if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { + echo "view"; } if ($key == 'abn') { - echo "view abn"; + echo "view abn"; } } } @@ -63,16 +81,14 @@ if (!isset($row[$defaultField])) { if ($schemas['agency']['properties'][$defaultField]['type'] == "string") { if (strpos($defaultField, "has") === 0) { - $row[$defaultField] = "false"; - + $row[$defaultField] = "false"; } else { - $row[$defaultField] = ""; + $row[$defaultField] = ""; } - } - if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { - - $row[$defaultField] = Array(""); + if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { + + $row[$defaultField] = Array(""); } } } @@ -108,10 +124,15 @@ } } - $mode = "edit"; - $row = addDefaultFields(object_to_array($row)); + $mode = "view"; + if ($mode == "edit") { + $row = addDefaultFields(object_to_array($row)); + } else { + $row = object_to_array($row); + } + if ($mode == "view") { - echo ''; + echo '
    '; echo '"; echo ""; } @@ -136,40 +157,40 @@ }; - $value) { + echo displayValue($key, $value, $mode); + } + if ($mode == "view") { + echo "

    ' . $row['name'] . "

    Field NameField Value
    "; + } + if ($mode == "edit") { + echo ''; + } +} else { + + try { + /* $rows = $db->get_view("app", "showNamesABNs")->rows; + //print_r($rows); + foreach ($rows as $row) { + // print_r($row); + echo '
  1. ' . + (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) + . '
    2. '; + } */ + $rows = $db->get_view("app", "byName")->rows; + //print_r($rows); + foreach ($rows as $row) { + // print_r($row); + echo '
    3. '; } - foreach ($row as $key => $value) { - echo displayValue($key, $value, $mode); - } - 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 '
  3. ' . - (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) - . '
    4. '; - }*/ - $rows = $db->get_view("app", "byName")->rows; - //print_r($rows); - foreach ($rows as $row) { - // print_r($row); - echo '
  4. ' . - $row->key - . '
    5. '; - } - } catch (SetteeRestClientException $e) { - setteErrorHandler($e); - } + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); } - include_footer(); - ?> +} +include_footer(); +?> --- a/schemas/agency.json.php +++ b/schemas/agency.json.php @@ -4,37 +4,37 @@ "description" => "Representation of government agency and online transparency measures", "type" => "object", "properties" => Array( - "name" => Array("type" => "string", "required" => true, "x-title" => "Name", "description" => "Name, most recent and broadest"), + "name" => Array("type" => "string", "required" => true, "x-itemprop" => "name", "x-title" => "Name", "description" => "Name, most recent and broadest"), "shortName" => Array("type" => "string", "required" => false, "x-title" => "Short Name", "description" => "Name shortened, usually to an acronym"), - "foiEmail" => Array("type" => "string", "required" => false, "x-title" => "FOI Contact Email", "description" => "FOI contact email if not foi@"), + "foiEmail" => Array("type" => "string", "required" => false, "x-title" => "FOI Contact Email", "description" => "FOI contact email if not foi@"), + "sameAs" => Array("type" => "array", "required" => false, "x-itemprop"=>"http://www.w3.org/2002/07/owl#sameAs","x-title" => "Same As", "description" => "Same as other URLs/URIs for this entity", + "items" => Array("type" => "string")), "otherNames" => Array("type" => "array", "required" => true, "x-title" => "Past/Other Names", "description" => "Other names for organisation", "items" => Array("type" => "string")), - "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous", + "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies","x-itemprop"=>"members", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous", "items" => Array("type" => "string")), "orgType" => Array("type" => "string", "required" => true, "x-title" => "Organisation Type", "description" => "Org type based on legal formation via FMA/CAC legislation etc."), "parentOrg" => Array("type" => "string", "required" => true, "x-title" => "Parent Organisation", "description" => "Parent organisation, usually a department of state"), - "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "description" => "Website URL"), + "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "x-itemprop" => "url", "description" => "Website URL"), "abn" => Array("type" => "string", "required" => true, "x-title" => "Australian Business Number", "description" => "ABN from business register"), - "contractListURL" => Array("type" => "string", "required" => true, "x-title" => "Contract Listing", "description" => "Departmental and agency contracts, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"), + "contractListURL" => Array("type" => "string", "required" => true, "x-title" => "Contract Listing", "description" => "Departmental and agency contracts, mandated by the Senate"), "grantsReportingURL" => Array("type" => "string", "required" => true, "x-title" => "Grants Awarded", - "description" => "Departmental and agency grants mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm and Commonwealth grants guidelines http://www.finance.gov.au/publications/fmg-series/23-commonwealth-grant-guidelines.html"), + "description" => "Departmental and agency grants mandated by the Senate and Commonwealth grants guidelines "), "annualReportURL" => Array("type" => "string", "required" => true, "x-title" => "Annual Report(s)", "description" => ""), "consultanciesURL" => Array("type" => "string", "required" => true, "x-title" => "Consultants Hired", "description" => ""), "legalExpenditureURL" => Array("type" => "string", "required" => true, "x-title" => "Legal Services Expenditure", "description" => "Legal Services Expenditure mandated by Legal Services Directions 2005"), - "recordsListURL" => Array("type" => "string", "required" => true, "x-title" => "Files/Records Held", "description" => "Indexed lists of departmental and agency files, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"), + "recordsListURL" => Array("type" => "string", "required" => true, "x-title" => "Files/Records Held", "description" => "Indexed lists of departmental and agency files, mandated by the Senate"), "FOIDocumentsURL" => Array("type" => "string", "required" => true, "x-title" => "FOI Documents Released", "description" => ""), "infoPublicationSchemeURL" => Array("type" => "string", "required" => true, "x-title" => "Information Publication Scheme", "description" => ""), - "appointmentsURL" => Array("type" => "string", "required" => true, "x-title" => "Agency Appointments/Boards", "description" => "Departmental and agency appointments and vacancies , mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"), - "advertisingURL" => Array("type" => "string", "required" => true, "x-title" => "Approved Advertising Campaigns", "description" => " Agency advertising and public information projects, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm "), + "appointmentsURL" => Array("type" => "string", "required" => true, "x-title" => "Agency Appointments/Boards", "description" => "Departmental and agency appointments and vacancies , mandated by the Senate"), + "advertisingURL" => Array("type" => "string", "required" => true, "x-title" => "Approved Advertising Campaigns", "description" => " Agency advertising and public information projects, mandated by the Senate "), "hasRSS" => Array("type" => "string", "required" => true, "x-title" => "Has RSS", "description" => ""), "hasMailingList" => Array("type" => "string", "required" => true, "x-title" => "Has Mailing List", "description" => ""), "hasTwitter" => Array("type" => "string", "required" => true, "x-title" => "Has Twitter", "description" => ""), "hasFacebook" => Array("type" => "string", "required" => true, "x-title" => "Has Facebook", "description" => ""), "hasYouTube" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""), - - "hasFlickr" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""), + "hasFlickr" => Array("type" => "string", "required" => true, "x-title" => "Has Flickr", "description" => ""), "hasCCBY" => Array("type" => "string", "required" => true, "x-title" => "Has CC-BY", "description" => "Has any page licenced Creative Commons - Attribution"), - ), /* "org":{"type":"object", "properties":{