fix reduce
fix reduce


Former-commit-id: 9bf62392d9d505afcc2ed31f23d49c84a98a2091

--- a/couchdb/settee/src/classes/SetteeDatabase.class.php
+++ b/couchdb/settee/src/classes/SetteeDatabase.class.php
@@ -1,310 +1,316 @@
 <?php
 
 /**
-* Databaase class.
-*/
+ * Databaase class.
+ */
 class SetteeDatabase {
 
-  /**
-  * Base URL of the CouchDB REST API
-  */
-  private $conn_url;
-  
-  /**
-  * HTTP REST Client instance
-  */
-  protected $rest_client;
-  
-  /**
-  * Name of the database
-  */
-  private $dbname;
-  
-  /**
-  * Default constructor
-  */ 
-  function __construct($conn_url, $dbname) {
-    $this->conn_url = $conn_url;
-    $this->dbname = $dbname;
-    $this->rest_client = SetteeRestClient::get_instance($this->conn_url);
-  }
-
-
-  /**
-  * Get UUID from CouchDB
-  *
-  * @return
-  *     CouchDB-generated UUID string
-  *
-  */
-  function gen_uuid() {
-    $ret = $this->rest_client->http_get('_uuids');
-    return $ret['decoded']->uuids[0]; // should never be empty at this point, so no checking
-  }
-
- /**
-  * Create or update a document database
-  *
-  * @param $document
-  *     PHP object, a PHP associative array, or a JSON String representing the document to be saved. PHP Objects and arrays are JSON-encoded automatically.
-  *
-  * <p>If $document has a an "_id" property set, it will be used as document's unique id (even for "create" operation).
-  * If "_id" is missing, CouchDB will be used to generate a UUID.
-  *
-  * <p>If $document has a "_rev" property (revision), document will be updated, rather than creating a new document.
-  * You have to provide "_rev" if you want to update an existing document, otherwise operation will be assumed to be
-  * one of creation and you will get a duplicate document exception from CouchDB. Also, you may not provide "_rev" but
-  * not provide "_id" since that is an invalid input.
-  *
-  * @param $allowRevAutoDetection
-  *   Default: false. When true and _rev is missing from the document, save() function will auto-detect latest revision
-  * for a document and use it. This option is "false" by default because it involves an extra http HEAD request and
-  * therefore can make save() operation slightly slower if such auto-detection is not required.
-  *
-  * @return
-  *     document object with the database id (uuid) and revision attached;
-  *
-  *  @throws SetteeCreateDatabaseException
-  */
-  function save($document, $allowRevAutoDetection = false) {
-    if (is_string($document)) {
-      $document = json_decode($document);
-    }
-
-    // Allow passing of $document as an array (for syntactic simplicity and also because in JSON world it does not matter) 
-    if(is_array($document)) {
-      $document = (object) $document;
-    }
-
-    if (empty($document->_id) && empty($document->_rev)) {
-      $id = $this->gen_uuid();
-    }
-    elseif (empty($document->_id) && !empty($document->_rev)) {
-      throw new SetteeWrongInputException("Error: You can not save a document with a revision provided, but missing id");
-    }
-    else {
-      $id = $document->_id;
-
-      if ($allowRevAutoDetection) {
-        try {
-          $rev = $this->get_rev($id);
-        } catch (SetteeRestClientException $e) {
-          // auto-detection may fail legitimately, if a document has never been saved before (new doc), so skipping error
-        }
-        if (!empty($rev)) {
-          $document->_rev = $rev;
-        }
-      }
-    }
-    
-    $full_uri = $this->dbname . "/" . $this->safe_urlencode($id);
-    $document_json = json_encode($document, JSON_NUMERIC_CHECK);
-    
-    $ret = $this->rest_client->http_put($full_uri, $document_json);
-
-    $document->_id = $ret['decoded']->id;
-    $document->_rev = $ret['decoded']->rev;
-
-    return $document;
-  }
-
-  /**
-   * @param  $doc
-   * @param  $name
-   * @param  $content
-   *    Content of the attachment in a string-buffer format. This function will automatically base64-encode content for
-   *    you, so you don't have to do it.
-   * @param  $mime_type
-   *    Optional. Will be auto-detected if not provided
-   * @return void
-   */
-  public function add_attachment($doc, $name, $content, $mime_type = null) {
-    if (empty($doc->_attachments) || !is_object($doc->_attachments)) {
-      $doc->_attachments = new stdClass();
-    }
-
-    if (empty($mime_type)) {
-      $mime_type = $this->rest_client->content_mime_type($content);
-    }
-
-    $doc->_attachments->$name = new stdClass();
-    $doc->_attachments->$name->content_type = $mime_type;
-    $doc->_attachments->$name->data = base64_encode($content);
-  }  
-
-  /**
-   * @param  $doc
-   * @param  $name
-   * @param  $file
-   *    Full path to a file (e.g. as returned by PHP's realpath function).
-   * @param  $mime_type
-   *    Optional. Will be auto-detected if not provided
-   * @return void
-   */
-  public function add_attachment_file($doc, $name, $file, $mime_type = null) {
-    $content = file_get_contents($file);
-    $this->add_attachment($doc, $name, $content, $mime_type);
-  }
-
-  /**
-   *
-   * Retrieve a document from CouchDB
-   *
-   * @throws SetteeWrongInputException
-   * 
-   * @param  $id
-   *    Unique ID (usually: UUID) of the document to be retrieved.
-   * @return
-   *    database document in PHP object format.
-   */
-  function get($id) {
-    if (empty($id)) {
-      throw new SetteeWrongInputException("Error: Can't retrieve a document without a uuid.");
-    }
-
-    $full_uri = $this->dbname . "/" . $this->safe_urlencode($id);
-$full_uri = str_replace("%3Frev%3D","?rev=",$full_uri);
-    $ret = $this->rest_client->http_get($full_uri);
-    return $ret['decoded'];
-  }
-
-    /**
-   *
-   * Get the latest revision of a document with document id: $id in CouchDB.
-   *
-   * @throws SetteeWrongInputException
-   *
-   * @param  $id
-   *    Unique ID (usually: UUID) of the document to be retrieved.
-   * @return
-   *    database document in PHP object format.
-   */
-  function get_rev($id) {
-    if (empty($id)) {
-      throw new SetteeWrongInputException("Error: Can't query a document without a uuid.");
-    }
-
-    $full_uri = $this->dbname . "/" . $this->safe_urlencode($id);
-    $headers = $this->rest_client->http_head($full_uri);
-	if (empty($headers['Etag'])) {
-	  throw new SetteeRestClientException("Error: could not retrieve revision. Server unexpectedly returned empty Etag");
-	}
-    $etag = str_replace('"', '', $headers['Etag']);
-    return $etag;
-  }
-  
-  /**
-  * Delete a document
-  *
-  * @param $document
-  *    a PHP object or JSON representation of the document that has _id and _rev fields.
-  *
-  * @return void 
-  */  
-  function delete($document) {
-    if (!is_object($document)) {
-      $document = json_decode($document);
-    }
-
-    $full_uri = $this->dbname . "/" . $this->safe_urlencode($document->_id) . "?rev=" . $document->_rev;
-    $this->rest_client->http_delete($full_uri);
-  }
-
-  
-  /*-----------------  View-related functions --------------*/
-
-  /**
-   * Create a new view or update an existing one.
-   *
-   * @param  $design_doc
-   * @param  $view_name
-   * @param  $map_src
-   *    Source code of the map function in Javascript
-   * @param  $reduce_src
-   *    Source code of the reduce function  in Javascript (optional)
-   * @return void
-   */
-  function save_view($design_doc, $view_name, $map_src, $reduce_src = null) {
-    $obj = new stdClass();
-    $obj->_id = "_design/" . urlencode($design_doc);
-    $view_name = urlencode($view_name);
-    $obj->views->$view_name->map = $map_src;
-    if (!empty($reduce_src)) {
-      $obj->views->$view_name->reduce = $reduce_src;
-    }
-
-    // allow safe updates (even if slightly slower due to extra: rev-detection check).
-    return $this->save($obj, true);
-  }
-
-  /**
-   * Create a new view or update an existing one.
-   *
-   * @param  $design_doc
-   * @param  $view_name
-   * @param  $key
-   *    key parameter to a view. Can be a single value or an array (for a range). If passed an array, function assumes
-   *    that first element is startkey, second: endkey.
-   * @param  $descending
-   *    return results in descending order. Please don't forget that if you are using a startkey/endkey, when you change
-   *  order you also need to swap startkey and endkey values!
-   * 
-   * @return void
-   */
-  function get_view($design_doc, $view_name, $key = null, $descending = false, $limit = false) {
-    $id = "_design/" . urlencode($design_doc);
-    $view_name = urlencode($view_name);
-    $id .= "/_view/$view_name";
-
-    $data = array();
-    if (!empty($key)) {
-      if (is_string($key)) {
-        $data = "key=" . '"' . $key . '"';
-      }
-      elseif (is_array($key)) {
-        list($startkey, $endkey) = $key;
-        $data = "startkey=" . '"' . $startkey . '"&' . "endkey=" . '"' . $endkey . '"';
-      }
-
-      if ($descending) {
-        $data .= "&descending=true";
-      }
-      if ($limit) {
-          $data .= "&limit=".$limit;
-      }
-    }
-
-
-
-    if (empty($id)) {
-      throw new SetteeWrongInputException("Error: Can't retrieve a document without a uuid.");
-    }
-
-    $full_uri = $this->dbname . "/" . $this->safe_urlencode($id);
-$full_uri = str_replace("%253Fgroup%253D","?group=",$full_uri);
-$full_uri = str_replace("%253Flimit%253D","?limit=",$full_uri);
-    $ret = $this->rest_client->http_get($full_uri, $data);
-    return $ret['decoded'];
-    
-  }
-
-  /**
-   * @param  $id
-   * @return
-   *    return a properly url-encoded id.
-   */
-  private function safe_urlencode($id) {
-    //-- System views like _design can have "/" in their URLs.
-    $id = rawurlencode($id);
-    if (substr($id, 0, 1) == '_') {
-      $id = str_replace('%2F', '/', $id);
-    }
-    return $id;
-  }
-  
-  /** Getter for a database name */
-  function get_name() {
-    return $this->dbname;
-  }
+    /**
+     * Base URL of the CouchDB REST API
+     */
+    private $conn_url;
+
+    /**
+     * HTTP REST Client instance
+     */
+    protected $rest_client;
+
+    /**
+     * Name of the database
+     */
+    private $dbname;
+
+    /**
+     * Default constructor
+     */
+    function __construct($conn_url, $dbname) {
+        $this->conn_url = $conn_url;
+        $this->dbname = $dbname;
+        $this->rest_client = SetteeRestClient::get_instance($this->conn_url);
+    }
+
+    /**
+     * Get UUID from CouchDB
+     *
+     * @return
+     *     CouchDB-generated UUID string
+     *
+     */
+    function gen_uuid() {
+        $ret = $this->rest_client->http_get('_uuids');
+        return $ret['decoded']->uuids[0]; // should never be empty at this point, so no checking
+    }
+
+    /**
+     * Create or update a document database
+     *
+     * @param $document
+     *     PHP object, a PHP associative array, or a JSON String representing the document to be saved. PHP Objects and arrays are JSON-encoded automatically.
+     *
+     * <p>If $document has a an "_id" property set, it will be used as document's unique id (even for "create" operation).
+     * If "_id" is missing, CouchDB will be used to generate a UUID.
+     *
+     * <p>If $document has a "_rev" property (revision), document will be updated, rather than creating a new document.
+     * You have to provide "_rev" if you want to update an existing document, otherwise operation will be assumed to be
+     * one of creation and you will get a duplicate document exception from CouchDB. Also, you may not provide "_rev" but
+     * not provide "_id" since that is an invalid input.
+     *
+     * @param $allowRevAutoDetection
+     *   Default: false. When true and _rev is missing from the document, save() function will auto-detect latest revision
+     * for a document and use it. This option is "false" by default because it involves an extra http HEAD request and
+     * therefore can make save() operation slightly slower if such auto-detection is not required.
+     *
+     * @return
+     *     document object with the database id (uuid) and revision attached;
+     *
+     *  @throws SetteeCreateDatabaseException
+     */
+    function save($document, $allowRevAutoDetection = false) {
+        if (is_string($document)) {
+            $document = json_decode($document);
+        }
+
+        // Allow passing of $document as an array (for syntactic simplicity and also because in JSON world it does not matter) 
+        if (is_array($document)) {
+            $document = (object) $document;
+        }
+
+        if (empty($document->_id) && empty($document->_rev)) {
+            $id = $this->gen_uuid();
+        } elseif (empty($document->_id) && !empty($document->_rev)) {
+            throw new SetteeWrongInputException("Error: You can not save a document with a revision provided, but missing id");
+        } else {
+            $id = $document->_id;
+
+            if ($allowRevAutoDetection) {
+                try {
+                    $rev = $this->get_rev($id);
+                } catch (SetteeRestClientException $e) {
+                    // auto-detection may fail legitimately, if a document has never been saved before (new doc), so skipping error
+                }
+                if (!empty($rev)) {
+                    $document->_rev = $rev;
+                }
+            }
+        }
+
+        $full_uri = $this->dbname . "/" . $this->safe_urlencode($id);
+        $document_json = json_encode($document, JSON_NUMERIC_CHECK);
+
+        $ret = $this->rest_client->http_put($full_uri, $document_json);
+
+        $document->_id = $ret['decoded']->id;
+        $document->_rev = $ret['decoded']->rev;
+
+        return $document;
+    }
+
+    /**
+     * @param  $doc
+     * @param  $name
+     * @param  $content
+     *    Content of the attachment in a string-buffer format. This function will automatically base64-encode content for
+     *    you, so you don't have to do it.
+     * @param  $mime_type
+     *    Optional. Will be auto-detected if not provided
+     * @return void
+     */
+    public function add_attachment($doc, $name, $content, $mime_type = null) {
+        if (empty($doc->_attachments) || !is_object($doc->_attachments)) {
+            $doc->_attachments = new stdClass();
+        }
+
+        if (empty($mime_type)) {
+            $mime_type = $this->rest_client->content_mime_type($content);
+        }
+
+        $doc->_attachments->$name = new stdClass();
+        $doc->_attachments->$name->content_type = $mime_type;
+        $doc->_attachments->$name->data = base64_encode($content);
+    }
+
+    /**
+     * @param  $doc
+     * @param  $name
+     * @param  $file
+     *    Full path to a file (e.g. as returned by PHP's realpath function).
+     * @param  $mime_type
+     *    Optional. Will be auto-detected if not provided
+     * @return void
+     */
+    public function add_attachment_file($doc, $name, $file, $mime_type = null) {
+        $content = file_get_contents($file);
+        $this->add_attachment($doc, $name, $content, $mime_type);
+    }
+
+    /**
+     *
+     * Retrieve a document from CouchDB
+     *
+     * @throws SetteeWrongInputException
+     * 
+     * @param  $id
+     *    Unique ID (usually: UUID) of the document to be retrieved.
+     * @return
+     *    database document in PHP object format.
+     */
+    function get($id) {
+        if (empty($id)) {
+            throw new SetteeWrongInputException("Error: Can't retrieve a document without a uuid.");
+        }
+
+        $full_uri = $this->dbname . "/" . $this->safe_urlencode($id);
+        $full_uri = str_replace("%3Frev%3D", "?rev=", $full_uri);
+        $ret = $this->rest_client->http_get($full_uri);
+        return $ret['decoded'];
+    }
+
+    /**
+     *
+     * Get the latest revision of a document with document id: $id in CouchDB.
+     *
+     * @throws SetteeWrongInputException
+     *
+     * @param  $id
+     *    Unique ID (usually: UUID) of the document to be retrieved.
+     * @return
+     *    database document in PHP object format.
+     */
+    function get_rev($id) {
+        if (empty($id)) {
+            throw new SetteeWrongInputException("Error: Can't query a document without a uuid.");
+        }
+
+        $full_uri = $this->dbname . "/" . $this->safe_urlencode($id);
+        $headers = $this->rest_client->http_head($full_uri);
+        if (empty($headers['Etag'])) {
+            throw new SetteeRestClientException("Error: could not retrieve revision. Server unexpectedly returned empty Etag");
+        }
+        $etag = str_replace('"', '', $headers['Etag']);
+        return $etag;
+    }
+
+    /**
+     * Delete a document
+     *
+     * @param $document
+     *    a PHP object or JSON representation of the document that has _id and _rev fields.
+     *
+     * @return void 
+     */
+    function delete($document) {
+        if (!is_object($document)) {
+            $document = json_decode($document);
+        }
+
+        $full_uri = $this->dbname . "/" . $this->safe_urlencode($document->_id) . "?rev=" . $document->_rev;
+        $this->rest_client->http_delete($full_uri);
+    }
+
+    /* -----------------  View-related functions -------------- */
+
+    /**
+     * Create a new view or update an existing one.
+     *
+     * @param  $design_doc
+     * @param  $view_name
+     * @param  $map_src
+     *    Source code of the map function in Javascript
+     * @param  $reduce_src
+     *    Source code of the reduce function  in Javascript (optional)
+     * @return void
+     */
+    function save_view($design_doc, $view_name, $map_src, $reduce_src = null) {
+        $obj = new stdClass();
+        $obj->_id = "_design/" . urlencode($design_doc);
+        $view_name = urlencode($view_name);
+        $obj->views->$view_name->map = $map_src;
+        if (!empty($reduce_src)) {
+            $obj->views->$view_name->reduce = $reduce_src;
+        }
+
+        // allow safe updates (even if slightly slower due to extra: rev-detection check).
+        return $this->save($obj, true);
+    }
+
+    /**
+     * Create a new view or update an existing one.
+     *
+     * @param  $design_doc
+     * @param  $view_name
+     * @param  $key
+     *    key parameter to a view. Can be a single value or an array (for a range). If passed an array, function assumes
+     *    that first element is startkey, second: endkey.
+     * @param  $descending
+     *    return results in descending order. Please don't forget that if you are using a startkey/endkey, when you change
+     *  order you also need to swap startkey and endkey values!
+     * 
+     * @return void
+     */
+    function get_view($design_doc, $view_name, $key = null, $descending = false, $limit = false, $reduce = null, $startdocid = null) {
+        $id = "_design/" . urlencode($design_doc);
+        $view_name = urlencode($view_name);
+        $id .= "/_view/$view_name";
+
+        $data = array();
+        if (!empty($key)) {
+            if (is_string($key)) {
+                $data = "key=" . '"' . $key . '"';
+            } elseif (is_array($key)) {
+                list($startkey, $endkey) = $key;
+                $data = "startkey=" . '"' . $startkey . '"&' . "endkey=" . '"' . $endkey . '"';
+            }
+
+            if ($descending) {
+                $data .= "&descending=true";
+            }
+            if ($startdocid != null) {
+                $data .= "&startkey_docid='$startdocid'";
+            }
+                if ($reduce === true) {
+                    $data .= "&reduce=true";
+                } else if ($reduce === false){
+
+                    $data .= "&reduce=false";
+            }
+            if ($limit) {
+                $data .= "&limit=" . $limit;
+            }
+        }
+
+
+
+        if (empty($id)) {
+            throw new SetteeWrongInputException("Error: Can't retrieve a document without a uuid.");
+        }
+
+        $full_uri = $this->dbname . "/" . $this->safe_urlencode($id);
+
+        $full_uri = str_replace("%253Fgroup%253D", "?group=", $full_uri);
+        $full_uri = str_replace("%253Flimit%253D", "?limit=", $full_uri);
+        $ret = $this->rest_client->http_get($full_uri, $data);
+        //$ret['decoded'] = str_replace("?k","&k",$ret['decoded']);
+        return $ret['decoded'];
+    }
+
+    /**
+     * @param  $id
+     * @return
+     *    return a properly url-encoded id.
+     */
+    private function safe_urlencode($id) {
+        //-- System views like _design can have "/" in their URLs.
+        $id = rawurlencode($id);
+        if (substr($id, 0, 1) == '_') {
+            $id = str_replace('%2F', '/', $id);
+        }
+        return $id;
+    }
+
+    /** Getter for a database name */
+    function get_name() {
+        return $this->dbname;
+    }
 
 }
