More MySQL purging
[contractdashboard.git] / displayContract.php
blob:a/displayContract.php -> blob:b/displayContract.php
--- a/displayContract.php
+++ b/displayContract.php
@@ -8,44 +8,40 @@
 

 $query = $conn->prepare($query);

 $query->bindParam(":CNID", $_REQUEST['CNID']);

-  $query->execute();

-  if (!$query) {

-    databaseError($conn->errorInfo());

-  }

-  foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {

-setlocale(LC_MONETARY, 'en_US');

-foreach (array_filter($row) as $key => $value) {

-	echo "<b>$key</b>&nbsp;";

-switch ($key) {

-case "supplierName":

-case "supplierABN":

-	echo '<a href="displaySupplier.php?supplier='.$row['supplierABN'].'-'.urlencode($row['supplierName']).'">'.$value."</a>";

-	break;

-case "agencyName":

-	echo '<a href="displayAgency.php?agency='.urlencode($value).'">'.$value."</a>";

-	break;

-case "value":

-	echo "$".number_format(doubleval($value),2);

-	break;

-default:

-	echo str_replace("  ","<br>",$value);

+$query->execute();

+databaseError($conn->errorInfo());

+foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {

+    setlocale(LC_MONETARY, 'en_US');

+    foreach (array_filter($row) as $key => $value) {

+        echo "<b>$key</b>&nbsp;";

+        switch ($key) {

+            case "supplierName":

+            case "supplierABN":

+                echo '<a href="displaySupplier.php?supplier=' . $row['supplierABN'] . '-' . urlencode($row['supplierName']) . '">' . $value . "</a>";

+                break;

+            case "agencyName":

+                echo '<a href="displayAgency.php?agency=' . urlencode($value) . '">' . $value . "</a>";

+                break;

+            case "value":

+                echo "$" . number_format(doubleval($value), 2);

+                break;

+            default:

+                echo str_replace("  ", "<br>", $value);

+        }

+        echo "<br>";

+    }

 }

-echo "<br>";

-}

-}

-echo '<br><a href="https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN'.$_REQUEST['CNID'].'"> View original record @ tenders.gov.au</a><br>';

+echo '<br><a href="https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN' . $_REQUEST['CNID'] . '"> View original record @ tenders.gov.au</a><br>';

 

 

 $query = 'SELECT * FROM `heuristic_results` where "CNID" = :CNID';

 $query = $conn->prepare($query);

-$agencyName = $input.'%';

+$agencyName = $input . '%';

 $query->bindParam(":CNID", $_REQUEST['CNID']);

-  $query->execute();

-  if (!$query) {

-    databaseError($conn->errorInfo());

-  }

-  foreach ($query->fetchAll() as $r) {

-	echo "<b>{$r['heuristic_name']}</b>: {$r['heuristic_value']} (raw value: {$r['raw_value']}, mean: {$r['mean']}, stddev: {$r['stddev']})<br>";

+$query->execute();

+databaseError($conn->errorInfo());

+foreach ($query->fetchAll() as $r) {

+    echo "<b>{$r['heuristic_name']}</b>: {$r['heuristic_value']} (raw value: {$r['raw_value']}, mean: {$r['mean']}, stddev: {$r['stddev']})<br>";

 }

 

 include_footer();