From: maxious Date: Sun, 01 Jan 2012 07:21:59 +0000 Subject: Support adding fields on the fly X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=2aac405fc7f2f92842b8dbf68679e0769c8a9118 --- Support adding fields on the fly Former-commit-id: d2e066bb95df5c8068d05a3cec1db89eabbe608d --- --- a/common.inc.php +++ b/common.inc.php @@ -4,12 +4,13 @@ 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); };"; -$obv->views->showNamesABNs->map = "function(doc) { emit(doc._id, {name: doc.name, abn: doc.abn}); };"; +$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); } @@ -37,7 +38,7 @@ - Welcome to Foundation + Disclosr @@ -90,11 +91,44 @@ + - + 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 @@ -2,34 +2,125 @@ include_once('common.inc.php'); include_header(); + +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 '
+
+
+
' . $key . '
'; + foreach ($value as $subkey => $subvalue) { + echo ""; + } + echo "
+
+
"; + } else { + if (strpos($key, "_") === 0) { + echo""; + } if (strpos($key, "has") === 0) { + echo ""; + } else { + echo ""; + } + } + } + // +} + +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? - - $row = $db->get($_REQUEST['id']); - //print_r($row); - echo ''; - echo '"; - echo ""; - foreach ($row as $key => $value) { - if (is_a($value, 'stdClass')) { - echo ""; - } else - echo ""; + + $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']) { + echo "Edited version was latest version, continue saving"; + $row = $db->save($_POST); + } else { + echo "ALERT doc revised by someone else while editing."; + } } - echo "

' . $row->name . "

Field NameField Value
$key" . var_dump($value, true) . "
$key$value
"; -} else { + $mode = "edit"; + $row = addDefaultFields(object_to_array($row)); + if ($mode == "view") { + echo ''; + echo '"; + echo ""; + } + if ($mode == "edit") { + ?> + + + + 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) + } + foreach ($row as $key => $value) { + echo displayValue($key, $value, $mode); + } + if ($mode == "view") { + echo "

    • ' . $row['name'] . "

    Field NameField Value
    "; + } + if ($mode == "edit") { + echo ''; + } + } else { + + try { + $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) . '
    • '; + } + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } } -} -include_footer(); + include_footer(); --- a/import.php +++ b/import.php @@ -9,10 +9,10 @@ $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;'; +$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']); + $abntonames[$row['abn']] = explode("|", $row['names']); } $result = $conn->query("select * from agency"); while ($agency = $result->fetch(PDO::FETCH_ASSOC)) { --- /dev/null +++ b/schemas/agency.php @@ -1,1 +1,19 @@ + "Representation of government agency and online transparency measures", + "type" => "object", + "properties" => Array( + "name" => Array("type" => "string", "required" => true, "description" => "Agency Name, most recent and broadest"), + "othernames" => Array("type" => "array", "required" => true, "description" => "Agency Names", + "items" => Array("type" => "string")), + ), + /*"org":{"type":"object", + "properties":{ + "organizationName":{"type":"string"}, + "organizationUnit":{"type":"string"}}, + } + }*/ +); +?> +