From: Maxious <maxious@lambdacomplex.org>
Date: Wed, 05 Dec 2012 02:58:19 +0000
Subject: by date/agency beginnings
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=8d90035d952bcbc73be2076f8fdfc4feb87de74a
---
by date/agency beginnings


Former-commit-id: 52ef8009c9c04d5a57236f891da3b720090014ae
---


--- a/couchdb/settee/src/classes/SetteeDatabase.class.php
+++ b/couchdb/settee/src/classes/SetteeDatabase.class.php
@@ -251,7 +251,7 @@
    * 
    * @return void
    */
-  function get_view($design_doc, $view_name, $key = null, $descending = false, $limit = false) {
+  function get_view($design_doc, $view_name, $key = null, $descending = false, $limit = false, $reduce=false) {
     $id = "_design/" . urlencode($design_doc);
     $view_name = urlencode($view_name);
     $id .= "/_view/$view_name";
@@ -269,6 +269,11 @@
       if ($descending) {
         $data .= "&descending=true";
       }
+      if ($reduce) {
+        $data .= "&reduce=true";
+      } else {
+          $data .= "&reduce=false";
+      }
       if ($limit) {
           $data .= "&limit=".$limit;
       }
@@ -281,9 +286,11 @@
     }
 
     $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'];
     
   }

--- /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
@@ -27,7 +27,7 @@
 
 <?php
     try {
-        $rows = $foidocsdb->get_view("app", "byDateMonthYear?group=true")->rows;
+        $rows = $foidocsdb->get_view("app", "byDateMonthYear?group=true",null, false,false,true)->rows;
 
 
         $dataValues = Array();
@@ -110,7 +110,7 @@
                 }
 <?php
     try {
-        $rows = $foidocsdb->get_view("app", "byAgencyID?group=true")->rows;
+        $rows = $foidocsdb->get_view("app", "byAgencyID?group=true",null, false,false,true)->rows;
 
 
         $dataValues = Array();

--- /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
+/*$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');
+try {
+    $rows = $foidocsdb->get_view("app", "byDate", Array($endkey, '0000-00-00'), true, 20)->rows;
+    if ($rows) {
+        foreach ($rows as $key => $row) {
+            echo displayLogEntry($row, $idtoname);
+		if (!isset($startkey)) $startkey =  $row->key;
+            $endkey = $row->key;
+        }
+    }
+} 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/rss.xml.php
+++ b/documents/rss.xml.php
@@ -8,21 +8,28 @@
 //Creating an instance of FeedWriter class.
 $TestFeed = new RSS2FeedWriter();
 //Setting the channel elements
-//Use wrapper functions for common channelelements
-$TestFeed->setTitle('disclosurelo.gs Newest Entries - All');
-$TestFeed->setLink('http://disclosurelo.gs/rss.xml.php');
-$TestFeed->setDescription('disclosurelo.gs Newest Entries - All Agencies');
-$TestFeed->setChannelElement('language', 'en-us');
-$TestFeed->setChannelElement('pubDate', date(DATE_RSS, time()));
-
-//Retriving informations from database
+////Retriving informations from database
 $idtoname = Array();
 $agenciesdb = $server->get_db('disclosr-agencies');
 foreach ($agenciesdb->get_view("app", "byCanonicalName")->rows as $row) {
     $idtoname[$row->id] = trim($row->value->name);
 }
 $foidocsdb = $server->get_db('disclosr-foidocuments');
-$rows = $foidocsdb->get_view("app", "byDate", Array('9999-99-99', '0000-00-00', 50), true)->rows;
+if (isset($_REQUEST['id'])) {
+    $rows = $foidocsdb->get_view("app", "byAgencyID", $_REQUEST['id'], false, false, false)->rows;
+    $title = $idtoname[$_REQUEST['id']];
+} else {
+    $rows = $foidocsdb->get_view("app", "byDate", Array('9999-99-99', '0000-00-00', 50), true)->rows;
+    $title = 'All Agencies';
+}
+//Use wrapper functions for common channelelements
+$TestFeed->setTitle('disclosurelo.gs Newest Entries - '.$title);
+$TestFeed->setLink('http://disclosurelo.gs/rss.xml.php'.(isset($_REQUEST['id'])? '?id='.$_REQUEST['id'] : ''));
+$TestFeed->setDescription('disclosurelo.gs Newest Entries - '.$title);
+$TestFeed->setChannelElement('language', 'en-us');
+$TestFeed->setChannelElement('pubDate', date(DATE_RSS, time()));
+
+
 //print_r($rows);
 foreach ($rows as $row) {
     //Create an empty FeedItem

--- a/documents/sitemap.xml.php
+++ b/documents/sitemap.xml.php
@@ -10,10 +10,18 @@
     if (strpos($file, ".php") !== false && $file != "index.php" && $file != "sitemap.xml.php")
         echo " <url><loc>" . local_url() . "$file</loc><priority>0.6</priority></url>\n";
 }
-
-$db = $server->get_db('disclosr-foidocuments');
+$agenciesdb = $server->get_db('disclosr-agencies');
 try {
-    $rows = $db->get_view("app", "all")->rows;
+    $rows = $agenciesdb->get_view("app", "byCanonicalName")->rows;
+    foreach ($rows as $row) {
+        echo '<url><loc>' . local_url() . 'agency.php?id=' . $row->value->_id . "</loc><priority>0.3</priority></url>\n";
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
+$foidocsdb = $server->get_db('disclosr-foidocuments');
+try {
+    $rows = $foidocsdb->get_view("app", "all")->rows;
     foreach ($rows as $row) {
         echo '<url><loc>' . local_url() . 'view.php?id=' . $row->value->_id . "</loc><priority>0.3</priority></url>\n";
     }

--- a/documents/view.php
+++ b/documents/view.php
@@ -1,6 +1,6 @@
 <?php
 include('template.inc.php');
-
+include_once('../include/common.inc.php');
 ?>
 <?php
 
@@ -17,7 +17,7 @@
   $obj = new stdClass();
     $obj->value = $foidocsdb->get($_REQUEST['id']);
     include_header_documents($obj->value->title);
-include_once('../include/common.inc.php');
+
 echo displayLogEntry($obj,$idtoname);
 
 } catch (SetteeRestClientException $e) {