gitphp 0.2.9.1 :: disclosr.git/commitdiff

Update schema descriptions

Former-commit-id: 2d7b43565d28dfebe22a483db57661660c8d55de

3 files changed: (show all)
alaveteli/exportCategories.rb.php
include/common.inc.php
schemas/agency.json.php

file:a/alaveteli/exportCategories.rb.php -> file:b/alaveteli/exportCategories.rb.php

<?php	<?php
include_once("../include/common.inc.php");	include_once("../include/common.inc.php");
setlocale(LC_CTYPE, 'C');	setlocale(LC_CTYPE, 'C');
header('Content-Type: text/csv');	header('Content-Type: text/csv');
header('Content-Disposition: attachment; filename="public_body_categories_en.rb"');	header('Content-Disposition: attachment; filename="public_body_categories_en.rb"');
header('Pragma: no-cache');	header('Pragma: no-cache');
header('Expires: 0');	header('Expires: 0');
echo 'PublicBodyCategories.add(:en, ['.PHP_EOL;	echo 'PublicBodyCategories.add(:en, ['.PHP_EOL;
echo ' "Portfolios",'.PHP_EOL;	echo ' "Portfolios",'.PHP_EOL;
$db = $server->get_db('disclosr-agencies');	$db = $server->get_db('disclosr-agencies');

try {	try {
$rows = $db->get_view("app", "byDeptStateName", null, true)->rows;	$rows = $db->get_view("app", "byDeptStateName", null, true)->rows;
//print_r($rows);	//print_r($rows);
foreach ($rows as $row) {	foreach ($rows as $row) {
echo ' [ "'.phrase_to_tag(dept_to_portfolio($row->key)).'","'. dept_to_portfolio($row->key).'","'.dept_to_portfolio($row->key).'" ],'.PHP_EOL;	echo ' [ "'.phrase_to_tag(dept_to_portfolio($row->key)).'","'. dept_to_portfolio($row->key).'","part of the '.dept_to_portfolio($row->key).' portfolio" ],'.PHP_EOL;
}	}
} catch (SetteeRestClientException $e) {	} catch (SetteeRestClientException $e) {
setteErrorHandler($e);	setteErrorHandler($e);
}	}
echo '])';	echo '])';
?>	?>

file:a/include/common.inc.php -> file:b/include/common.inc.php

file:a/schemas/agency.json.php -> file:b/schemas/agency.json.php

<?php	<?php

$schemas['agency'] = Array(	$schemas['agency'] = Array(
"description" => "Representation of government agency and online transparency measures",	"description" => "Representation of government agency and online transparency measures",
"type" => "object",	"type" => "object",
"properties" => Array(	"properties" => Array(
"name" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"name" => Array("type" => "string", "required" => true, "x-title" => "Name", "description" => "Name, most recent and broadest"),
"short_name" => Array("type" => "string", "required" => false, "x-title"=> "Agency Short Name", "description" => "Agency Name shortened, usually to an acronym"),	"short_name" => Array("type" => "string", "required" => false, "x-title" => "Short Name", "description" => "Name shortened, usually to an acronym"),
"otherNames" => Array("type" => "array", "required" => true, "x-title" => "Agency Past/Other Names", "description" => "Agency Names",	"otherNames" => Array("type" => "array", "required" => true, "x-title" => "Past/Other Names", "description" => "Other names for organisation",
"items" => Array("type" => "string")),	"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", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous",
"items" => Array("type" => "string")),	"items" => Array("type" => "string")),
"orgType"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"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"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"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"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"website" => Array("type" => "string", "required" => true, "x-title" => "Website", "description" => "Website URL"),
"abn" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"abn" => Array("type" => "string", "required" => true, "x-title" => "Australian Business Number", "description" => "ABN from business register"),
"contractListURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"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"),
"grantsReportingURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"grantsReportingURL" => Array("type" => "string", "required" => true, "x-title" => "Grants Awarded",
"annualReportURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"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"),
"consultanciesURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"annualReportURL" => Array("type" => "string", "required" => true, "x-title" => "Annual Report(s)", "description" => ""),
"legalExpenditureURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"consultanciesURL" => Array("type" => "string", "required" => true, "x-title" => "Consultants Hired", "description" => ""),
"recordsListURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"legalExpenditureURL" => Array("type" => "string", "required" => true, "x-title" => "Legal Services Expenditure", "description" => "Legal Services Expenditure mandated by Legal Services Directions 2005"),
"FOIDocumentsURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"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"),
"infoPublicationSchemeURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"FOIDocumentsURL" => Array("type" => "string", "required" => true, "x-title" => "FOI Documents Released", "description" => ""),
"appointmentsURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"infoPublicationSchemeURL" => Array("type" => "string", "required" => true, "x-title" => "Information Publication Scheme", "description" => ""),
"hasRSS"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"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"),
"hasMailingList"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"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 "),
"hasTwitter"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"hasRSS" => Array("type" => "string", "required" => true, "x-title" => "Has RSS", "description" => ""),
"hasFacebook"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"hasMailingList" => Array("type" => "string", "required" => true, "x-title" => "Has Mailing List", "description" => ""),
"hasYouTube"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),	"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" => ""),
),	),
/*"org":{"type":"object",	/* "org":{"type":"object",
"properties":{	"properties":{
"organizationName":{"type":"string"},	"organizationName":{"type":"string"},
"organizationUnit":{"type":"string"}},	"organizationUnit":{"type":"string"}},
}	}
}*/	} */
);	);
?>	?>

<?php	<?php

date_default_timezone_set("Australia/Sydney");	date_default_timezone_set("Australia/Sydney");

$basePath = "";	$basePath = "";
if (strstr($_SERVER['PHP_SELF'], "alaveteli/")	if (strstr($_SERVER['PHP_SELF'], "alaveteli/")
\|\| strstr($_SERVER['PHP_SELF'], "admin/")	\|\| strstr($_SERVER['PHP_SELF'], "admin/")
\|\| strstr($_SERVER['PHP_SELF'], "lib/")	\|\| strstr($_SERVER['PHP_SELF'], "lib/")
\|\| strstr($_SERVER['PHP_SELF'], "include/"))	\|\| strstr($_SERVER['PHP_SELF'], "include/"))
$basePath = "../";	$basePath = "../";

include_once ('couchdb.inc.php');	include_once ('couchdb.inc.php');
include_once ('template.inc.php');	include_once ('template.inc.php');

# Convert a stdClass to an Array. http://www.php.net/manual/en/language.types.object.php#102735	# Convert a stdClass to an Array. http://www.php.net/manual/en/language.types.object.php#102735

function object_to_array(stdClass $Class) {	function object_to_array(stdClass $Class) {
# Typecast to (array) automatically converts stdClass -> array.	# Typecast to (array) automatically converts stdClass -> array.
$Class = (array) $Class;	$Class = (array) $Class;

# Iterate through the former properties looking for any stdClass properties.	# Iterate through the former properties looking for any stdClass properties.
# Recursively apply (array).	# Recursively apply (array).
foreach ($Class as $key => $value) {	foreach ($Class as $key => $value) {
if (is_object($value) && get_class($value) === 'stdClass') {	if (is_object($value) && get_class($value) === 'stdClass') {
$Class[$key] = object_to_array($value);	$Class[$key] = object_to_array($value);
}	}
}	}
return $Class;	return $Class;
}	}

# Convert an Array to stdClass. http://www.php.net/manual/en/language.types.object.php#102735	# Convert an Array to stdClass. http://www.php.net/manual/en/language.types.object.php#102735

function array_to_object(array $array) {	function array_to_object(array $array) {
# Iterate through our array looking for array values.	# Iterate through our array looking for array values.
# If found recurvisely call itself.	# If found recurvisely call itself.
foreach ($array as $key => $value) {	foreach ($array as $key => $value) {
if (is_array($value)) {	if (is_array($value)) {
$array[$key] = array_to_object($value);	$array[$key] = array_to_object($value);
}	}
}	}

# Typecast to (object) will automatically convert array -> stdClass	# Typecast to (object) will automatically convert array -> stdClass
return (object) $array;	return (object) $array;
}	}

function dept_to_portfolio($deptName) {	function dept_to_portfolio($deptName) {
return trim(str_replace("Department of", "", str_replace("Department of the", "Department of", $deptName)));	return trim(str_replace("Department of", "", str_replace("Department of the", "Department of", $deptName)));
}	}
function phrase_to_tag ($phrase) {	function phrase_to_tag ($phrase) {
return str_replace(" ","_",str_replace(",","",strtolower($phrase)));	return str_replace(" ","_",str_replace("'","",str_replace(",","",strtolower($phrase))));
}	}
function GetDomain($url)	function GetDomain($url)
{	{
$nowww = ereg_replace('www\.','',$url);	$nowww = ereg_replace('www\.','',$url);
$domain = parse_url($nowww);	$domain = parse_url($nowww);
if(!empty($domain["host"]))	if(!empty($domain["host"]))
{	{
return $domain["host"];	return $domain["host"];
} else	} else
{	{
return $domain["path"];	return $domain["path"];
}	}
}	}

?>	?>