From: Maxious Date: Wed, 29 Aug 2012 10:18:51 +0000 Subject: Fix australian/american spelling of Organization X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=b8819059a3537a6a66e08f6a01cb50ce45957b50 --- Fix australian/american spelling of Organization Former-commit-id: fe93f73332392945d7a9462b1a543c639e28c766 --- --- a/getAgency.php +++ b/getAgency.php @@ -6,18 +6,22 @@ function displayValue($key, $value, $mode) { global $db, $schemas; if ($mode == "view") { - +if (strpos($key, "_") === 0 || $key== "metadata") return; echo ""; echo "" . $schemas['agency']["properties"][$key]['x-title'] . "
" . $schemas['agency']["properties"][$key]['description'] . ""; if (is_array($value)) { echo "
    "; foreach ($value as $subkey => $subvalue) { - if (isset($schemas['agency']["properties"][$key]['x-property'])) { - echo '
  1. '; - } else { - echo "
  2. "; - } + + echo "
  3. "; + echo "$subvalue
  4. "; } echo "
"; @@ -28,8 +32,8 @@ echo ""; } if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { - echo "view"; - } else { + echo "$value"; + } else { echo "$value"; } } @@ -61,7 +65,8 @@ } else { echo ""; if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { - echo "view"; + echo "view"; + } if ($key == 'abn') { echo "view abn"; @@ -148,8 +153,8 @@ } if ($mode == "view") { - echo '
'; - echo '"; + echo '

' . $row['name'] . "

'; + echo '"; echo ""; } if ($mode == "edit") { @@ -202,10 +207,10 @@ echo '"; } catch (SetteeRestClientException $e) { --- a/schemas/agency.json.php +++ b/schemas/agency.json.php @@ -4,9 +4,9 @@ "description" => "Representation of government agency and online transparency measures", "type" => "object", "properties" => Array( - "name" => Array("type" => "string", "required" => true, "x-property" => "schema:name foaf:name", "x-title" => "Name", "description" => "Name, most recent and broadest"), + "name" => Array("type" => "string", "required" => true, "x-itemprop" => "name", "x-property" => "schema:name foaf: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", "x-itemprop" => "email", "description" => "FOI contact email if not foi@"), "sameAs" => Array("type" => "array", "required" => false, "x-property"=>"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", @@ -15,7 +15,7 @@ "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", "x-property" => "schema:url foaf:homepage", "description" => "Website URL"), + "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "x-itemprop" => "url", "x-property" => "schema:url foaf:homepage", "description" => "Website URL"), "abn" => Array("type" => "string", "required" => true, "x-title" => "Australian Business Number", "description" => "ABN from business register"), "employees" => Array("type" => "string", "required" => true, "x-title" => "2010-2011 employees", "description" => "2010-2011 employees"), "contractListURL" => Array("type" => "string", "required" => true, "x-title" => "Contract Listing", "description" => "Departmental and agency contracts, mandated by the Senate" ),

' . $row['name'] . "

Field NameField Value