projects / disclosr.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
unified | plain
Support adding fields on the fly
Support adding fields on the fly


Former-commit-id: d2e066bb95df5c8068d05a3cec1db89eabbe608d

file:a/.gitmodules -> file:b/.gitmodules
[submodule "sag"]  
path = sag  
url = https://github.com/sbisbee/sag.git  
[submodule "couchdb/couchdb-lucene"] [submodule "couchdb/couchdb-lucene"]
path = couchdb/couchdb-lucene path = couchdb/couchdb-lucene
url = https://github.com/rnewson/couchdb-lucene.git url = https://github.com/rnewson/couchdb-lucene.git
  [submodule "couchdb/settee"]
  path = couchdb/settee
  url = https://github.com/inadarei/settee.git
   
file:a/common.inc.php -> file:b/common.inc.php
<?php <?php
   
/* function createAgencyDesignDoc() {
* To change this template, choose Tools | Templates global $db;
* and open the template in the editor. $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() { require (realpath(dirname(__FILE__) . '/couchdb/settee/src/settee.php'));
global $sag;  
//See if the design doc exists, creating it if it doesn't $server = new SetteeServer('http://127.0.0.1:5984');
try {  
//it does exist, so finish early function setteErrorHandler($e) {
if ($sag->head('_design/app')->headers->_HTTP->status != "404") echo $e->getMessage() . "<br>" . PHP_EOL;
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;  
} }
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() { function include_header() {
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
   
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ --> <!-- 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 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 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 IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html lang="en"> <!--<![endif]--> <!--[if gt IE 8]><!--> <html lang="en"> <!--<![endif]-->
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
   
<!-- Set the viewport width to device width for mobile --> <!-- Set the viewport width to device width for mobile -->
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
   
<title>Welcome to Foundation</title> <title>Disclosr</title>
   
<!-- Included CSS Files -->  
<link rel="stylesheet" href="stylesheets/foundation.css">  
<link rel="stylesheet" href="stylesheets/app.css">  
   
<!--[if lt IE 9]> <!-- Included CSS Files -->
<link rel="stylesheet" href="stylesheets/ie.css"> <link rel="stylesheet" href="stylesheets/foundation.css">
<![endif]--> <link rel="stylesheet" href="stylesheets/app.css">
   
  <!--[if lt IE 9]>
  <link rel="stylesheet" href="stylesheets/ie.css">
  <![endif]-->
   
   
<!-- IE Fix for HTML5 Tags --> <!-- IE Fix for HTML5 Tags -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
   
</head> </head>
<body> <body>
   
<!-- navBar --> <!-- navBar -->
<div id="navBar" class="container"> <div id="navbar" class="container">
<div class="row"> <div class="row">
<div class="four columns"> <div class="four columns">
<h1><a href="/">Disclosr</a></h1> <h1><a href="/">Disclosr</a></h1>
</div> </div>
<div class="eight columns hide-on-phones"> <div class="eight columns hide-on-phones">
<strong class="right"> <strong class="right">
<a href="../grid.php">Features</a> <a href="../grid.php">Features</a>
<a href="../case-soapbox.php">Case Studies</a> <a href="../case-soapbox.php">Case Studies</a>
<a href="index.php">Documentation</a> <a href="index.php">Documentation</a>
<a href="http://github.com/navb/foundation">Github</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> <a href="../files/foundation-download-2.1.4.zip" class="small blue nice button src-download">Download</a>
   
</strong>  
</div>  
</div>  
</div>  
<!-- /navBar -->  
   
<!-- container --> </strong>
<div class="container"> </div>
<?php } </div>
  </div>
  <!-- /navBar -->
   
function include_footer() { ?> <!-- container -->
</div> <div class="container">
<!-- container --> <?php }
   
  function include_footer() { ?>
  </div>
  <!-- container -->
   
   
   
   
<!-- Included JS Files --> <!-- Included JS Files -->
<script src="javascripts/foundation.js"></script> <script src="javascripts/foundation.js"></script>
<script src="javascripts/app.js"></script> <script src="javascripts/app.js"></script>
  <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
   
</body> </body>
</html> </html>
   
<?php } ?> <?php }
   
  # Convert a stdClass to an Array. http://www.php.net/manual/en/language.types.object.php#102735
  function object_to_array(stdClass $Class){
  # Typecast to (array) automatically converts stdClass -> 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;
  }
   
   
  ?>
   
   
   
directory:b/couchdb/settee (new)
 
file:a/getAgency.php -> file:b/getAgency.php
<?php <?php
   
include_once('common.inc.php'); include_once('common.inc.php');
include_header(); include_header();
   
$sag->setDatabase("disclosr-agencies", true); function displayValue($key, $value, $mode) {
//get an agency record as json/html, search by name/abn/id 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 '<div class="row">
  <div class="seven columns">
  <fieldset>
  <h5>' . $key . '</h5>';
  foreach ($value as $subkey => $subvalue) {
  echo "<label>$subkey</label><input class='input-text' type='text' id='$key$subkey' name='$key" . '[' . $subkey . "]' value='$subvalue'/></tr>";
  }
  echo "</fieldset>
  </div>
  </div>";
  } else {
  if (strpos($key, "_") === 0) {
  echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
  } if (strpos($key, "has") === 0) {
  echo "<label for='$key'><input type='checkbox' id='$key' name='$key' value='$value'> $key</label>";
  } else {
  echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/></tr>";
  }
  }
  }
  //
  }
   
  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" // by name = startkey="Ham"&endkey="Ham\ufff0"
// edit? // 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);
  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.";
  }
  }
   
include_footer(); $mode = "edit";
  $row = addDefaultFields(object_to_array($row));
  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") {
  ?>
  <input id="addfield" type="button" value="Add Field"/>
  <script>
  window.onload = function() {
  $(document).ready(function() {
  // put all your jQuery goodness in here.
  // http://charlie.griefer.com/blog/2009/09/17/jquery-dynamically-adding-form-elements/
  $('#addfield').click(function() {
  var field_name=window.prompt("What is your name?","");
  if (field_name !="") {
  $('#submitbutton').before($('<span></span>')
  .append("<label>"+field_name+"</label>")
  .append("<input class='input-text' type='text' id='"+field_name+"' name='"+field_name+"'/>")
  );
  }
  });
  });
  };
  </script>
  <form id="editform" class="nice" method="post">
  <?php
   
  }
  foreach ($row as $key => $value) {
  echo displayValue($key, $value, $mode);
  }
  if ($mode == "view") {
  echo "</table>";
  }
  if ($mode == "edit") {
  echo '<input id="submitbutton" type="submit"/></form>';
  }
  } else {
   
  try {
  $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 . '">' .