Edit and view modes for agency records
Former-commit-id: e975475a91653ade66930f0630d673ec384a64e7
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
-[submodule "sag"]
- path = sag
- url = https://github.com/sbisbee/sag.git
[submodule "couchdb/couchdb-lucene"]
path = couchdb/couchdb-lucene
url = https://github.com/rnewson/couchdb-lucene.git
+[submodule "couchdb/settee"]
+ path = couchdb/settee
+ url = https://github.com/inadarei/settee.git
--- a/common.inc.php
+++ b/common.inc.php
@@ -1,131 +1,99 @@
<?php
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+function createAgencyDesignDoc() {
+ global $db;
+ $obj = new stdClass();
+ $obj->_id = "_design/" . urlencode("app");
+ $obj->language = "javascript";
+ $obj->views->byABN->map = "function(doc) { emit(doc.abn, doc); };";
+ $obj->views->byName->map = "function(doc) { emit(doc.name, doc); };";
+ $obj->views->getActive->map = 'function(doc) { if (doc.status == "active") { emit(doc._id, doc); } };';
+ $obj->views->getSuspended->map = 'function(doc) { if (doc.status == "suspended") { emit(doc._id, doc); } };';
+ $obj->views->getScrapeRequired->map = "function(doc) { emit(doc.abn, doc); };";
+$obj->views->showNamesABNs->map = "function(doc) { emit(doc._id, {name: doc.name, abn: doc.abn}); };";
+ // allow safe updates (even if slightly slower due to extra: rev-detection check).
+ return $db->save($obj, true);
+}
-function createAgencyDesignDoc() {
- global $sag;
- //See if the design doc exists, creating it if it doesn't
- try {
- //it does exist, so finish early
- if ($sag->head('_design/app')->headers->_HTTP->status != "404")
- return true;
- } catch (Exception $e) {
- //database issue
- return false;
- }
- $ddoc = new StdClass();
- $ddoc->_id = '_design/app';
- $ddoc->views = new StdClass();
- // by abn, by name
- $ddoc->views->byABN = new StdClass();
- $ddoc->views->byABN->map = "function(doc) { emit(doc.abn, doc); };";
- $ddoc->views->byName = new StdClass();
- $ddoc->views->byName->map = "function(doc) { emit(doc.name, doc); };";
- $ddoc->views->getActive = new StdClass();
- $ddoc->views->getActive->map = 'function(doc) { if (doc.status == "active") { emit(doc._id, doc); } };';
- $ddoc->views->getSuspended = new StdClass();
- $ddoc->views->getSuspended->map = 'function(doc) { if (doc.status == "suspended") { emit(doc._id, doc); } };';
- $ddoc->views->getScrapeRequired = new StdClass();
- $ddoc->views->getScrapeRequired->map = "function(doc) { emit(doc.abn, doc); };";
- try {
- $sag->put('_design/app', $ddoc);
- } catch (Exception $e) {
- /*
- * A 409 status code means there was a conflict, so another client
- * already created the design doc for us. This is fine.
- */
- if ($e->getCode() != 409)
- return false;
- }
- return true;
+require (realpath(dirname(__FILE__) . '/couchdb/settee/src/settee.php'));
+
+$server = new SetteeServer('http://127.0.0.1:5984');
+
+function setteErrorHandler($e) {
+ echo $e->getMessage() . "<br>" . PHP_EOL;
}
-error_reporting(0);
-require_once('sag/src/SagException.php');
-require_once('sag/src/SagCouchException.php');
-require_once('sag/src/SagConfigurationCheck.php');
-require_once('sag/src/httpAdapters/SagHTTPAdapter.php');
-require_once('sag/src/httpAdapters/SagNativeHTTPAdapter.php');
-require_once('sag/src/httpAdapters/SagCURLHTTPAdapter.php');
-require_once 'sag/src/Sag.php';
-error_reporting(E_ALL ^ E_STRICT ^ E_NOTICE);
-$sag = new Sag();
-
-// createAgencyDesignDoc();
function include_header() {
?>
-<!DOCTYPE html>
+ <!DOCTYPE html>
-<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
-<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
-<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
-<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!--> <html lang="en"> <!--<![endif]-->
-<head>
- <meta charset="utf-8" />
+ <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
+ <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
+ <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
+ <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
+ <!--[if gt IE 8]><!--> <html lang="en"> <!--<![endif]-->
+ <head>
+ <meta charset="utf-8" />
- <!-- Set the viewport width to device width for mobile -->
- <meta name="viewport" content="width=device-width" />
+ <!-- Set the viewport width to device width for mobile -->
+ <meta name="viewport" content="width=device-width" />
- <title>Welcome to Foundation</title>
-
- <!-- Included CSS Files -->
- <link rel="stylesheet" href="stylesheets/foundation.css">
- <link rel="stylesheet" href="stylesheets/app.css">
+ <title>Disclosr</title>
- <!--[if lt IE 9]>
- <link rel="stylesheet" href="stylesheets/ie.css">
- <![endif]-->
+ <!-- Included CSS Files -->
+ <link rel="stylesheet" href="stylesheets/foundation.css">
+ <link rel="stylesheet" href="stylesheets/app.css">
+
+ <!--[if lt IE 9]>
+ <link rel="stylesheet" href="stylesheets/ie.css">
+ <![endif]-->
- <!-- IE Fix for HTML5 Tags -->
- <!--[if lt IE 9]>
- <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
+ <!-- IE Fix for HTML5 Tags -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
-</head>
-<body>
+ </head>
+ <body>
- <!-- navBar -->
- <div id="navBar" class="container">
- <div class="row">
- <div class="four columns">
- <h1><a href="/">Disclosr</a></h1>
- </div>
- <div class="eight columns hide-on-phones">
- <strong class="right">
- <a href="../grid.php">Features</a>
- <a href="../case-soapbox.php">Case Studies</a>
- <a href="index.php">Documentation</a>
- <a href="http://github.com/navb/foundation">Github</a>
- <a href="../files/foundation-download-2.1.4.zip" class="small blue nice button src-download">Download</a>
-
- </strong>
- </div>
- </div>
- </div>
- <!-- /navBar -->
+ <!-- navBar -->
+ <div id="navbar" class="container">
+ <div class="row">
+ <div class="four columns">
+ <h1><a href="/">Disclosr</a></h1>
+ </div>
+ <div class="eight columns hide-on-phones">
+ <strong class="right">
+ <a href="../grid.php">Features</a>
+ <a href="../case-soapbox.php">Case Studies</a>
+ <a href="index.php">Documentation</a>
+ <a href="http://github.com/navb/foundation">Github</a>
+ <a href="../files/foundation-download-2.1.4.zip" class="small blue nice button src-download">Download</a>
- <!-- container -->
- <div class="container">
-<?php }
+ </strong>
+ </div>
+ </div>
+ </div>
+ <!-- /navBar -->
-function include_footer() { ?>
-</div>
- <!-- container -->
+ <!-- container -->
+ <div class="container">
+ <?php }
+
+ function include_footer() { ?>
+ </div>
+ <!-- container -->
- <!-- Included JS Files -->
- <script src="javascripts/foundation.js"></script>
- <script src="javascripts/app.js"></script>
+ <!-- Included JS Files -->
+ <script src="javascripts/foundation.js"></script>
+ <script src="javascripts/app.js"></script>
-</body>
-</html>
+ </body>
+ </html>
<?php } ?>
--- /dev/null
+++ b/couchdb/settee
--- a/getAgency.php
+++ b/getAgency.php
@@ -3,22 +3,73 @@
include_once('common.inc.php');
include_header();
-$sag->setDatabase("disclosr-agencies", true);
-//get an agency record as json/html, search by name/abn/id
+function displayValue($key, $value, $mode) {
+ if ($mode == "view") {
+ if (is_array($value)) {
+ echo "<tr><td>$key</td><td><ol>";
+ foreach ($value as $subkey => $subvalue) {
+ echo "<li>$subvalue</li>";
+ }
+ echo "</ol></td></tr>";
+ } else {
+ echo "<tr><td>$key</td><td>$value</td></tr>";
+ }
+ }
+ if ($mode == "edit") {
+ if (is_array($value)) {
+ echo "<label>$key</label><ol>";
+ foreach ($value as $subkey => $subvalue) {
+ echo "<li>$subvalue</li>";
+ }
+ echo "</ol>";
+ } else {
+ if (strpos($key,"_") === 0) {
+ echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
+ } else {
+ echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/></tr>";
+
+ }
+ }
+ }
+}
+
+$db = $server->get_db('disclosr-agencies');
+if (isset($_REQUEST['id'])) {
+ //get an agency record as json/html, search by name/abn/id
// by name = startkey="Ham"&endkey="Ham\ufff0"
// edit?
-$rows = $sag->get('/_design/app/_view/byABN?include_docs=true')->body->rows; // &endkey='.$searchVar
-foreach ($rows as $row) {
- echo "<table>";
- echo '<tr> <td colspan="2"><h3>' . $row->doc->agencyName . "</h3></td></tr>";
- echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
-foreach ($row->doc as $key => $value) {
- if (is_a($value, 'stdClass')) {
- echo "<tr><td>$key</td><td>".var_dump($value,true)."</td></tr>";
- } else echo "<tr><td>$key</td><td>$value</td></tr>";
- } // also show documents/URLs available
- echo "</table>";
+ $row = $db->get($_REQUEST['id']);
+ //print_r($row);
+
+ $mode = "edit";
+
+ if ($mode == "view") {
+ echo '<table width="100%">';
+ echo '<tr> <td colspan="2"><h3>' . $row->name . "</h3></td></tr>";
+ echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
+ }
+ if ($mode == "edit") {
+ echo '<form class="nice">';
+ }
+ foreach ($row as $key => $value) {
+ echo displayValue($key, $value, $mode);
+ }
+ if ($mode == "view") {
+ echo "</table>";
+ }
+ if ($mode == "edit") {
+ echo '</form>';
+ }
+} else {
+
+ $rows = $db->get_view("app", "showNamesABNs")->rows;
+//print_r($rows);
+ foreach ($rows as $row) {
+ // print_r($row);
+ echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
+ (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
+ . '</a></li>';
+ }
}
-
include_footer();
--- a/import.php
+++ b/import.php
@@ -1,22 +1,34 @@
<?php
+
require_once 'common.inc.php';
-
-$sag->setDatabase("disclosr-agencies", true);
-//createAgencyDesignDoc();
- $conn = new PDO("pgsql:dbname=contractDashboard;user=postgres;password=snmc;host=localhost");
- $namesQ = 'select agency.abn, string_agg("agencyName",\',\') as names from agency inner join agency_nametoabn on agency.abn::text = agency_nametoabn.abn group by agency.abn;';
- $abntonames = Array();
- foreach ($conn->query($namesQ) as $row) {
- $abntonames[$row['abn']] = explode(",",$row['names']);
- }
- $result = $conn->query("select * from agency");
- while ($agency = $result->fetch(PDO::FETCH_ASSOC)) {
-
- $agency['otherNames'] = $abntonames[$agency['abn']];
- if (sizeof($abntonames[$agency['abn']]) == 1) $agency['name'] = $abntonames[$agency['abn']][0];
- $agency["lastScraped"] = "1/1/1970";
- $agency["scrapeDepth"] = 1;
- $sag->post($agency);
- }
+try {
+ $server->create_db('disclosr-agencies');
+} catch (SetteeRestClientException $e) {
+ setteErrorHandler($e);
+}
+$db = $server->get_db('disclosr-agencies');
+createAgencyDesignDoc();
+$conn = new PDO("pgsql:dbname=contractDashboard;user=postgres;password=snmc;host=localhost");
+$namesQ = 'select agency.abn, string_agg("agencyName",\',\') as names from agency inner join agency_nametoabn on agency.abn::text = agency_nametoabn.abn group by agency.abn;';
+$abntonames = Array();
+foreach ($conn->query($namesQ) as $row) {
+ $abntonames[$row['abn']] = explode(",", $row['names']);
+}
+$result = $conn->query("select * from agency");
+while ($agency = $result->fetch(PDO::FETCH_ASSOC)) {
+ $agency['_id'] = md5($agency['abn']);
+ $agency['otherNames'] = $abntonames[$agency['abn']];
+ if (sizeof($abntonames[$agency['abn']]) == 1)
+ $agency['name'] = $abntonames[$agency['abn']][0];
+ $agency["lastScraped"] = "1/1/1970";
+ $agency["scrapeDepth"] = 1;
+ try {
+ $doc = $db->save($agency);
+ //print_r($doc);
+ echo $agency['abn'] . " imported \n<br>";
+ } catch (SetteeRestClientException $e) {
+ setteErrorHandler($e);
+ }
+}
?>
directory:
a/sag
(deleted)
--- a/sag
+++ /dev/null