From: Maxious Date: Sat, 28 Jan 2012 06:59:01 +0000 Subject: Scrape required and chart of complied features views X-Git-Url: http://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=3732ed2e5b49d875223990d6390ef382c5e27764 --- Scrape required and chart of complied features views Former-commit-id: 1f70b43713b7686e9f7a8a0f6a5aced655d53221 --- --- a/alaveteli/exportCategories.rb.php +++ b/alaveteli/exportCategories.rb.php @@ -1,19 +1,20 @@ get_db('disclosr-agencies'); try { $rows = $db->get_view("app", "byDeptStateName", null, true)->rows; //print_r($rows); foreach ($rows as $row) { - echo ' [ "'.phrase_to_tag(dept_to_portfolio($row->key)).'","'. dept_to_portfolio($row->key).'","part of the '.dept_to_portfolio($row->key).' portfolio" ],'.PHP_EOL; + echo ' [ "' . phrase_to_tag(dept_to_portfolio($row->key)) . '","' . dept_to_portfolio($row->key) . '","part of the ' . dept_to_portfolio($row->key) . ' portfolio" ],' . PHP_EOL; } } catch (SetteeRestClientException $e) { setteErrorHandler($e); --- a/getAgency.php +++ b/getAgency.php @@ -4,17 +4,36 @@ include_header(); function displayValue($key, $value, $mode) { - global $db; + global $db, $schemas; if ($mode == "view") { + + echo ""; + + echo "" . $schemas['agency']["properties"][$key]['x-title'] . "
" . $schemas['agency']["properties"][$key]['description'] . ""; if (is_array($value)) { - echo "$key
    "; + echo "
      "; foreach ($value as $subkey => $subvalue) { - echo "
    1. $subvalue
      2. "; + if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) { + echo '
    2. '; + } else { + echo "
    3. "; + } + echo "$subvalue
      4. "; } echo "
    "; } else { - echo "$key$value"; + if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) { + echo ''; + } else { + echo ""; + } + if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { + echo "view"; + } else { + echo "$value"; + } } + echo ""; } if ($mode == "edit") { if (is_array($value)) { @@ -31,24 +50,23 @@ } else { if (strpos($key, "_") === 0) { echo""; - } else if ($key == "parentOrg") { echo ""; + $rows = $db->get_view("app", "byDeptStateName")->rows; + //print_r($rows); + foreach ($rows as $row) { + echo ""; + } + echo" "; } else if (strpos($key, "has") === 0) { - echo ""; + echo ""; } else { echo ""; - if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") { - echo "view"; + if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { + echo "view"; } if ($key == 'abn') { - echo "view abn"; + echo "view abn"; } } } @@ -63,16 +81,14 @@ if (!isset($row[$defaultField])) { if ($schemas['agency']['properties'][$defaultField]['type'] == "string") { if (strpos($defaultField, "has") === 0) { - $row[$defaultField] = "false"; - + $row[$defaultField] = "false"; } else { - $row[$defaultField] = ""; + $row[$defaultField] = ""; } - } - if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { - - $row[$defaultField] = Array(""); + if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { + + $row[$defaultField] = Array(""); } } } @@ -108,10 +124,15 @@ } } - $mode = "edit"; - $row = addDefaultFields(object_to_array($row)); + $mode = "view"; + if ($mode == "edit") { + $row = addDefaultFields(object_to_array($row)); + } else { + $row = object_to_array($row); + } + if ($mode == "view") { - echo ''; + echo '
    '; echo '"; echo ""; } @@ -136,40 +157,40 @@ }; - $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 '
  1. ' . + (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) + . '
    2. '; + } */ + $rows = $db->get_view("app", "byName")->rows; + //print_r($rows); + foreach ($rows as $row) { + // print_r($row); + echo '
    3. '; } - foreach ($row as $key => $value) { - echo displayValue($key, $value, $mode); - } - if ($mode == "view") { - echo ""; - } - if ($mode == "edit") { - echo ''; - } - } else { - - try { - /*$rows = $db->get_view("app", "showNamesABNs")->rows; - //print_r($rows); - foreach ($rows as $row) { - // print_r($row); - echo '
  3. ' . - (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) - . '
    4. '; - }*/ - $rows = $db->get_view("app", "byName")->rows; - //print_r($rows); - foreach ($rows as $row) { - // print_r($row); - echo '
  4. ' . - $row->key - . '
    5. '; - } - } catch (SetteeRestClientException $e) { - setteErrorHandler($e); - } + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); } - include_footer(); - ?> +} +include_footer(); +?> --- a/include/couchdb.inc.php +++ b/include/couchdb.inc.php @@ -1,8 +1,8 @@ language = "javascript"; $obj->views->all->map = "function(doc) { emit(doc._id, doc); };"; $obj->views->byABN->map = "function(doc) { emit(doc.abn, doc); };"; - $obj->views->byCanonicalName->map = "function(doc) { + $obj->views->byCanonicalName->map = "function(doc) { if (doc.parentOrg || doc.orgType == 'FMA-DepartmentOfState') { emit(doc.name, doc); } };"; - $obj->views->byDeptStateName->map = "function(doc) { + $obj->views->byDeptStateName->map = "function(doc) { if (doc.orgType == 'FMA-DepartmentOfState') { emit(doc.name, doc._id); } };"; - $obj->views->parentOrgs->map = "function(doc) { + $obj->views->parentOrgs->map = "function(doc) { if (doc.parentOrg) { emit(doc._id, doc.parentOrg); } @@ -34,15 +34,25 @@ } } };"; - - $obj->views->foiEmails->map = "function(doc) { + + $obj->views->foiEmails->map = "function(doc) { emit(doc._id, doc.foiEmail); };"; - + $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->getScrapeRequired->map = "function(doc) { + +var lastScrape = Date.parse(doc.metadata.lastScraped); + +var today = new Date(); + +if (!lastScrape || lastScrape.getTime() + 1000 != today.getTime()) { + emit(doc._id, doc); +} + +};"; $obj->views->showNamesABNs->map = "function(doc) { emit(doc._id, {name: doc.name, abn: doc.abn}); };"; $obj->views->getConflicts->map = "function(doc) { if (doc._conflicts) { @@ -50,6 +60,26 @@ } }"; // http://stackoverflow.com/questions/646628/javascript-startswith + $obj->views->scoreHas->map = 'if(!String.prototype.startsWith){ + String.prototype.startsWith = function (str) { + return !this.indexOf(str); + } +} +if(!String.prototype.endsWith){ + String.prototype.endsWith = function(suffix) { +     return this.indexOf(suffix, this.length - suffix.length) !== -1; + }; +} +function(doc) { +if (typeof(doc["status"]) == "undefined" || doc["status"] != "suspended") { +for(var propName in doc) { + if(typeof(doc[propName]) != "undefined" && (propName.startsWith("has") || propName.endsWith("URL"))) { + emit(propName, 1); + } +} + emit("total", 1); + } +}'; $obj->views->score->map = 'if(!String.prototype.startsWith){ String.prototype.startsWith = function (str) { return !this.indexOf(str); @@ -72,17 +102,17 @@ return $db->save($obj, true); } +if (php_uname('n') == "vanille") { -if( php_uname('n') == "vanille") { + $server = new SetteeServer('http://192.168.178.21:5984'); +} else +if (php_uname('n') == "KYUUBEY") { -$server = new SetteeServer('http://192.168.178.21:5984'); -} else - if( php_uname('n') == "KYUUBEY") { - -$server = new SetteeServer('http://192.168.1.148:5984'); + $server = new SetteeServer('http://192.168.1.148:5984'); } else { $server = new SetteeServer('http://127.0.0.1:5984'); } + function setteErrorHandler($e) { echo $e->getMessage() . "
    " . PHP_EOL; } --- a/schemas/agency.json.php +++ b/schemas/agency.json.php @@ -4,37 +4,37 @@ "description" => "Representation of government agency and online transparency measures", "type" => "object", "properties" => Array( - "name" => Array("type" => "string", "required" => true, "x-title" => "Name", "description" => "Name, most recent and broadest"), + "name" => Array("type" => "string", "required" => true, "x-itemprop" => "name", "x-title" => "Name", "description" => "Name, most recent and broadest"), "shortName" => Array("type" => "string", "required" => false, "x-title" => "Short Name", "description" => "Name shortened, usually to an acronym"), - "foiEmail" => Array("type" => "string", "required" => false, "x-title" => "FOI Contact Email", "description" => "FOI contact email if not foi@"), + "foiEmail" => Array("type" => "string", "required" => false, "x-title" => "FOI Contact Email", "description" => "FOI contact email if not foi@"), + "sameAs" => Array("type" => "array", "required" => false, "x-itemprop"=>"http://www.w3.org/2002/07/owl#sameAs","x-title" => "Same As", "description" => "Same as other URLs/URIs for this entity", + "items" => Array("type" => "string")), "otherNames" => Array("type" => "array", "required" => true, "x-title" => "Past/Other Names", "description" => "Other names for organisation", "items" => Array("type" => "string")), - "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous", + "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies","x-itemprop"=>"members", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous", "items" => Array("type" => "string")), "orgType" => Array("type" => "string", "required" => true, "x-title" => "Organisation Type", "description" => "Org type based on legal formation via FMA/CAC legislation etc."), "parentOrg" => Array("type" => "string", "required" => true, "x-title" => "Parent Organisation", "description" => "Parent organisation, usually a department of state"), - "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "description" => "Website URL"), + "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "x-itemprop" => "url", "description" => "Website URL"), "abn" => Array("type" => "string", "required" => true, "x-title" => "Australian Business Number", "description" => "ABN from business register"), - "contractListURL" => Array("type" => "string", "required" => true, "x-title" => "Contract Listing", "description" => "Departmental and agency contracts, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"), + "contractListURL" => Array("type" => "string", "required" => true, "x-title" => "Contract Listing", "description" => "Departmental and agency contracts, mandated by the Senate"), "grantsReportingURL" => Array("type" => "string", "required" => true, "x-title" => "Grants Awarded", - "description" => "Departmental and agency grants mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm and Commonwealth grants guidelines http://www.finance.gov.au/publications/fmg-series/23-commonwealth-grant-guidelines.html"), + "description" => "Departmental and agency grants mandated by the Senate and Commonwealth grants guidelines "), "annualReportURL" => Array("type" => "string", "required" => true, "x-title" => "Annual Report(s)", "description" => ""), "consultanciesURL" => Array("type" => "string", "required" => true, "x-title" => "Consultants Hired", "description" => ""), "legalExpenditureURL" => Array("type" => "string", "required" => true, "x-title" => "Legal Services Expenditure", "description" => "Legal Services Expenditure mandated by Legal Services Directions 2005"), - "recordsListURL" => Array("type" => "string", "required" => true, "x-title" => "Files/Records Held", "description" => "Indexed lists of departmental and agency files, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"), + "recordsListURL" => Array("type" => "string", "required" => true, "x-title" => "Files/Records Held", "description" => "Indexed lists of departmental and agency files, mandated by the Senate"), "FOIDocumentsURL" => Array("type" => "string", "required" => true, "x-title" => "FOI Documents Released", "description" => ""), "infoPublicationSchemeURL" => Array("type" => "string", "required" => true, "x-title" => "Information Publication Scheme", "description" => ""), - "appointmentsURL" => Array("type" => "string", "required" => true, "x-title" => "Agency Appointments/Boards", "description" => "Departmental and agency appointments and vacancies , mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"), - "advertisingURL" => Array("type" => "string", "required" => true, "x-title" => "Approved Advertising Campaigns", "description" => " Agency advertising and public information projects, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm "), + "appointmentsURL" => Array("type" => "string", "required" => true, "x-title" => "Agency Appointments/Boards", "description" => "Departmental and agency appointments and vacancies , mandated by the Senate"), + "advertisingURL" => Array("type" => "string", "required" => true, "x-title" => "Approved Advertising Campaigns", "description" => " Agency advertising and public information projects, mandated by the Senate "), "hasRSS" => Array("type" => "string", "required" => true, "x-title" => "Has RSS", "description" => ""), "hasMailingList" => Array("type" => "string", "required" => true, "x-title" => "Has Mailing List", "description" => ""), "hasTwitter" => Array("type" => "string", "required" => true, "x-title" => "Has Twitter", "description" => ""), "hasFacebook" => Array("type" => "string", "required" => true, "x-title" => "Has Facebook", "description" => ""), "hasYouTube" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""), - - "hasFlickr" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""), + "hasFlickr" => Array("type" => "string", "required" => true, "x-title" => "Has Flickr", "description" => ""), "hasCCBY" => Array("type" => "string", "required" => true, "x-title" => "Has CC-BY", "description" => "Has any page licenced Creative Commons - Attribution"), - ), /* "org":{"type":"object", "properties":{ --- a/scrape.py +++ b/scrape.py @@ -3,15 +3,6 @@ import urllib2 from BeautifulSoup import BeautifulSoup import re - -couch = couchdb.Server('http://192.168.1.148:5984/') - -# select database -agencydb = couch['disclosr-agencies'] - -for row in agencydb.view('app/getScrapeRequired'): #not recently scraped agencies view? - agency = agencydb.get(row.id) - print agency['agencyName'] #http://diveintopython.org/http_web_services/etags.html class NotModifiedHandler(urllib2.BaseHandler): @@ -21,9 +12,10 @@ return addinfourl def scrapeAndStore(URL, depth, agency): - URL = "http://www.hole.fi/jajvirta/weblog/" + URL = "http://www.google.com" req = urllib2.Request(URL) - + etag = 'y' + last_modified = 'y' #if there is a previous version sotred in couchdb, load caching helper tags if etag: req.add_header("If-None-Match", etag) @@ -39,7 +31,7 @@ file_size = headers.getheader("Content-Length") mime_type = headers.getheader("Content-Type") - if hasattr(url_handle, 'code') + if hasattr(url_handle, 'code'): if url_handle.code == 304: print "the web page has not been modified" else: @@ -63,3 +55,22 @@ #record/alert error to error database + + + + + + + + + +couch = couchdb.Server('http://192.168.1.148:5984/') + +# select database +agencydb = couch['disclosr-agencies'] + +for row in agencydb.view('app/getScrapeRequired'): #not recently scraped agencies view? + agency = agencydb.get(row.id) + print agency['name'] +scrapeAndStore("A",1,1) +