From: maxious Date: Fri, 30 Dec 2011 21:42:01 +0000 Subject: Basic non-array field updating X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=b74e2ff82fde31512f4527ef0ebe28f14ad44d76 --- Basic non-array field updating Former-commit-id: c4457453caaf548c817b6a9e84001337c3e1b504 --- --- a/common.inc.php +++ b/common.inc.php @@ -1,100 +1,132 @@ _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); +} - $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; -} 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 - - - - + Disclosr - + + + + + - - + + - - + + - - - + + - + +
+ +
+ - - - + + + - - + + - + array. + $Class = (array)$Class; + + # Iterate through the former properties looking for any stdClass properties. + # Recursively apply (array). + foreach($Class as $key => $value){ + if(is_object($value)&&get_class($value)==='stdClass'){ + $Class[$key] = object_to_array($value); + } + } + return $Class; + } + + # Convert an Array to stdClass. http://www.php.net/manual/en/language.types.object.php#102735 + function array_to_object(array $array){ + # Iterate through our array looking for array values. + # If found recurvisely call itself. + foreach($array as $key => $value){ + if(is_array($value)){ + $array[$key] = array_to_object($value); + } + } + + # Typecast to (object) will automatically convert array -> stdClass + return (object)$array; + } + + ?> --- a/getAgency.php +++ b/getAgency.php @@ -3,22 +3,104 @@ 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 "$key
    "; + foreach ($value as $subkey => $subvalue) { + echo "
  1. $subvalue
    2. "; + } + echo "
"; + } else { + echo "$key$value"; + } + } + if ($mode == "edit") { + if (is_array($value)) { + echo "
    "; + foreach ($value as $subkey => $subvalue) { + echo "
  1. $subvalue
    2. "; + } + echo "
"; + } else { + if (strpos($key,"_") === 0) { + echo""; + } if (strpos($key,"has") === 0) { + echo ""; + } else { + echo ""; + + } + } + } + // + + /*
+
+
+
Fieldset Header H2
+

This is a paragraph within a fieldset.

+ + + +
+
+
+*/ +} +function addDefaultFields($row) { + $defaultFields = Array("name"); + foreach ($defaultFields as $defaultField) { + if (!isset($row[$defaultField])) $row[$defaultField] = ""; + } + return $row; +} +$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 ""; - echo '"; - echo ""; -foreach ($row->doc as $key => $value) { - if (is_a($value, 'stdClass')) { - echo ""; - } else echo ""; - } // also show documents/URLs available - echo "

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

Field NameField Value
$key".var_dump($value,true)."
$key$value
"; + $row = $db->get($_REQUEST['id']); + //print_r($row); + if (sizeof($_POST) >0) { + print_r($_POST); + if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) { + $row = $db->save($_POST); + } else { + echo "ALERT doc revised by someone else while editing."; + } + } + + $mode = "edit"; +$row = addDefaultFields(object_to_array($row)); + if ($mode == "view") { + echo ''; + echo '"; + echo ""; + } + if ($mode == "edit") { + echo ''; + } + foreach ($row as $key => $value) { + echo displayValue($key, $value, $mode); + } + if ($mode == "view") { + echo "

' . $row['name'] . "

Field NameField Value
"; + } + if ($mode == "edit") { + echo ''; + } +} else { + + $rows = $db->get_view("app", "showNamesABNs")->rows; +//print_r($rows); + foreach ($rows as $row) { + // print_r($row); + echo '
  • ' . + (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) + . '
    • '; + } } - include_footer(); --- 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); + } +} ?>