tweak year/agency modifer for queries
tweak year/agency modifer for queries

 Binary files a/admin/cmd.exe.lnk and b/admin/cmd.exe.lnk differ
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>My Google AJAX Search API Application - http://contractdashboard.lambdacomplex.org</title> <title>My Google AJAX Search API Application - http://contractdashboard.lambdacomplex.org</title>
<script src="http://www.google.com/jsapi?key=ABQIAAAA95XYXN0cki3Yj_Sb71CFvBSgIPe2k9-DRgEVQvbvQDV8xmTiXRTBpHxrD7bSh5rl2lswY56769CyQQ" type="text/javascript"></script> <script src="http://www.google.com/jsapi?key=ABQIAAAA95XYXN0cki3Yj_Sb71CFvBSgIPe2k9-DRgEVQvbvQDV8xmTiXRTBpHxrD7bSh5rl2lswY56769CyQQ" type="text/javascript"></script>
<script language="Javascript" type="text/javascript"> <script language="Javascript" type="text/javascript">
//<![CDATA[ //<![CDATA[
   
google.load("search", "1"); google.load("search", "1");
   
function OnLoad() { function OnLoad() {
// Create a search control // Create a search control
var searchControl = new google.search.SearchControl(); var searchControl = new google.search.SearchControl();
   
// Add in a full set of searchers // Add in a full set of searchers
var localSearch = new google.search.LocalSearch(); var localSearch = new google.search.LocalSearch();
searchControl.addSearcher(localSearch); searchControl.addSearcher(localSearch);
searchControl.addSearcher(new google.search.WebSearch()); searchControl.addSearcher(new google.search.WebSearch());
searchControl.addSearcher(new google.search.VideoSearch()); searchControl.addSearcher(new google.search.VideoSearch());
searchControl.addSearcher(new google.search.BlogSearch()); searchControl.addSearcher(new google.search.BlogSearch());
   
// Set the Local Search center point // Set the Local Search center point
localSearch.setCenterPoint("New York, NY"); localSearch.setCenterPoint("New York, NY");
   
// Tell the searcher to draw itself and tell it where to attach // Tell the searcher to draw itself and tell it where to attach
searchControl.draw(document.getElementById("searchcontrol")); searchControl.draw(document.getElementById("searchcontrol"));
   
// Execute an inital search // Execute an inital search
searchControl.execute("Google"); searchControl.execute("Google");
} }
google.setOnLoadCallback(OnLoad); google.setOnLoadCallback(OnLoad);
   
