--- a/data.json.php +++ b/data.json.php @@ -2,15 +2,36 @@ include("config.php"); header("Content-Type: application/json"); $result = Array(); -$page = filter_input(INPUT_GET, 'page',FILTER_SANITIZE_NUMBER_INT); -$perPage = filter_input(INPUT_GET, 'perPage',FILTER_SANITIZE_NUMBER_INT); -$offset = filter_input(INPUT_GET, 'offset',FILTER_SANITIZE_NUMBER_INT); -$query = "Select acnabn, service_name from dcaas_services order by acnabn"; +$page = filter_input(INPUT_GET, 'page', FILTER_SANITIZE_NUMBER_INT); +$perPage = filter_input(INPUT_GET, 'perPage', FILTER_SANITIZE_NUMBER_INT); +$offset = filter_input(INPUT_GET, 'offset', FILTER_SANITIZE_NUMBER_INT); +$search = preg_replace("/[^a-zA-Z0-9]+/", "", filter_var($_GET['queries']['search'], FILTER_SANITIZE_STRING)); +$sortby = 'acnabn'; +if (isset($_GET['sorts'])) { + $keys = array_keys($_GET['sorts']); + if (in_array($keys[0], array('trading_or_business_name', 'acnabn', 'service', 'service_category', 'service_sub_category'))) { + $sortby = preg_replace("/[^a-zA-Z0-9_]+/", "", $keys[0]); + if ($sortby == 'service') $sortby = 'service_name'; + } +} +$select_columns = 'Select trading_or_business_name, acnabn, service_name, service_category, service_sub_category '; +$query = " from dcaas_services " + . ($search != "" ? " where service_name like '%$search%'" : ""); $total = $db->query("select count(*) from dcaas_services")->fetch(PDO::FETCH_NUM); -foreach ($db->query($query." limit $offset,".($page*$perPage), PDO::FETCH_ASSOC) as $row) { - $result['records'][] = $row; +$query_total = $db->query("select count(*) ".$query)->fetch(PDO::FETCH_NUM); + +/* http://www.sqlite.org/lang_select.html +Instead of a separate OFFSET clause, the LIMIT clause may specify two scalar expressions separated by a comma. +In this case, the first expression is used as the OFFSET expression and the second as the LIMIT expression. +This is counter-intuitive, as when using the OFFSET clause the second of the two expressions is the OFFSET +and the first the LIMIT. This is intentional - it maximizes compatibility with other SQL database systems.*/ +$limit = "limit $offset, $perPage"; + +foreach ($db->query($select_columns .$query . " order by $sortby $limit", PDO::FETCH_ASSOC) as $row) { + $row['service'] = '' . $row['service_name'] . ""; + $result['records'][] = $row; } -$result['queryRecordCount'] = intval($total[0]); +$result['queryRecordCount'] = intval($query_total[0]); $result['totalRecordCount'] = intval($total[0]); echo json_encode($result); ?> --- a/data/xls2csv.py +++ b/data/xls2csv.py @@ -12,9 +12,9 @@ def cleanseValue(column,value): if isinstance(value, basestring): value = "".join([x if ord(x) < 128 else '' for x in value]) - value = value.replace('<','>').replace('>','<').replace('\n','
').replace('\r','
') + value = value.replace('<','>').replace('>','<').replace('\n','
').replace('\r','
').strip() else: - value = str(value) + value = str(value).strip() if column == 'ACNABN' and value != None: value = value.replace(' ','').replace(".0","").replace('"','').replace(",","") value = value.replace("ABN"," ").replace("ACN"," ").replace("/"," ").replace(":"," ") --- /dev/null +++ b/robots.txt @@ -1,1 +1,6 @@ - +# www.robotstxt.org/ +# www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449 + +User-agent: * +Disallow: /admin/ +Sitemap: http://orgs.disclosurelo.gs/sitemap.xml.php --- /dev/null +++ b/sitemap.xml.php @@ -1,1 +1,21 @@ - +"; +echo '' . "\n"; +echo " " . local_url() . "index.php1.0\n"; +/*foreach (scandir("./") as $file) { + if (strpos($file, ".php") !== false && $file != "index.php" && $file != "sitemap.xml.php") + echo " " . local_url() . "$file0.3\n"; +} */ + + +$query = "Select distinct acnabn, service_name from dcaas_services order by acnabn"; + +foreach ($db->query($query, PDO::FETCH_ASSOC) as $row) { + echo '' . local_url() . 'view.php?acnabn=' . $row['acnabn'] . "&service_name=" . $row['service_name'] . "0.6\n"; +} + +echo ''; --- a/table.php +++ b/table.php @@ -2,17 +2,14 @@ include("config.php"); include("lib/tag-cloud/src/lotsofcode/TagCloud/TagCloud.php"); -includeHeader("title"); +includeHeader("DCaaS Service Catalogue"); ?>

Bootstrap starter template

- -

Use this document as a way to quickly start any new project.
All you get is this text and a - mostly barebones HTML document.

DCaaS Service Catalogue

- - +

acnabn	service_name

+ + + + + +

trading_or_business_name	Service	service_category	service_sub_category

@@ -53,34 +55,34 @@ } }); - /* $('#search-example').dynatable({ - features: { - paginate: false, - recordCount: false, - sorting: false - }, - inputs: { - queries: $('#search-year') - } - }); + /* $('#search-example').dynatable({ + features: { + paginate: false, + recordCount: false, + sorting: false + }, + inputs: { + queries: $('#search-year') + } + }); - $('#search-function-example') - .bind('dynatable:init', function (e, dynatable) { - dynatable.queries.functions['max-price'] = function (record, queryValue) { - return parseFloat(record.price.replace(/,/, '')) <= parseFloat(queryValue); - }; - }) - .dynatable({ - features: { - paginate: false, - recordCount: false, - sorting: false, - search: false - }, - inputs: { - queries: $('#max-price') - } - }); */ + $('#search-function-example') + .bind('dynatable:init', function (e, dynatable) { + dynatable.queries.functions['max-price'] = function (record, queryValue) { + return parseFloat(record.price.replace(/,/, '')) <= parseFloat(queryValue); + }; + }) + .dynatable({ + features: { + paginate: false, + recordCount: false, + sorting: false, + search: false + }, + inputs: { + queries: $('#max-price') + } + }); */ --- /dev/null +++ b/view.php @@ -1,1 +1,48 @@ +prepare("Select * from dcaas_services where acnabn = :acnabn and service_name = :service_name"); +$sth->bindValue(':acnabn',$acnabn); +$sth->bindValue(':service_name',$service_name); +$sth->execute(); +$data = $sth->fetchAll(PDO::FETCH_ASSOC); +if (count($data) == 0) { + header('HTTP/1.0 404 Not Found'); + includeHeader('Not Found'); + echo "not found"; +} else { + $service = $data[0]; + includeHeader($service['service_name']); + ?> +

+ +

()

+ + View Australian Government contracts with this supplier on AusTender +
+

+
+
+ + $value) { + if (trim($value) != "" && !in_array($key, Array('trading_or_business_name' , 'acnabn' , 'service_name' ,'service_description', 'id'))) { + + echo "\n"; + + + } + + } + echo "

".ucwords(str_replace("_", " ", $key)) . "

$value

"; + +} +includeFooter(); +