+

--- a/couchdb/settee/src/classes/SetteeRestClient.class.php
+++ b/couchdb/settee/src/classes/SetteeRestClient.class.php
@@ -244,3 +244,4 @@
 }
 
 class SetteeRestClientException extends Exception {}
+

--- a/documents/about.php
+++ b/documents/about.php
@@ -1,7 +1,7 @@
 <?php
 
 include('template.inc.php');
-include_header_documents("");
+include_header_documents("About");
 include_once('../include/common.inc.php');
 ?>
 <h1>About</h1>

--- /dev/null
+++ b/documents/agency.php
@@ -1,1 +1,41 @@
+<?php
+include('template.inc.php');
+include_once('../include/common.inc.php');
+$agenciesdb = $server->get_db('disclosr-agencies');
 
+$idtoname = Array();
+foreach ($agenciesdb->get_view("app", "byCanonicalName")->rows as $row) {
+    $idtoname[$row->id] = trim($row->value->name);
+}
+$foidocsdb = $server->get_db('disclosr-foidocuments');
+
+include_header_documents((isset($_REQUEST['id']) ? $idtoname[$_REQUEST['id']] : 'Entries by Agency'));
+$endkey = (isset($_REQUEST['end_key']) ? $_REQUEST['end_key'] : '9999-99-99');
+?>
+<div class="headline">Read all the information released by Australian Federal Government agencies under the FOI Act in one place!</div>
+<a style='float:right' href="rss.xml.php"><img src="img/feed-icon-14x14.png" alt="RSS Icon"/> All Agencies RSS Feed</a><br>
+<?php
+try {
+    if ($_REQUEST['id']) {
+        $rows = $foidocsdb->get_view("app", "byAgencyID", $_REQUEST['id'], false, false, false)->rows;
+        foreach ($rows as $row) {
+            //print_r($rows);
+            echo displayLogEntry($row, $idtoname);
+            if (!isset($startkey))
+                $startkey = $row->key;
+            $endkey = $row->key;
+        }
+    } else {
+        $rows = $foidocsdb->get_view("app", "byAgencyID?group=true", null, false, false, true)->rows;
+        if ($rows) {
+            foreach ($rows as $row) {
+                echo '<a href="agency.php?id=' . $row->key . '">' . $idtoname[$row->key] . " (" . $row->value . " records)</a> <br>\n";
+            }
+        }
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
+echo "<a class='btn btn-large btn-primary' href='?end_key=$endkey' style='float:right;'>next page <i class='icon-circle-arrow-right icon-white'></i></a>";
+include_footer_documents();
+?>

--- a/documents/charts.php
+++ b/documents/charts.php
@@ -1,6 +1,6 @@
 <?php
 include('template.inc.php');
-include_header_documents("");
+include_header_documents("Charts");
 include_once('../include/common.inc.php');
 $agenciesdb = $server->get_db('disclosr-agencies');
 
@@ -15,29 +15,28 @@
     <h1><a href="about.php">Charts</a></h1>
     <h4 class="subheader">Lorem ipsum.</h4>
 </div>
-<div id="employees" style="width:1000px;height:900px;"></div>
+<div id="bydate" style="width:1000px;height:300px;"></div>
+<div id="byagency" style="width:1200px;height:300px;"></div>
 <script id="source">
     window.onload = function() {
         $(document).ready(function() {
   var
     d1    = [],
-    start = new Date("2009/01/01 01:00").getTime(),
-    options,
-    graph,
-    i, x, o;
+    options1,
+     o1;
 
 <?php
     try {
-        $rows = $foidocsdb->get_view("app", "byDate?group=true", null, true)->rows;
+        $rows = $foidocsdb->get_view("app", "byDateMonthYear?group=true",null, false,false,true)->rows;
 
 
         $dataValues = Array();
         foreach ($rows as $row) {
-            $dataValues[$row->value] = $row->key;
+            $dataValues[$row->key] = $row->value;
         }
         $i = 0;
         ksort($dataValues);
-        foreach ($dataValues as $value => $key) {
+        foreach ($dataValues as $key => $value) {
 $date = date_create_from_format('Y-m-d', $key);
 if (date_format($date, 'U') != "") {
             echo "       d1.push([".date_format($date, 'U')."000, $value]);" . PHP_EOL;
@@ -52,7 +51,7 @@
 
 
         
-  options = {
+  options1 = {
     xaxis : {
       mode : 'time', 
       labelsAngle : 45
@@ -68,19 +67,19 @@
   function drawGraph (opts) {
 
     // Clone the options, so the 'options' variable always keeps intact.
-    o = Flotr._.extend(Flotr._.clone(options), opts || {});
+    o1 = Flotr._.extend(Flotr._.clone(options1), opts || {});
 
     // Return a new graph.
     return Flotr.draw(
-      document.getElementById("employees"),
+      document.getElementById("bydate"),
       [ d1 ],
-      o
+      o1
     );
   }
 
   graph = drawGraph();      
         
-  Flotr.EventAdapter.observe(container, 'flotr:select', function(area){
+  Flotr.EventAdapter.observe(document.getElementById("bydate"), 'flotr:select', function(area){
     // Draw selected area
     graph = drawGraph({
       xaxis : { min : area.x1, max : area.x2, mode : 'time', labelsAngle : 45 },
@@ -89,10 +88,74 @@
   });
         
   // When graph is clicked, draw the graph with default area.
-  Flotr.EventAdapter.observe(container, 'flotr:click', function () { graph = drawGraph(); });
+  Flotr.EventAdapter.observe(document.getElementById("bydate"), 'flotr:click', function () { graph = drawGraph(); });
 
         });
 }; 
+
+var d2 = [];
+var agencylabels = [];
+function agencytrackformatter(obj) {
+                   
+                        return agencylabels[Math.floor(obj.x)] +" = "+obj.y;
+                     
+                }
+                function agencytickformatter(val, axis) {
+                    if (agencylabels[Math.floor(val)]) {
+                        return '<p style="margin-top:8em;-webkit-transform:rotate(-90deg);">'+(agencylabels[Math.floor(val)])+"</b>";
+                     
+                    } else {
+                        return "";
+                    }
+                }
+<?php
+    try {
+        $rows = $foidocsdb->get_view("app", "byAgencyID?group=true",null, false,false,true)->rows;
+
+
+        $dataValues = Array();
+        $i = 0;
+        foreach ($rows as $row) {
+            echo "       d2.push([".$i.", $row->value]);" . PHP_EOL;
+            echo "       agencylabels.push(['".str_replace("'","",$idtoname[$row->key])."']);" . PHP_EOL;
+            
+            $i++;
+        }
+    } catch (SetteeRestClientException $e) {
+        setteErrorHandler($e);
+    }
+    ?>
+  // Draw the graph
+  Flotr.draw(
+   document.getElementById("byagency"),
+    [d2],
+    {
+      bars : {
+        show : true,
+        horizontal : false,
+        shadowSize : 0,
+        barWidth : 0.5
+      },
+mouse : {
+                        track : true,
+                        relative : true,
+                    trackFormatter: agencytrackformatter
+                    },
+      yaxis : {
+        min : 0,
+        autoscaleMargin : 1
+      },
+      xaxis: {
+                    minorTickFreq: 1,
+                    noTicks: agencylabels.length,
+                    showMinorLabels: true,
+                        tickFormatter: agencytickformatter
+                    },
+                    legend: {
+                        show: false
+                    }
+    }
+  );
 </script>
 
 <?php

--- /dev/null
+++ b/documents/date.php
@@ -1,1 +1,34 @@
+<?php
 
+include('template.inc.php');
+include_header_documents("Entries by Date");
+include_once('../include/common.inc.php');
+$endkey = (isset($_REQUEST['end_key']) ? $_REQUEST['end_key'] : '9999-99-99');
+?>
+<div class="headline">Read all the information released by Australian Federal Government agencies under the FOI Act in one place!</div>
+<a style='float:right' href="rss.xml.php"><img src="img/feed-icon-14x14.png" alt="RSS Icon"/> All Agencies RSS Feed</a><br>
+<?php