From: Maxious <maxious@lambdacomplex.org>
Date: Sat, 01 Dec 2012 11:46:51 +0000
Subject: Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=db1399024de12d494f190c2b99575c031a7d2e0d
---
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr


Former-commit-id: 83a487e0d7a1ad00d91cde1cda3471ae0f100c36
---


--- a/admin/refreshDesignDoc.php
+++ b/admin/refreshDesignDoc.php
@@ -9,6 +9,7 @@
 $obj->language = "javascript";
 $obj->views->all->map = "function(doc) {   emit(doc._id, doc); };";
 $obj->views->byDate->map = "function(doc) {   emit(doc.date, doc); };";
+$obj->views->byDate->reduce = "_count";
 $obj->views->byDateMonthYear->map = "function(doc) {   emit(doc.date, doc); };";
 $obj->views->byDateMonthYear->reduce = "_count";
 $obj->views->byAgencyID->map = "function(doc) {   emit(doc.agencyID, doc); };";

--- a/documents/rss.xml.php
+++ b/documents/rss.xml.php
@@ -28,7 +28,7 @@
     $newItem = $TestFeed->createNewItem();
     //Add elements to the feed item
     $newItem->setTitle($row->value->title);
-    $newItem->setLink("view.php?id=".$row->value->docID);
+    $newItem->setLink("view.php?id=".$row->value->_id);
     $newItem->setDate(date("c", strtotime($row->value->date)));
     $newItem->setDescription(displayLogEntry($row,$idtoname));
     $newItem->addElement('guid', $row->value->_id,array('isPermaLink'=>'true'));