From: Maxious Date: Tue, 09 Aug 2011 11:14:19 +0000 Subject: Link blank ABNS X-Git-Url: http://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=85a9705f7fb9547ded958911c5eb62e550b9d9fa --- Link blank ABNS --- --- a/admin/partialdata/import.php +++ b/admin/partialdata/import.php @@ -136,7 +136,7 @@ if ($dhandle) { // loop through all of the files while (false !== ($fname = readdir($dhandle))) { - if (($fname != '.') && ($fname != '..') && (!isset($_REQUEST["filter"]) || strpos($fname,$_REQUEST["filter"]) != false)) { + if (($fname != '.') && ($fname != '..')) { echo "$fname " . filesize($path . $fname) . " " . date("c", filemtime($path . $fname)) . "
"; processFile($path . $fname, "contractnotice"); } --- a/admin/partialdata/importamendments.php +++ b/admin/partialdata/importamendments.php @@ -1,6 +1,13 @@ + --- a/admin/updateUNSPSC.php +++ b/admin/updateUNSPSC.php @@ -10,12 +10,16 @@ // some Australian spellings $isiz = str_replace("iz","is",$row['Title']); $unspsc[$isiz] = $row['UNSPSC']; + $filfill = str_replace("fill","fil",$row['Title']); + $unspsc[$filfill] = $row['UNSPSC']; $defence = str_replace("efense","efence",$row['Title']); $unspsc[$defence] = $row['UNSPSC']; $armor = str_replace("rmored","rmoured",$row['Title']); $unspsc[$armor] = $row['UNSPSC']; - $center = str_replace("enter","entre",$row['Title']); - $unspsc[$center] = $row['UNSPSC']; + $erre = str_replace("er","re",$row['Title']); + $unspsc[$erre] = $row['UNSPSC']; + $lyslyz = str_replace("lyz","lys",$row['Title']); + $unspsc[$lyslyz] = $row['UNSPSC']; // some divergence from standard $tobacco = str_replace("Food Beverage and Tobacco Products","Food and Beverage Products",$row['Title']); $unspsc[$tobacco] = $row['UNSPSC']; --- a/australian_federal_government_contract_spending.json +++ /dev/null @@ -1,125 +1,1 @@ -{ - "dataset":{ - "name":"australian_federal_government_contract_spending", - "label":"Australian Federal Government Contract Spending", - "description":"Spending by Australian Federal Government agencies on goods and services from 2007 onwards.", - "currency":"AUD", - "unique_keys":[ - "id" - ], - "temporal_granularity":"year" - }, - "mapping":{ - "category": { - "fields": [ { - "column": "category", - "datatype": "string", - "name": "label" - } ], - "type": "classifier", - "description": "", - "taxonomy": "unspsc", - "label": "Contract Goods/Services Category" - }, - "from":{ - "fields":[ - { - "column":"agencyABN", - "datatype":"string", - "name":"id" - }, - { - "column":"agencyName", - "datatype":"string", - "name":"label" - } - ], - "type":"entity", - "description":"", - "label":"Government Agency Australian Business Number" - }, - "description":{ - "column":"description", - "datatype":"string", - "type":"value", - "description":"Contract as described by agency", - "label":"Contract Description" - }, - "to":{ - "fields":[ - { - "column":"supplierName", - "datatype":"string", - "name":"label" - }, - { - "column":"supplierID", - "datatype":"string", - "name":"id" - } - ], - "type":"entity", - "description":"Government Supplier", - "label":"Supplier Name" - }, - "currency":{ - "default_value":"AUD", - "description":"All entries in AUD, foreign transactions are converted at the time of their payment", - "column":"", - "label":"", - "datatype":"currency", - "type":"value" - }, - "amount":{ - "column":"value", - "datatype":"float", - "type":"value", - "description":"The total value of the contract including all variations/amendments/extensions", - "label":"Contract Value" - }, - "time":{ - "column":"contractStart", - "datatype":"date", - "type":"value", - "description":"Start of the contract period (goods or services being received)", - "label":"Contract Start Date" - }, - "id":{ -"column": "CNID", - "datatype": "string", - "name": "label", - "type": "value", - "description": "", - "label": "Contract Notice ID" - } - }, - -"views": [ - { - "name": "default", - "entity": "dataset", - "label": "Default breakdown by Category", - "dimension": "dataset", - "breakdown": "category", - "filters" : {"name": "australian_federal_government_contract_spending" } - }, - { - "name":"default", - "entity": "classifier", - "label":"Breakdown of Spending Areas by Supplier Company", - "dimension": "category", - "breakdown": "to", - "filters": {"taxonomy": "unspsc"} - }, - { - "name":"default", - "entity": "classifier", - "label":"Breakdown of Spending Areas by Government Agency", - "dimension": "category", - "breakdown": "from", - "filters": {"taxonomy": "unspsc"} - } -] -} - --- a/exportData.csv.php +++ b/exportData.csv.php @@ -3,43 +3,31 @@ 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 -$query = $conn->prepare(' -SELECT "CNID",contractnotice."agencyName",agency.abn as "agencyABN",EXTRACT(EPOCH FROM "publishDate") as "publishDate",EXTRACT(EPOCH FROM "contractStart") as "contractStart",EXTRACT(EPOCH FROM "contractEnd") as "contractEnd",value,description,"procurementMethod",category,"categoryUNSPSC", - "supplierABN","supplierName","supplierCity","supplierPostcode","supplierCountry","contactPostcode", +$result = mysql_query(' +SELECT CNID,contractnotice.agencyName,agency.abn as agencyABN,DATE(publishDate),contractStart,contractEnd,value,description,procurementMethod,category,categoryUNSPSC +,supplierABN,supplierName,supplierCity,supplierPostcode,supplierCountry,contactPostcode, ( - case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID, + 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 on contractnotice."agencyName"=agency."agencyName" where "childCN" = 0'); -// (substr( "categoryUNSPSC"::text, 0, 2 ) || \'0000000\'::text) as "categoryUNSPSClv1", "categoryUNSPSC", (substr( "categoryUNSPSC"::text, 0, 3 ) || \'000000\'::text) as "categoryUNSPSClv2" "categoryUNSPSC", (substr( "categoryUNSPSC"::text, 0, 4 ) || \'00000\'::text as "categoryUNSPSClv3") -$query->execute(); -if (!$query) { - databaseError($conn->errorInfo()); -die('Couldn\'t fetch records'); -} - -$num_fields = $query->columnCount(); +concat("https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN",CNID) as sourceURL +FROM `contractnotice` join agency on contractnotice.agencyName=agency.agencyName where childCN = 0'); +if (!$result) die('Couldn\'t fetch records'); +$num_fields = mysql_num_fields($result); $headers = array(); for ($i = 0; $i < $num_fields; $i++) { - $meta = $query->getColumnMeta($i); - $headers[] = $meta['name']; + $headers[] = mysql_field_name($result , $i); } $fp = fopen('php://output', 'w'); -if ($fp && $query) { +if ($fp && $result) { header('Content-Type: text/csv'); header('Content-Disposition: attachment; filename="export.'.date("c").'.csv"'); header('Pragma: no-cache'); header('Expires: 0'); fputcsv($fp, $headers); -foreach ($query->fetchAll(PDO::FETCH_NUM) as $row) { - foreach ($row as $key => &$colvalue) { - + while ($row = mysql_fetch_assoc($result)) { + foreach ($row as &$colvalue) { $colvalue = preg_replace( '/[^[:print:]]/', '', utf8_encode($colvalue)); - if ($headers[$key] == "publishDate" || $headers[$key] == "contractStart" - || $headers[$key] == "contractEnd") { - $colvalue = date("Y-m-d",$colvalue); - } } fputcsv($fp, array_values($row)); }