Sub-agency FOI export for alaveteli
Former-commit-id: 546acd4a1b6f65733606771bd7152278e85f1594
--- a/alaveteli/exportAgencies.csv.php
+++ b/alaveteli/exportAgencies.csv.php
@@ -12,7 +12,18 @@
$rows = $db->get_view("app", "byDeptStateName", null, true)->rows;
//print_r($rows);
foreach ($rows as $row) {
- $tag[$row->value] = phrase_to_tag(dept_to_portfolio($row->key));
+ $tag[$row->id] = phrase_to_tag(dept_to_portfolio($row->key));
+ }
+} catch (SetteeRestClientException $e) {
+ setteErrorHandler($e);
+}
+
+$foiEmail = Array();
+try {
+ $rows = $db->get_view("app", "foiEmails", null, true)->rows;
+ //print_r($rows);
+ foreach ($rows as $row) {
+ $foiEmail[$row->key] = $row->value;
}
} catch (SetteeRestClientException $e) {
setteErrorHandler($e);
@@ -29,39 +40,45 @@
$agencies = $db->get_view("app", "byCanonicalName", null, true)->rows;
//print_r($rows);
foreach ($agencies as $agency) {
- // print_r($agency);
- $row = Array();
- $row["#id"] = $agency->value->_id;
- $row["name"] = $agency->value->name;
- if (isset($agency->value->foi_email)) {
- $row["request_email"] = $agency->value->foiEmail;
- } else {
- $row["request_email"] = "foi@".GetDomain($agency->value->website);
- //
- }
- if (isset($agency->value->shortName)) {
- $row["short_name"] = $agency->value->shortName;
- } else {
- $out = Array();
- preg_match_all('/[A-Z]/', $agency->value->name, $out);
- $row["short_name"] = implode("",$out[0]);
- }
- $row["notes"] = "";
- $row["publication_scheme"] = $agency->value->infoPublicationSchemeURL;
- $row["home_page"] = $agency->value->website;
- if ($agency->value->orgType == "FMA-DepartmentOfState") {
- $row["tag_string"] = $tag[$agency->value->_id];
- } else {
- $row["tag_string"] = $tag[$agency->value->parentOrg];;
- }
-
- fputcsv($fp, array_values($row));
-
- if (isset($agency->value->foiBodies)) {
- foreach ($agency->value->foiBodies as $foiBody) {
- $row['name'] = $foiBody;
- $row['short_name'] = "";
- fputcsv($fp, array_values($row));
+ // print_r($agency);
+
+ if (isset($agency->value->foiEmail) && $agency->value->foiEmail != "null" && !isset($agency->value->status)) {
+ $row = Array();
+ $row["#id"] = $agency->id;
+ $row["name"] = trim($agency->value->name);
+ if (isset($agency->value->foiEmail)) {
+ $row["request_email"] = $agency->value->foiEmail;
+ } else {
+ if ($agency->value->orgType == "FMA-DepartmentOfState") {
+ $row["request_email"] = "foi@" . GetDomain($agency->value->website);
+ } else {
+ $row["request_email"] = $foiEmail[$agency->value->parentOrg];
+ }
+ }
+ if (isset($agency->value->shortName)) {
+ $row["short_name"] = $agency->value->shortName;
+ } else {
+ $out = Array();
+ preg_match_all('/[A-Z]/', trim($agency->value->name), $out);
+ $row["short_name"] = implode("", $out[0]);
+ }
+ $row["notes"] = "";
+ $row["publication_scheme"] = (isset($agency->value->infoPublicationSchemeURL) ? $agency->value->infoPublicationSchemeURL : "");
+ $row["home_page"] = (isset($agency->value->website) ? $agency->value->website : "");
+ if ($agency->value->orgType == "FMA-DepartmentOfState") {
+ $row["tag_string"] = $tag[$agency->value->_id] . " " . $agency->value->orgType;
+ } else {
+ $row["tag_string"] = $tag[$agency->value->parentOrg] . " " . $agency->value->orgType;
+ }
+
+ fputcsv($fp, array_values($row));
+
+ if (isset($agency->value->foiBodies)) {
+ foreach ($agency->value->foiBodies as $foiBody) {
+ $row['name'] = $foiBody;
+ $row['short_name'] = "";
+ fputcsv($fp, array_values($row));
+ }
}
}
}
--- a/include/couchdb.inc.php
+++ b/include/couchdb.inc.php
@@ -13,7 +13,7 @@
$obj->views->byABN->map = "function(doc) { emit(doc.abn, doc); };";
$obj->views->byCanonicalName->map = "function(doc) {
if (doc.parentOrg || doc.orgType == 'FMA-DepartmentOfState') {
- emit(doc.name, doc._id);
+ emit(doc.name, doc);
}
};";
$obj->views->byDeptStateName->map = "function(doc) {
@@ -34,6 +34,11 @@
}
}
};";
+
+ $obj->views->foiEmails->map = "function(doc) {
+ emit(doc._id, doc.foiEmail);
+};";
+
$obj->views->byLastModified->map = "function(doc) { emit(doc.metadata.lastModified, doc); }";
$obj->views->getActive->map = 'function(doc) { if (doc.status == "active") { emit(doc._id, doc); } };';
$obj->views->getSuspended->map = 'function(doc) { if (doc.status == "suspended") { emit(doc._id, doc); } };';
--- a/unimplemented/exportAgencies.csv.php
+++ /dev/null
@@ -1,65 +1,1 @@
-<?php
-include_once("./lib/common.inc.php");
-setlocale(LC_CTYPE, 'C');
-// source: http://stackoverflow.com/questions/81934/easy-way-to-export-a-sql-table-without-access-to-the-server-or-phpmyadmin#81951
-
-$unspsc = Array();
-$unspscresult = $conn->prepare('select * from "UNSPSCcategories" where "UNSPSC"::text like \'%00000\';');
-$unspscresult->execute();
-foreach ($unspscresult->fetchAll() as $row) {
- $unspsc[$row['UNSPSC']] = $row['Title'];
-}
-
-$query = $conn->prepare('
-SELECT "CNID",contractnotice."agencyName",agency_nametoabn.abn as "agencyABN",
-EXTRACT(EPOCH FROM "publishDate") as "publishDate",
-EXTRACT(EPOCH FROM "contractStart") as "contractStart",
-EXTRACT(EPOCH FROM "contractEnd") as "contractEnd",
-value,description,category,
-"supplierName",(case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID,
-(\'https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN\'::text || "CNID"::text) as sourceURL
-FROM contractnotice join agency_nametoabn on contractnotice."agencyName"=agency_nametoabn."agencyName"
-where "childCN" is null'
- , array(PDO::ATTR_CURSOR => PDO::FETCH_ORI_NEXT));
-$query->execute();
-$errors = $conn->errorInfo();
-if ($errors[2] != "") {
- die("Export terminated, db error" . print_r($errors, true));
-}
-
-$num_fields = $query->columnCount();
-$headers = Array();
-for ($i = 0; $i < $num_fields; $i++) { // for each column in query, make a CSV header
- $meta = $query->getColumnMeta($i);
- $headers[] = $meta['name'];
-}
-$fp = fopen('php://output', 'w');
-if ($fp && $query) {
- header('Content-Type: text/csv');
- header('Content-Disposition: attachment; filename="export.' . date("c") . '.csv"');
- header('Pragma: no-cache');
- header('Expires: 0');
- fputcsv($fp, $headers);
- while ($row = $query->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_NEXT)) {
- foreach ($row as $key => &$colvalue) {
-
- $colvalue = preg_replace('/[^[:print:]]/', '', utf8_encode($colvalue));
- if ($headers[$key] == "publishDate" || $headers[$key] == "contractStart"
- || $headers[$key] == "contractEnd") {
- $colvalue = date("Y-m-d", $colvalue);
- }
- /* if ($headers[$key] == "CNID") {
- $colvalue = str_replace("A","", $colvalue);
-}*/
- if ($headers[$key] == "cat1" || $headers[$key] == "cat2"
- || $headers[$key] == "cat3") {
- $colvalue = $unspsc[$colvalue];
- }
- }
- fputcsv($fp, array_values($row));
- }
- die;
-}
-?>
-