From: Maxious Date: Fri, 09 Mar 2012 00:11:21 +0000 Subject: directory.gov.au validation X-Git-Url: http://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=66c7a480ce55ac746f8b4311cc6fe79fbe6b0812 --- directory.gov.au validation Former-commit-id: 35820a21019cccffbe2508cddde99bed6e986202 --- --- a/admin/exportEmployees.csv.php +++ b/admin/exportEmployees.csv.php @@ -2,10 +2,16 @@ include_once("../include/common.inc.php"); +$format = "csv"; +//$format = "json"; +if (isset($_REQUEST['format'])) $format = $_REQUEST['format']; setlocale(LC_CTYPE, 'C'); - -$headers = Array("name"); +if ($format == "csv") { + $headers = Array("name"); +} else { + $headers = Array(); +} $db = $server->get_db('disclosr-agencies'); try { @@ -24,31 +30,51 @@ $fp = fopen('php://output', 'w'); if ($fp && $db) { - header('Content-Type: text/csv; charset=utf-8'); - header('Content-Disposition: attachment; filename="export.employeestats.' . date("c") . '.csv"'); + if ($format == "csv") { + header('Content-Type: text/csv; charset=utf-8'); + header('Content-Disposition: attachment; filename="export.employeestats.' . date("c") . '.csv"'); + } header('Pragma: no-cache'); header('Expires: 0'); - fputcsv($fp, $headers); + if ($format == "csv") { + fputcsv($fp, $headers); + } else if ($format == "json") { + echo '{ + "labels" : ["' . implode('","', $headers) . '"],'.PHP_EOL; + } try { $agencies = $db->get_view("app", "all", null, true)->rows; //print_r($agencies); + $first = true; + if ($format == "json") { + echo '"data" : ['.PHP_EOL; + + } foreach ($agencies as $agency) { if (isset($agency->value->statistics->employees)) { $row = Array(); $agencyEmployeesArray = object_to_array($agency->value->statistics->employees); - foreach ($headers as $fieldName) { - if ($fieldName == "name") { - $row[] = $agency->value->name; - } else if (isset($agencyEmployeesArray[$fieldName])) { - $row[] = $agencyEmployeesArray[$fieldName]["value"]; + foreach ($headers as $i => $fieldName) { + if (isset($agencyEmployeesArray[$fieldName])) { + $row[] = '['.$i.','.$agencyEmployeesArray[$fieldName]["value"].']'; } else { - $row[] = 0; + $row[] = '['.$i.',0]'; } } - - fputcsv($fp, array_values($row)); + if ($format == "csv") { + fputcsv($fp, array_values($row)); + } else if ($format == "json") { + if (!$first) echo ","; + echo '{"data" : [' . implode(",", array_values($row)) . '], "label": "'.$agency->value->name.'", "lines" : { "show" : true }, "points" : { "show" : true }}'.PHP_EOL; + $first = false; + } } + } + if ($format == "json") { + echo '] + }'.PHP_EOL; + } } catch (SetteeRestClientException $e) { setteErrorHandler($e); --- a/admin/importDirectoryUUIDs.php +++ b/admin/importDirectoryUUIDs.php @@ -1,13 +1,37 @@ create_db('disclosr-agencies'); -} catch (SetteeRestClientException $e) { - setteErrorHandler($e); +$db = $server->get_db('disclosr-agencies'); +$rows = $db->get_view("app", "byName")->rows; +$nametoid = Array(); +$sums = Array(); +foreach ($rows as $row) { + $nametoid[trim($row->key)] = $row->value; } -$db = $server->get_db('disclosr-agencies'); -createAgencyDesignDoc(); +if (file_exists('index.xml')) { + $xml = simplexml_load_file('index.xml'); + + foreach ($xml as $agency) { + $names = Array(); + $names[] = "".$agency->name; + + if (isset($agency->shortName)) { + $names[] = "".$agency->shortName; + } + foreach ($names as $name) { + if (!in_array($name, array_keys($nametoid))) { + echo "$name missing".PHP_EOL; + print_r($names); + echo $agency->dn; + echo PHP_EOL; + echo PHP_EOL; + } + } + } +} else { + exit('Failed to open test.xml.'); +} ?> --- a/admin/importGov2RegisterRSSFacebookTwitter.php +++ b/admin/importGov2RegisterRSSFacebookTwitter.php @@ -12,5 +12,16 @@ // twitter https://docs.google.com/spreadsheet/fm?id=tsJVd9EYoAjbl014y3qMgWg.03918275400592898296.8568379511161083736&hl=en&fmcmd=5&gid=0 // RSS https://docs.google.com/spreadsheet/fm?id=tbqjwIDHKHiVYF_glJ93GgA.03918275400592898296.8789688748524615194&authkey=CJDP-uQG&hl=en_GB&fmcmd=5&gid=0 // facebook https://docs.google.com/spreadsheet/fm?id=tkcqoo9wrgzNWmoANuVhsBw.03918275400592898296.3040387705062056060&authkey=CKzl7r0I&hl=en_GB&fmcmd=5&gid=0 + +/* + * http://australia.gov.au/news-and-media/media-release-rss-feeds + * http://australia.gov.au/news-and-media/social-media/blogs + * http://australia.gov.au/news-and-media/social-media/twitter + * http://australia.gov.au/news-and-media/social-media/facebook + * http://australia.gov.au/news-and-media/social-media/youtube + * http://australia.gov.au/news-and-media/social-media/flickr + * http://australia.gov.au/news-and-media/social-media/apps http://www.harmony.gov.au/get-involved/app-downloads.htm http://www.em.gov.au/Resources/Pages/Before-the-Storm-phone-game.aspx + * http://australia.gov.au/news-and-media/social-media/podcasts + */ ?> --- /dev/null +++ b/admin/index.xml @@ -1,1 +1,2607 @@ + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + +