From: Maxious Date: Sat, 07 Jan 2012 12:28:17 +0000 Subject: Beginings of scoring X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=4e41014d4d7063f8d2a14a8d14201f053a6de864 --- Beginings of scoring Former-commit-id: 25071f148abb2abe0e2436ec3b83a60f7394b665 --- --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ -[submodule "sag"] - path = sag - url = https://github.com/sbisbee/sag.git [submodule "couchdb/couchdb-lucene"] path = couchdb/couchdb-lucene url = https://github.com/rnewson/couchdb-lucene.git +[submodule "couchdb/settee"] + path = couchdb/settee + url = https://github.com/inadarei/settee.git --- a/about.php +++ b/about.php @@ -1,9 +1,27 @@ -Organisational Data Sources + +
+

About/FAQ

+

Lorem ipsum.

+
+

What is this?

+Disclosr is a project to monitor Australian Federal Government agencies +compliance with their "proactive disclosure requirements". +OGRE (Open Government Realization Evaluation) is a ranking of compliance with these requirements. +Prometheus is the agent which polls agency websites to assess compliance. + +

Open everything

+all documents released CC-BY 3 AU +Open source git @ + +

Organisational Data Sources

http://www.comlaw.gov.au/Browse/Results/ByTitle/AdministrativeArrangementsOrders/Current/Ad/0 defines departments Agencies can be found in the Schedule to an Appropriation Bill (budget), Schedule to FMA Regulations and/or Public Service Act. -http://www.finance.gov.au/publications/flipchart/docs/FMACACFlipchart.pdf summarises these +http://www.finance.gov.au/publications/flipchart/docs/FMACACFlipchart.pdf summarises these. view-source:https://www.tenders.gov.au/?event=public.advancedsearch.home is great for the suspended/active status When defining the hierachy, this system is designed towards monitoring accountablity. Thus large agencies that have registered their own ABN and have their own accountablity mechanisms/website recieve a seperate record as a child of their department. @@ -13,10 +31,20 @@ As agencies themselves shift between departments, there may be scope for providing time ranges but typically the newest hierarchy will be the one recorded. A department/agency name will be the newest active name assigned to that ABN. +ABN information is derived from the ABR. This is the definitive umpire about which former name should be linked to which current name. +For example "Department of Transport and Regional Services" became "Department of Infrastructure, Transport, Regional Development and Local Government" (same ABN) +however it later split into "Department of Infrastructure and Transport" (same ABN) +and "Department of Regional Australia, Regional Development and Local Government" (new ABN). + Statistical information from http://www.apsc.gov.au/stateoftheservice/1011/statsbulletin/section1.html#t2total https://www.apsedii.gov.au/apsedii/CustomQueryx33.shtml +and individual annual reports. -Open Government Scoring +

Open Government Scoring

