From: Maxious Date: Mon, 03 Dec 2012 07:50:56 +0000 Subject: Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr X-Git-Url: http://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=04edae81cf1e23d3d77d0c2fd4292e5e03a573fd --- Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr Conflicts: documents/rss.xml.php lib/FeedWriter Former-commit-id: 9f314c20fca6d7ffb1eaa4892e7b316bc0ea3628 --- --- a/admin/refreshDesignDoc.php +++ b/admin/refreshDesignDoc.php @@ -9,7 +9,6 @@ $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); };"; --- /dev/null +++ b/documents/about.php @@ -1,1 +1,11 @@ + +

About

+ + --- a/documents/genericScrapers.py +++ b/documents/genericScrapers.py @@ -217,7 +217,12 @@ self.getDescription(description,row, doc) if notes != None: doc.update({ 'notes': (''.join(notes.stripped_strings))}) - foidocsdb.save(doc) + badtitles = ['-','Summary of FOI Request','FOI request(in summary form)','Summary of FOI request received by the ASC', +'Summary of FOI request received by agency/minister','Description of Documents Requested','FOI request','Description of FOI Request','Summary of request','Description','Summary', +'Summary of FOIrequest received by agency/minister','Summary of FOI request received','Description of FOI Request',"FOI request",'Results 1 to 67 of 67'] + if doc['title'] not in badtitles and doc['description'] != '': + print "saving" + foidocsdb.save(doc) else: print "already saved "+hash --- a/documents/rss.xml.php +++ b/documents/rss.xml.php @@ -14,6 +14,7 @@ $TestFeed->setDescription('disclosurelo.gs Newest Entries - All Agencies'); $TestFeed->setChannelElement('language', 'en-us'); $TestFeed->setChannelElement('pubDate', date(DATE_RSS, time())); + //Retriving informations from database $idtoname = Array(); $agenciesdb = $server->get_db('disclosr-agencies'); @@ -31,6 +32,7 @@ $newItem->setLink("http://disclosurelo.gs/view.php?id=".$row->value->_id); $newItem->setDate(strtotime($row->value->date)); $newItem->setDescription(displayLogEntry($row,$idtoname)); + $newItem->setAuthor($idtoname[$row->value->agencyID]); $newItem->addElement('guid', "http://disclosurelo.gs/view.php?id=".$row->value->_id,array('isPermaLink'=>'true')); //Now add the feed item $TestFeed->addItem($newItem); --- a/documents/scrapers/227cb6eb7d2c9f8a6e846df7447d6caa.py +++ b/documents/scrapers/227cb6eb7d2c9f8a6e846df7447d6caa.py @@ -21,9 +21,10 @@ for row in soup.find(class_ = "ms-rteTable-GreyAlternating").find_all('tr'): if row != None: rowtitle = row.find('th').string - description = description + "\n" + rowtitle + ": " + if rowtitle != None: + description = description + "\n" + rowtitle + ": " for text in row.find('td').stripped_strings: - description = description + text + description = description + text for atag in row.find_all("a"): if atag.has_key('href'): links.append(scrape.fullurl(link,atag['href'])) --- a/documents/template.inc.php +++ b/documents/template.inc.php @@ -1,152 +1,169 @@ - - - - - - - - - + header('X-UA-Compatible: IE=edge,chrome=1'); + ?> + + + + + + + + + - - + Australian Disclosure Logs<?php if ($title != "") echo " - $title"; ?> + - Australian Disclosure Logs<?php if ($title != "") echo " - $title";?> - + + + + + - - - - - + + + + - - - - + + + - - - + + + - - - - - - -
-
-
- - - - - - Australian Disclosure Logs -
-

- Check out our subsites on: -Government Agencies -• Political Lobbyists -• Government Contracts and Spending + + +

+
+
+ + + + + + Australian Disclosure Logs +
+

+ Check out our subsites on: + Government Agencies + • Political Lobbyists + • Government Contracts and Spending -

- -
-
-
-
-
- -
-
+

+
    +
  • Home
    • +
  • List of Disclosure Logs
    • +
  • About
    • -
    -

    © Company 2012

    -
    - - - - + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-12341040-4']); + _gaq.push(['_setDomainName', 'disclosurelo.gs']); + _gaq.push(['_setAllowLinker', true]); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + + + + - - - + + $length) { + //limit hit! + $string = substr($string, 0, ($length - 3)); + if ($stopanywhere) { + //stop anywhere + $string .= '...'; + } else { + //stop on a word. + $string = substr($string, 0, strrpos($string, ' ')) . '...'; + } + } + return $string; } function displayLogEntry($row, $idtoname) { $result = ""; - $result .= "

    ".$row->value->date.": ".$row->value->title." (".$idtoname[$row->value->agencyID].")

    ".str_replace("\n","
    ",$row->value->description); -if (isset($row->value->notes)) { -$result .= "
    Note: ".$row->value->notes; -} -$result .= "

    "; + $result .= '
    '; + $result .= '

    : " . truncate($row->value->title, 120).""; + $result .= '(' . $idtoname[$row->value->agencyID] . ')

    '; + $result .= "

    Title" . $row->value->title . "
    " . str_replace("\n", "
    ", $row->value->description); + if (isset($row->value->notes)) { + $result .= "
    Note: " . $row->value->notes; + } + $result .= "

    "; -if (isset($row->value->links)){ -$result .= "

    Links/Documents

      "; -foreach ($row->value->links as $link) { - $result .= "
    • ".$link."
      • "; + if (isset($row->value->links)) { + $result .= '

      Links/Documents

      "; + } + $result .= " ID: " . strip_tags($row->value->docID) . ""; + $result .= "
    "; + return $result; } - $result .= "
"; -} - $result .= "View original source... ID: ".strip_tags($row->value->docID).""; -$result .= "
"; -return $result; -} -