--- a/displayAgency.php
+++ b/displayAgency.php
@@ -3,11 +3,12 @@
 include_once ("./lib/common.inc.php");

 if ($_REQUEST['agency']) {

 

-    include_header("Agency");

     $agency = htmlentities(strip_tags($_REQUEST['agency']));

-    MethodCountGraph($agency);

-    CnCGraph($agency);

-    MethodValueGraph($agency);

+    include_header($agency);

+echo '<center><h1>'.$agency.'</h1></center>';

+//    MethodCountGraph($agency);

+ //   CnCGraph($agency);

+ //   MethodValueGraph($agency);

     /* biggest contracts

       spending by year

       spending by industry/category

--- a/displayContract.php
+++ b/displayContract.php
@@ -1,7 +1,6 @@
 <?php

 

 include_once("./lib/common.inc.php");

-include_header("Contract");

 $query = 'SELECT *

 FROM contractnotice

 WHERE  "CNID" = :CNID LIMIT 1';

@@ -9,15 +8,25 @@
 $query = $conn->prepare($query);

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

 $query->execute();

+$contractResult = $query->fetch(PDO::FETCH_ASSOC);

+if (!$contractResult) {

+  header("Status: 404 Not Found");

+    header("HTTP/1.0 404 Not Found");

+include_header("Contract Not Found");

+ echo "<center><h1>No Contract Notice with that ID found</h1></center>";

 databaseError($conn->errorInfo());

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

+} else {

+$description = ucsmart($contractResult["description"]);

+include_header($description);

+ echo '<center><h1>'.$description.'</h1></center>';

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

     setlocale(LC_MONETARY, 'en_US');

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

+    foreach (array_filter($contractResult) 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>";

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

                 break;

             case "agencyName":

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

@@ -26,11 +35,10 @@
                 echo "$" . number_format(doubleval($value), 2);

                 break;

             default:

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

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

         }

         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>';

 

 

@@ -43,7 +51,7 @@
 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();

 ?>

 

--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -3,8 +3,10 @@
 include_once ("./lib/common.inc.php");
 if ($_REQUEST['supplier']) {
 
-    include_header("Supplier");
     $supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
+    include_header(str_replace("%","",$supplierName));
+echo '<center><h1>'.str_replace("%","",$supplierName).'</h1></center>';
+
    // MethodCountGraph($supplierS);
   //  CnCGraph($supplierS);
    // MethodValueGraph($supplierS);