+1 point for every true Has... attribute -1 point for every false Has... (ie. Has Not) attribute +Don't like this? Make your own score, suggest a better scoring mechanism. + --- a/common.inc.php +++ /dev/null @@ -1,133 +1,1 @@ -head('_design/app')->headers->_HTTP->status != "404") - 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() { - ?> - - - - - - - - - - - - - - Welcome to Foundation - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - --- /dev/null +++ b/couchdb/settee --- a/getAgency.php +++ b/getAgency.php @@ -1,24 +1,135 @@ setDatabase("disclosr-agencies", true); -//get an agency record as json/html, search by name/abn/id +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 ""; + if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") { + echo "view"; + } + if ($key == 'abn') { + echo "view abn"; + } + } + } + } + // +} + +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? -$rows = $sag->get('/_design/app/_view/byABN?include_docs=true')->body->rows; // &endkey='.$searchVar -foreach ($rows as $row) { - echo ""; - echo '"; - echo ""; -foreach ($row->doc as $key => $value) { - if (is_a($value, 'stdClass')) { - echo ""; - } else echo ""; - } // also show documents/URLs available - echo "

' . $row->doc->agencyName . "

Field NameField Value
$key".var_dump($value,true)."
$key$value
"; -} + $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"; + $newdoc = $_POST; + $newdoc['metadata']['lastModified'] = time(); + $row = $db->save($newdoc); + } else { + echo "ALERT doc revised by someone else while editing."; + } + } -include_footer(); + $mode = "edit"; + $row = addDefaultFields(object_to_array($row)); + if ($mode == "view") { + echo ''; + echo '"; + echo ""; + } + if ($mode == "edit") { + ?> + + + + $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(); + ?> --- a/import.php +++ b/import.php @@ -1,22 +1,34 @@ setDatabase("disclosr-agencies", true); -//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;'; - $abntonames = Array(); - foreach ($conn->query($namesQ) as $row) { - $abntonames[$row['abn']] = explode(",",$row['names']); - } - $result = $conn->query("select * from agency"); - while ($agency = $result->fetch(PDO::FETCH_ASSOC)) { - - $agency['otherNames'] = $abntonames[$agency['abn']]; - if (sizeof($abntonames[$agency['abn']]) == 1) $agency['name'] = $abntonames[$agency['abn']][0]; - $agency["lastScraped"] = "1/1/1970"; - $agency["scrapeDepth"] = 1; - $sag->post($agency); - } +require_once 'include/common.inc.php'; +try { + $server->create_db('disclosr-agencies'); +} catch (SetteeRestClientException $e) { + setteErrorHandler($e); +} +$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;'; +$abntonames = Array(); +foreach ($conn->query($namesQ) as $row) { + $abntonames[$row['abn']] = explode("|", $row['names']); +} +$result = $conn->query("select * from agency"); +while ($agency = $result->fetch(PDO::FETCH_ASSOC)) { + $agency['_id'] = md5($agency['abn']); + $agency['otherNames'] = $abntonames[$agency['abn']]; + if (sizeof($abntonames[$agency['abn']]) == 1) + $agency['name'] = $abntonames[$agency['abn']][0]; + $agency["lastScraped"] = "1/1/1970"; + $agency["scrapeDepth"] = 1; + try { + $doc = $db->save($agency); + //print_r($doc); + echo $agency['abn'] . " imported \n
    "; + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } +} ?> --- /dev/null +++ b/include/common.inc.php @@ -1,1 +1,39 @@ + 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; +} +?> + + + --- /dev/null +++ b/include/couchdb.inc.php @@ -1,1 +1,53 @@ +_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); + for (name in doc.otherNames) { +if (doc.otherNames[name] != '' && doc.otherNames[name] != doc.name) { + emit(doc.otherNames[name], doc); +} + } +};"; + $obj->views->byLastModified->map = "function(doc) { emit(doc.metadata.lastModified, 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}); };"; + // http://stackoverflow.com/questions/646628/javascript-startswith + $obj->views->score->map = 'if(!String.prototype.startsWith){ + String.prototype.startsWith = function (str) { + return !this.indexOf(str); + } +} + +function(doc) { +count = 0; +for(var propName in doc) { + if(typeof(doc[propName]) != "undefined" && propName.startsWith("l")) { + count++ + } +} + emit(doc._id,{name: doc.name, score:count}); +}'; + + // allow safe updates (even if slightly slower due to extra: rev-detection check). + return $db->save($obj, true); +} + +require ('couchdb/settee/src/settee.php'); + +$server = new SetteeServer('http://127.0.0.1:5984'); + +function setteErrorHandler($e) { + echo $e->getMessage() . "
    " . PHP_EOL; +} + +?> + --- /dev/null +++ b/include/template.inc.php @@ -1,1 +1,75 @@ + + + + + + + + + + + + + + + Disclosr + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + + + + + + + + + + + + --- /dev/null +++ b/lib/FeedItem.php @@ -1,1 +1,168 @@ + + * @link http://www.ajaxray.com/projects/rss + */ + class FeedItem + { + private $elements = array(); //Collection of feed elements + private $version; + + /** + * Constructor + * + * @param contant (RSS1/RSS2/ATOM) RSS2 is default. + */ + function __construct($version = RSS2) + { + $this->version = $version; + } + + /** + * Add an element to elements array + * + * @access public + * @param srting The tag name of an element + * @param srting The content of tag + * @param array Attributes(if any) in 'attrName' => 'attrValue' format + * @return void + */ + public function addElement($elementName, $content, $attributes = null) + { + $this->elements[$elementName]['name'] = $elementName; + $this->elements[$elementName]['content'] = $content; + $this->elements[$elementName]['attributes'] = $attributes; + } + + /** + * Set multiple feed elements from an array. + * Elements which have attributes cannot be added by this method + * + * @access public + * @param array array of elements in 'tagName' => 'tagContent' format. + * @return void + */ + public function addElementArray($elementArray) + { + if(! is_array($elementArray)) return; + foreach ($elementArray as $elementName => $content) + { + $this->addElement($elementName, $content); + } + } + + /** + * Return the collection of elements in this feed item + * + * @access public + * @return array + */ + public function getElements() + { + return $this->elements; + } + + // Wrapper functions ------------------------------------------------------ + + /** + * Set the 'dscription' element of feed item + * + * @access public + * @param string The content of 'description' element + * @return void + */ + public function setDescription($description) + { + $tag = ($this->version == ATOM)? 'summary' : 'description'; + $this->addElement($tag, $description); + } + + /** + * @desc Set the 'title' element of feed item + * @access public + * @param string The content of 'title' element + * @return void + */ + public function setTitle($title) + { + $this->addElement('title', $title); + } + + /** + * Set the 'date' element of feed item + * + * @access public + * @param string The content of 'date' element + * @return void + */ + public function setDate($date) + { + if(! is_numeric($date)) + { + $date = strtotime($date); + } + + if($this->version == ATOM) + { + $tag = 'updated'; + $value = date(DATE_ATOM, $date); + } + elseif($this->version == RSS2) + { + $tag = 'pubDate'; + $value = date(DATE_RSS, $date); + } + else + { + $tag = 'dc:date'; + $value = date("Y-m-d", $date); + } + + $this->addElement($tag, $value); + } + + /** + * Set the 'link' element of feed item + * + * @access public + * @param string The content of 'link' element + * @return void + */ + public function setLink($link) + { + if($this->version == RSS2 || $this->version == RSS1) + { + $this->addElement('link', $link); + } + else + { + $this->addElement('link','',array('href'=>$link)); + $this->addElement('id', FeedWriter::uuid($link,'urn:uuid:')); + } + + } + + /** + * Set the 'encloser' element of feed item + * For RSS 2.0 only + * + * @access public + * @param string The url attribute of encloser tag + * @param string The length attribute of encloser tag + * @param string The type attribute of encloser tag + * @return void + */ + public function setEncloser($url, $length, $type) + { + $attributes = array('url'=>$url, 'length'=>$length, 'type'=>$type); + $this->addElement('enclosure','',$attributes); + } + + } // end of class FeedItem +?> --- /dev/null +++ b/lib/FeedWriter.php @@ -1,1 +1,435 @@ - + + * @link http://www.ajaxray.com/projects/rss + */ + class FeedWriter + { + private $channels = array(); // Collection of channel elements + private $items = array(); // Collection of items as object of FeedItem class. + private $data = array(); // Store some other version wise data + private $CDATAEncoding = array(); // The tag names which have to encoded as CDATA + + private $version = null; + + /** + * Constructor + * + * @param constant the version constant (RSS1/RSS2/ATOM). + */ + function __construct($version = RSS2) + { + $this->version = $version; + + // Setting default value for assential channel elements + $this->channels['title'] = $version . ' Feed'; + $this->channels['link'] = 'http://www.ajaxray.com/blog'; + + //Tag names to encode in CDATA + $this->CDATAEncoding = array('description', 'content:encoded', 'summary'); + } + + // Start # public functions --------------------------------------------- + + /** + * Set a channel element + * @access public + * @param srting name of the channel tag + * @param string content of the channel tag + * @return void + */ + public function setChannelElement($elementName, $content) + { + $this->channels[$elementName] = $content ; + } + + /** + * Set multiple channel elements from an array. Array elements + * should be 'channelName' => 'channelContent' format. + * + * @access public + * @param array array of channels + * @return void + */ + public function setChannelElementsFromArray($elementArray) + { + if(! is_array($elementArray)) return; + foreach ($elementArray as $elementName => $content) + { + $this->setChannelElement($elementName, $content); + } + } + + /** + * Genarate the actual RSS/ATOM file + * + * @access public + * @return void + */ + public function genarateFeed() + { + header("Content-type: text/xml"); + + $this->printHead(); + $this->printChannels(); + $this->printItems(); + $this->printTale(); + } + + /** + * Create a new FeedItem. + * + * @access public + * @return object instance of FeedItem class + */ + public function createNewItem() + { + $Item = new FeedItem($this->version); + return $Item; + } + + /** + * Add a FeedItem to the main class + * + * @access public + * @param object instance of FeedItem class + * @return void + */ + public function addItem($feedItem) + { + $this->items[] = $feedItem; + } + + + // Wrapper functions ------------------------------------------------------------------- + + /** + * Set the 'title' channel element + * + * @access public + * @param srting value of 'title' channel tag + * @return void + */ + public function setTitle($title) + { + $this->setChannelElement('title', $title); + } + + /** + * Set the 'description' channel element + * + * @access public + * @param srting value of 'description' channel tag + * @return void + */ + public function setDescription($desciption) + { + $this->setChannelElement('description', $desciption); + } + + /** + * Set the 'link' channel element + * + * @access public + * @param srting value of 'link' channel tag + * @return void + */ + public function setLink($link) + { + $this->setChannelElement('link', $link); + } + + /** + * Set the 'image' channel element + * + * @access public + * @param srting title of image + * @param srting link url of the imahe + * @param srting path url of the image + * @return void + */ + public function setImage($title, $link, $url) + { + $this->setChannelElement('image', array('title'=>$title, 'link'=>$link, 'url'=>$url)); + } + + /** + * Set the 'about' channel element. Only for RSS 1.0 + * + * @access public + * @param srting value of 'about' channel tag + * @return void + */ + public function setChannelAbout($url) + { + $this->data['ChannelAbout'] = $url; + } + + /** + * Genarates an UUID + * @author Anis uddin Ahmad + * @param string an optional prefix + * @return string the formated uuid + */ + public function uuid($key = null, $prefix = '') + { + $key = ($key == null)? uniqid(rand()) : $key; + $chars = md5($key); + $uuid = substr($chars,0,8) . '-'; + $uuid .= substr($chars,8,4) . '-'; + $uuid .= substr($chars,12,4) . '-'; + $uuid .= substr($chars,16,4) . '-'; + $uuid .= substr($chars,20,12); + + return $prefix . $uuid; + } + // End # public functions ---------------------------------------------- + + // Start # private functions ---------------------------------------------- + + /** + * Prints the xml and rss namespace + * + * @access private + * @return void + */ + private function printHead() + { + $out = '' . "\n"; + + if($this->version == RSS2) + { + $out .= '' . PHP_EOL; + } + elseif($this->version == RSS1) + { + $out .= '' . PHP_EOL;; + } + else if($this->version == ATOM) + { + $out .= '' . PHP_EOL;; + } + echo $out; + } + + /** + * Closes the open tags at the end of file + * + * @access private + * @return void + */ + private function printTale() + { + if($this->version == RSS2) + { + echo '' . PHP_EOL . ''; + } + elseif($this->version == RSS1) + { + echo ''; + } + else if($this->version == ATOM) + { + echo ''; + } + + } + + /** + * Creates a single node as xml format + * + * @access private + * @param srting name of the tag + * @param mixed tag value as string or array of nested tags in 'tagName' => 'tagValue' format + * @param array Attributes(if any) in 'attrName' => 'attrValue' format + * @return string formatted xml tag + */ + private function makeNode($tagName, $tagContent, $attributes = null) + { + $nodeText = ''; + $attrText = ''; + + if(is_array($attributes)) + { + foreach ($attributes as $key => $value) + { + $attrText .= " $key=\"$value\" "; + } + } + + if(is_array($tagContent) && $this->version == RSS1) + { + $attrText = ' rdf:parseType="Resource"'; + } + + + $attrText .= (in_array($tagName, $this->CDATAEncoding) && $this->version == ATOM)? ' type="html" ' : ''; + $nodeText .= (in_array($tagName, $this->CDATAEncoding))? "<{$tagName}{$attrText}>"; + + if(is_array($tagContent)) + { + foreach ($tagContent as $key => $value) + { + $nodeText .= $this->makeNode($key, $value); + } + } + else + { + $nodeText .= (in_array($tagName, $this->CDATAEncoding))? $tagContent : htmlentities($tagContent); + } + + $nodeText .= (in_array($tagName, $this->CDATAEncoding))? "]]>" : ""; + + return $nodeText . PHP_EOL; + } + + /** + * @desc Print channels + * @access private + * @return void + */ + private function printChannels() + { + //Start channel tag + switch ($this->version) + { + case RSS2: + echo '' . PHP_EOL; + break; + case RSS1: + echo (isset($this->data['ChannelAbout']))? "data['ChannelAbout']}\">" : "channels['link']}\">"; + break; + } + + //Print Items of channel + foreach ($this->channels as $key => $value) + { + if($this->version == ATOM && $key == 'link') + { + // ATOM prints link element as href attribute + echo $this->makeNode($key,'',array('href'=>$value)); + //Add the id for ATOM + echo $this->makeNode('id',$this->uuid($value,'urn:uuid:')); + } + else + { + echo $this->makeNode($key, $value); + } + + } + + //RSS 1.0 have special tag with channel + if($this->version == RSS1) + { + echo "" . PHP_EOL . "" . PHP_EOL; + foreach ($this->items as $item) + { + $thisItems = $item->getElements(); + echo "" . PHP_EOL; + } + echo "" . PHP_EOL . "" . PHP_EOL . "" . PHP_EOL; + } + } + + /** + * Prints formatted feed items + * + * @access private + * @return void + */ + private function printItems() + { + foreach ($this->items as $item) + { + $thisItems = $item->getElements(); + + //the argument is printed as rdf:about attribute of item in rss 1.0 + echo $this->startItem($thisItems['link']['content']); + + foreach ($thisItems as $feedItem ) + { + echo $this->makeNode($feedItem['name'], $feedItem['content'], $feedItem['attributes']); + } + echo $this->endItem(); + } + } + + /** + * Make the starting tag of channels + * + * @access private + * @param srting The vale of about tag which is used for only RSS 1.0 + * @return void + */ + private function startItem($about = false) + { + if($this->version == RSS2) + { + echo '' . PHP_EOL; + } + elseif($this->version == RSS1) + { + if($about) + { + echo "" . PHP_EOL; + } + else + { + die('link element is not set .\n It\'s required for RSS 1.0 to be used as about attribute of item'); + } + } + else if($this->version == ATOM) + { + echo "" . PHP_EOL; + } + } + + /** + * Closes feed item tag + * + * @access private + * @return void + */ + private function endItem() + { + if($this->version == RSS2 || $this->version == RSS1) + { + echo '' . PHP_EOL; + } + else if($this->version == ATOM) + { + echo "" . PHP_EOL; + } + } + + + + // End # private functions ---------------------------------------------- + + } // end of class FeedWriter + +// autoload classes +function __autoload($class_name) +{ + require_once $class_name . '.php'; +} --- /dev/null +++ b/rss.xml.php @@ -1,1 +1,30 @@ +setTitle('Last Modified - All'); +$TestFeed->setLink('http://disclosr.lambdacomplex.org/rss.xml.php'); +$TestFeed->setDescription('This is test of creating a RSS 2.0 feed Universal Feed Writer'); +//Retriving informations from database +$rows = $db->get_view("app", "byLastModified")->rows; +//print_r($rows); +foreach ($rows as $row) { + //Create an empty FeedItem + $newItem = $TestFeed->createNewItem(); + //Add elements to the feed item + $newItem->setTitle($row['name']); + $newItem->setLink($row['id']); + $newItem->setDate(date("c", $row['metadata']['lastModified'])); + $newItem->setDescription($row['name']); + //Now add the feed item + $TestFeed->addItem($newItem); +} +//OK. Everything is done. Now genarate the feed. +$TestFeed->genarateFeed(); +?> --- a/sag +++ /dev/null --- /dev/null +++ b/schemas/agency.json.php @@ -1,1 +1,19 @@ + "Representation of government agency and online transparency measures", + "type" => "object", + "properties" => Array( + "name" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), + "othernames" => Array("type" => "array", "required" => true, "x-title" => "Agency Past/Other Names", "description" => "Agency Names", + "items" => Array("type" => "string")), + ), + /*"org":{"type":"object", + "properties":{ + "organizationName":{"type":"string"}, + "organizationUnit":{"type":"string"}}, + } + }*/ +); +?> + --- /dev/null +++ b/schemas/schemas.inc.php @@ -1,1 +1,5 @@ + --- /dev/null +++ b/score.php @@ -1,1 +1,19 @@ +get_db('disclosr-agencies'); + +try { + $rows = $db->get_view("score", "score")->rows; + //print_r($rows); + foreach ($rows as $row) { + echo $row->value->name." ".$row->value->score."
    "; + } +} catch (SetteeRestClientException $e) { + setteErrorHandler($e); +} + +include_footer(); +?> --- a/stylesheets/app.css +++ b/stylesheets/app.css @@ -21,14 +21,7 @@ font-size: 16px; font-size: 1.6rem; font-weight: 800; } -#navbar h1 a { color: #fff; font-weight: bold; } -#navbar h2 a { - text-indent: -99999px; - display: block; - width: 82px; - height: 14px; - background: url('../images/by-zurb.png'); } - +#navbar a { color: #fff; font-weight: bold; } #navbar strong { display: block; margin: 0; padding: 0; height: 14px; line-height: 14px; position: relative; bottom: 4px; } #navbar strong a { @@ -39,5 +32,41 @@ } #navbar strong a.button { padding: 4px 10px; font-weight: bold; } +/* other zurb copied css */ +.row { max-width: 1200px; } + +div.foundation-header { margin: 0 0 40px 0; padding: 30px 0 0 0; border-bottom: solid 1px #ccc; } +div.foundation-header h1 { margin-bottom: 0; padding: 0; } +div.foundation-header h1 a { color: #181818; } +div.foundation-header h1 a:hover { color: #181818; } +div.foundation-header .subheader { margin-bottom: 9px; } + +div.highlight { margin-bottom: 12px; } + +img.beta { position: absolute; top: 0px; right: 0px; } + +/* Footer */ +footer.row { + margin-top: 80px; + border-top: solid 1px #e6e6e6; + padding-top: 20px; } +footer.row h6 { + color: #6f6f6f; + font-size: 14px; + font-size: 1.4rem; + margin-bottom: 4px; } +footer.row p { + color: #626262; + font-size: 12px; + font-size: 1.2rem; + line-height: 18px; } +footer.row a { + color: #222222; } +footer.row a:hover { + text-decoration: underline; } + +.row.display { background: #f4f4f4; margin-bottom: 10px; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; } +.row.display .column, .row.display .columns { background: #e7e7e7; font-size: 11px; text-indent: 3px; padding-top: 6px; padding-bottom: 6px; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; } + --- a/unimplemented/rss.xml.php +++ /dev/null @@ -1,2 +1,1 @@ -// Agency X updated Y, new files, diff of plain text/link text, -// feed for just one agency or all +