//]]> //]]>
</script> </script>
</head> </head>
<body> <body>
<div id="searchcontrol">Loading...</div> <div id="searchcontrol">Loading...</div>
</body> </body>
</html> </html>
c:\wamp\bin\php\php5.3.0\php.exe import.php c:\wamp\bin\php\php5.3.0\php.exe import.php
<?php <?php
include_once("../lib/common.inc.php"); include_once("../lib/common.inc.php");
$path = '../data/'; $path = 'data/';
if ($_REQUEST["fname"] == "") { if ($_REQUEST["fname"] == "") {
echo "Get files from: https://www.tenders.gov.au/?event=public.reports.list<br>"; echo "Get files from: https://www.tenders.gov.au/?event=public.reports.list<br>";
$dhandle = opendir($path); $dhandle = opendir($path);
// define an array to hold the files // define an array to hold the files
$files = array(); $files = array();
   
if ($dhandle) { if ($dhandle) {
// loop through all of the files // loop through all of the files
while (false !== ($fname = readdir($dhandle))) { while (false !== ($fname = readdir($dhandle))) {
if (($fname != '.') && ($fname != '..')) { if (($fname != '.') && ($fname != '..')) {
echo "<a href=\"import.php?fname=$fname\">$fname</a>".filesize($path.$fname)."<br/>"; echo "<a href=\"import.php?fname=$fname\">$fname</a>".filesize($path.$fname)."<br/>";
} }
} }
} }
   
} else { } else {
$success =0; $success =0;
$fname = $_REQUEST["fname"]; $fname = $_REQUEST["fname"];
echo " ============== $fname ============== <br>"; echo " ============== $fname ============== <br>";
$row = 1; $row = 1;
$handle = fopen($path.$fname, "r"); $handle = fopen($path.$fname, "r");
//"t" mode string translates windows line breaks to unix //"t" mode string translates windows line breaks to unix
$datamapping0709 = Array("Agency" => "agencyName", "Parent CN ID" => "parentCN", "CN ID" => "CNID", "Publish Date" => "publishDate", "Amendment Date" => "amendDate", "Status" => "", "StartDate" => "contractStart" , "EndDate" => "contractEnd", "Value" => "value", "Description" => "description", "Agency Ref Id" => "agencyID", "Category" => "category", "Procurement Method" => "procurementMethod", "ATM ID" => "atmID", "SON ID" => "SONID","Confidentiality - Contract" => "confidentialityContract", "Confidentiality - Contract Reason(s)" => "confidentialityContractReason", "Confidentiality - Outputs" => "confidentialityOutputs", "Confidentiality - Outputs Reason(s)" => "confidentialityOutputsReason", "Consultancy" => "consultancy", "Consultancy Reason(s)" => "consultancyReason", "Amendment Reason" => "amendmentReason", "Supplier Name" => "supplierName", "Supplier Address" => "supplierAddress", "Supplier City" => "supplierCity", "Supplier Postcode" => "supplierPostcode", "Supplier Country" => "supplierCountry" , "Supplier ABNExempt" => "supplierABNExempt", "Supplier ABN" => "supplierABN" , "Agency Branch" => "contactBranch","Agency Divison" => "contactDivision", "Agency Postcode" => "contactPostcode" , "" => ""); $datamapping0709 = Array("Agency" => "agencyName", "Parent CN ID" => "parentCN", "CN ID" => "CNID", "Publish Date" => "publishDate", "Amendment Date" => "amendDate", "Status" => "", "StartDate" => "contractStart" , "EndDate" => "contractEnd", "Value" => "value", "Description" => "description", "Agency Ref Id" => "agencyID", "Category" => "category", "Procurement Method" => "procurementMethod", "ATM ID" => "atmID", "SON ID" => "SONID","Confidentiality - Contract" => "confidentialityContract", "Confidentiality - Contract Reason(s)" => "confidentialityContractReason", "Confidentiality - Outputs" => "confidentialityOutputs", "Confidentiality - Outputs Reason(s)" => "confidentialityOutputsReason", "Consultancy" => "consultancy", "Consultancy Reason(s)" => "consultancyReason", "Amendment Reason" => "amendmentReason", "Supplier Name" => "supplierName", "Supplier Address" => "supplierAddress", "Supplier City" => "supplierCity", "Supplier Postcode" => "supplierPostcode", "Supplier Country" => "supplierCountry" , "Supplier ABNExempt" => "supplierABNExempt", "Supplier ABN" => "supplierABN" , "Agency Branch" => "contactBranch","Agency Divison" => "contactDivision", "Agency Postcode" => "contactPostcode" , "" => "");
$headers; $headers;
$contractNoticeFields = Array("agencyName", "parentCN", "CNID", "publishDate", "amendDate", "contractStart" , "contractEnd", "value", "description", "agencyID", "category", "procurementMethod", "atmID", "SONID", "confidentialityContract", "confidentialityContractReason", "confidentialityOutputs", "confidentialityOutputsReason", "consultancy", "consultancyReason", "amendmentReason", "supplierName", "supplierAddress", "supplierCity", "supplierPostcode", "supplierCountry" , "supplierABNExempt", "supplierABN", "contactBranch","contactDivision","contactPostcode" ); $contractNoticeFields = Array("agencyName", "parentCN", "CNID", "publishDate", "amendDate", "contractStart" , "contractEnd", "value", "description", "agencyID", "category", "procurementMethod", "atmID", "SONID", "confidentialityContract", "confidentialityContractReason", "confidentialityOutputs", "confidentialityOutputsReason", "consultancy", "consultancyReason", "amendmentReason", "supplierName", "supplierAddress", "supplierCity", "supplierPostcode", "supplierCountry" , "supplierABNExempt", "supplierABN", "contactBranch","contactDivision","contactPostcode" );
$agencyFields = Array("agencyName"); $agencyFields = Array("agencyName");
$supplierFields = Array("supplierName", "supplierAddress", "supplierCity", "supplierPostcode", "supplierCountry" , "supplierABNExempt", "supplierABN" ); $supplierFields = Array("supplierName", "supplierAddress", "supplierCity", "supplierPostcode", "supplierCountry" , "supplierABNExempt", "supplierABN" );
   
while (($data = fgetcsv($handle, 1000, "\t")) !== FALSE) { while (($data = fgetcsv($handle, 1000, "\t")) !== FALSE) {
$num = count($data); $num = count($data);
   
if ($row == 3) if ($row == 3)
{ {
$headers = $data; $headers = $data;
} }
else if ($row > 3) else if ($row > 3)
{ {
if ($num > count($datamapping0709)) if ($num > count($datamapping0709))
{ {
die ("<font color=red>Error in data import; data mapping fields out of bounds or changed</font><br>".$fname.print_r($data)); die ("<font color=red>Error in data import; data mapping fields out of bounds or changed</font><br>".$fname.print_r($data));
} }
$firstCN= false; $firstCN= false;
$firstSupplier= true; $firstSupplier= true;
$firstAgency= true; $firstAgency= true;
$contractNoticeInsert = "INSERT INTO contractnotice (importFile, ".implode(" , ",$contractNoticeFields). ") VALUES ( \"$fname\" "; $contractNoticeInsert = "INSERT INTO contractnotice (importFile, ".implode(" , ",$contractNoticeFields). ") VALUES ( \"$fname\" ";
$supplierInsert = "INSERT INTO supplierdetails (".implode(" , ",$supplierFields). ") VALUES ("; $supplierInsert = "INSERT INTO supplierdetails (".implode(" , ",$supplierFields). ") VALUES (";
$agencyInsert = "INSERT INTO agency (".implode(" , ",$agencyFields). ") VALUES ("; $agencyInsert = "INSERT INTO agency (".implode(" , ",$agencyFields). ") VALUES (";
$keys = array_keys($datamapping0709); $keys = array_keys($datamapping0709);
for ($c=0; $c < $num; $c++) { for ($c=0; $c < $num; $c++) {
$data[$c] = trim($data[$c],"="); $data[$c] = trim($data[$c],"=");
$data[$c] = trim($data[$c], "\""); $data[$c] = trim($data[$c], "\"");
if (in_array(($datamapping0709[$headers[$c]]),$contractNoticeFields)) if (in_array(($datamapping0709[$headers[$c]]),$contractNoticeFields))
{ {
if (($datamapping0709[$headers[$c]]) == "parentCN" || ($datamapping0709[$headers[$c]]) == "CNID") if (($datamapping0709[$headers[$c]]) == "parentCN" || ($datamapping0709[$headers[$c]]) == "CNID")
{ {
$data[$c] = substr($data[$c],2); $data[$c] = substr($data[$c],2);