From: Maxious Date: Thu, 29 Dec 2011 06:56:07 +0000 Subject: Port to sette library X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=c78e22878026e2e3daefa6b63a19b36416b9b436 --- Port to sette library Former-commit-id: b7aee2aaa7a1bf09d88b702f55d98438eb110942 --- --- a/common.inc.php +++ b/common.inc.php @@ -1,98 +1,98 @@ _id = "_design/" . urlencode("app"); + $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); };"; - $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); };"; - - return true; + // allow safe updates (even if slightly slower due to extra: rev-detection check). + return $db->save($obj, 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() . "
" . PHP_EOL; +} + function include_header() { ?> - + - - - - - - - + + + + + + + - - + + - Welcome to Foundation - - - - + Welcome to Foundation - + + + + + - - + + - - + + - - - + + - + +
+ +
+ - - - + + + - - + + --- a/getAgency.php +++ b/getAgency.php @@ -2,17 +2,18 @@ include_once('common.inc.php'); include_header(); - -$sag->setDatabase("disclosr-agencies", true); +$db = $server->get_db('disclosr-agencies'); //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 +$rows = $db->get_view("app","byABN")->rows; +//print_r($rows); foreach ($rows as $row) { + echo ""; - echo '"; + echo '"; echo ""; -foreach ($row->doc as $key => $value) { +foreach ($row->value as $key => $value) { if (is_a($value, 'stdClass')) { echo ""; } else echo ""; --- a/import.php +++ b/import.php @@ -1,22 +1,34 @@ 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['otherNames'] = $abntonames[$agency['abn']]; - if (sizeof($abntonames[$agency['abn']]) == 1) $agency['name'] = $abntonames[$agency['abn']][0]; - $agency["lastScraped"] = "1/1/1970"; - $agency["scrapeDepth"] = 1; - $doc = $db->save($agency); -print_r($doc); - } +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
"; + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } +} ?>

' . $row->doc->agencyName . "

' . $row->value->name . "

Field NameField Value
$key".var_dump($value,true)."
$key$value