From: Maxious <maxious@lambdacomplex.org>
Date: Mon, 09 Jan 2012 05:14:04 +0000
Subject: Fix hard coded ABN bug
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=13cc2f47e996abbcb48236e63a801309700d0561
---
Fix hard coded ABN bug


Former-commit-id: 26cab951c09972aea499a6a2dfb4cbf2dcd8f3d7
---


--- /dev/null
+++ b/.gitignore
@@ -1,1 +1,1 @@
-
+/nbproject/private/

--- 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
 

--- /dev/null
+++ b/about.php
@@ -1,1 +1,50 @@
+<?php
+include_once('include/common.inc.php');
+include_header();
+?>
+<div class="foundation-header">
+    <h1><a href="about.php">About/FAQ</a></h1>
+    <h4 class="subheader">Lorem ipsum.</h4>
+</div>
+<h2> What is this? </h2>
+Disclosr is a project to monitor Australian Federal Government agencies 
+compliance with their <a href="http://www.oaic.gov.au/publications/other_operational/foi_policy_frequently_asked_questions.html#_Toc291837571">"proactive disclosure requirements"</a>.
+OGRE (Open Government Realization Evaluation) is a ranking of compliance with these requirements.
+Prometheus is the agent which polls agency websites to assess compliance.
 
+<h2> Open everything </h2>
+all documents released CC-BY 3 AU
+Open source git @
+
+<h2>Organisational Data Sources</h2>
+
+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. 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.
+Some small agencies will choose to simply rely on their parent department's accountablity measures.
+
+This flows through to organisation name and other/past names. A department that accounts for an agency will list that agency as an other child name.
+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.
+
+<h2>Open Government Scoring</h2>
++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.
+
+<?php
+include_footer();
+?>

--- a/agencies.csv
+++ /dev/null
@@ -1,176 +1,1 @@
-agencyName,status,website,abn,contractListURL,grantsReportingURL,annualReportURL,consultanciesURL,legalExpenditureURL,recordsListURL,FOIDocumentsURL,infoPublicationSchemeURL
-Australian Institute of Family Studies,suspended,http://www.aifs.gov.au,64001053079,http://www.aifs.gov.au/institute/aifs/accountability.html,"",http://www.aifs.gov.au/institute/pubs/annualreports/annualreports.html,"","","","",""
-Comsuper,suspended,http://www.comsuper.gov.au/,77310752950,http://www.comsuper.gov.au/reports/murray.html,"",http://www.comsuper.gov.au/reports/annual_reports.html,"","","","",""
-Australian National Audit Office (ANAO),active,http://www.anao.gov.au,33020645631,http://www.anao.gov.au/director/tendersandcontracting/contracts.cfm,"",http://www.anao.gov.au/director/aboutus/currentannualreport.cfm,"","","","",""
-CRS Australia,active,http://www.crsaustralia.gov.au,65281415387,http://www.crsaustralia.gov.au/reporting.htm#contract_listings,"",http://www.crsaustralia.gov.au/plans_and_annual_reports.htm,"","","","",""
-Australian Competition and Consumer Commission,active,http://www.accc.gov.au,94410483623,http://www.accc.gov.au/content/index.phtml/itemId/860838,"",http://www.accc.gov.au/content/index.phtml/itemId/668577,http://www.accc.gov.au/content/index.phtml/itemId/402496,http://www.accc.gov.au/content/index.phtml/itemId/767987,"","",""
-Workplace Authority,suspended,http://www.workplaceauthority.gov.au,37243205024,http://www.workplaceauthority.gov.au/AboutUs/CorporateInfo/Pages/ContractsAndTenders.aspx,"",http://www.workplaceauthority.gov.au/AboutUs/CorporateInfo/Pages/AnnualReport.aspx,"","","","",""
-Attorney-General's Department,active,http://www.ag.gov.au/,92661124436,http://www.ag.gov.au/www/agd/agd.nsf/Page/Tendersandcontracts_SenateOrderContracts,http://www.ag.gov.au/www/agd/agd.nsf/Page/About_the_DepartmentGrants,http://www.ag.gov.au/www/agd/agd.nsf/Page/PublicationsAnnual_Reports,"","",http://www.ag.gov.au/www/agd/agd.nsf/Page/AbouttheDepartment_SenateContinuingOrderFileLists,http://www.ag.gov.au/www/agd/agd.nsf/Page/Freedom_of_Information,""
-Office of the Official Secretary to the Governor-General,active,http://www.gg.gov.au,67582329284,http://www.gg.gov.au/administration/category.php?id=7,"",http://www.gg.gov.au/administration/category.php?id=5,"","","","",""
-Federal Court of Australia,active,http://www.fedcourt.gov.au/,49110847399,http://www.fedcourt.gov.au/aboutct/contracts.html,"",http://www.fedcourt.gov.au/aboutct/ar.html,"","","","",""
-IP Australia,suspended,http://www.ipaustralia.gov.au,38113072755,http://www.ipaustralia.gov.au/about/files_contracts.shtml,"",http://www.innovation.gov.au/Section/AbouttheDepartment/Pages/AnnualReport200809.aspx,http://www.ipaustralia.gov.au/about/files_contracts.shtml,http://www.ipaustralia.gov.au/about/files_contracts.shtml,http://www.ipaustralia.gov.au/about/files_ipa.shtml,"",""
-National Native Title Tribunal,active,http://www.nntt.gov.au,70238042351,http://www.nntt.gov.au/About-The-Tribunal/Pages/Commonwealth-Reporting-Requirements.aspx,"",http://www.nntt.gov.au/About-The-Tribunal/Pages/Commonwealth-Reporting-Requirements.aspx,"",http://www.nntt.gov.au/About-The-Tribunal/Pages/Commonwealth-Reporting-Requirements.aspx,http://www.nntt.gov.au/About-The-Tribunal/Pages/Commonwealth-Reporting-Requirements.aspx,"",""
-"Department of Education, Employment and Workplace Relations",active,http://www.deewr.gov.au/Pages/default.aspx,63578775294,http://www.deewr.gov.au/Department/Publications/Pages/CorporatePublications.aspx,"",http://www.deewr.gov.au/Department/Publications/Pages/CorporatePublications.aspx,"","","","",""
-Australian Prudential Regulation Authority (APRA),active,http://www.apra.gov.au,79635582658,http://www.apra.gov.au/aboutAPRA/,"",http://www.apra.gov.au/aboutAPRA/,http://www.apra.gov.au/aboutAPRA/,http://www.apra.gov.au/aboutAPRA/,http://www.apra.gov.au/aboutAPRA/,"",""
-Australian Crime Commission,active,http://www.crimecommission.gov.au/index.htm,11259448410,http://www.crimecommission.gov.au/about/business_accountability/index.htm,"",http://www.crimecommission.gov.au/publications/annual_report/index.htm,"",http://www.crimecommission.gov.au/about/business_accountability/index.htm,http://www.crimecommission.gov.au/about/business_accountability/file_list.htm,"",""
-Australian Radiation Protection and Nuclear Safety Agency (ARPANSA),active,http://www.arpansa.gov.au,61321195155,http://www.arpansa.gov.au/AboutUs/Corporate/contractlist.cfm,"",http://www.arpansa.gov.au/AboutUs/corporate/annualreports.cfm,"",http://www.arpansa.gov.au/AboutUs/legal.cfm,http://www.arpansa.gov.au/AboutUs/FileList.cfm,"",""
-"Department of Innovation, Industry, Science and Research",active,http://www.innovation.gov.au/Pages/default.aspx,74599608295,http://www.innovation.gov.au/Section/AbouttheDepartment/Pages/SenateOrderContractsListingforthe2008-09FinancialYear.aspx,"",http://www.innovation.gov.au/General/Corp-MC/Pages/Publications.aspx#annual,"",http://www.innovation.gov.au/Section/AbouttheDepartment/Pages/DepartmentalExpenditureonLegalServices.aspx,http://www.innovation.gov.au/Section/AbouttheDepartment/Pages/SenateContinuingOrderNo8IndexedListofDepartmentalandAgencyFiles.aspx,"",""
-Wheat Exports Australia,active,http://www.wea.gov.au,40485918341,http://www.wea.gov.au/AboutUs/WEA%20Contracts.htm,"",http://www.wea.gov.au/Publications/AnnualReports/AnnualReports.htm,"","",http://www.wea.gov.au/Publications/File%20Index%20to%20June%2009.pdf,"",""
-Office of National Assessments,active,http://www.ona.gov.au/,87904367991,http://www.ona.gov.au/corporate.htm,"","","",http://www.ona.gov.au/corporate.htm,"","",""
-Old Parliament House,active,http://moadoph.gov.au/,30620774963,http://moadoph.gov.au/about/corporate-documents/,"",http://moadoph.gov.au/about/corporate-documents/,"","",http://moadoph.gov.au/about/corporate-documents/,"",""
-Murray-Darling Basin Authority,active,http://www.mdba.gov.au/,13679821382,http://www.mdba.gov.au/about/corporate_documents/contact_listings,"","","","","","",""
-Administrative Appeals Tribunal,active,http://www.aat.gov.au,90680970626,http://www.aat.gov.au/TendersAndContracts/Contracts.htm,"",http://www.aat.gov.au/CorporatePublications/AnnualReport.htm,"",http://www.aat.gov.au/CorporatePublications/LegalServices.htm,http://www.aat.gov.au/CorporatePublications/IndexedList.htm,"",""
-Aged Care Standards and Accreditation Agency Ltd,active,http://www.accreditation.org.au/,64079618652,"","",http://www.accreditation.org.au/about-us/annual-reports/,"","","","",""
-Airservices Australia,suspended,http://www.ano.gov.au,59698720886,"","","","","","","",""
-AusAid,active,http://www.ausaid.gov.au,62921558838,http://www.ausaid.gov.au/business/contracts_list.cfm,"",http://www.ausaid.gov.au/publications/pubout.cfm?ID=8691_5877_871_8496_1205&CFID=3328295&CFTOKEN=90652321,"","","",http://www.ausaid.gov.au/about/foi.cfm,""
-Austrade,active,http://www.austrade.gov.au,11764698227,http://www.austrade.gov.au/Contracts/default.aspx,"",http://www.austrade.gov.au/default.aspx?FolderID=1401,"","","","",""
-Australia Council for the Arts,suspended,http://www.australiacouncil.gov.au,38392626187,"","","","","","","",""
-Australian Antarctic Division,suspended,http://www.environment.gov.au,56428630676,"","","","","","","",""
-Australian Broadcasting Corporation,suspended,http://abc.gov.au,52429278345,"","","","","","","",""
-Australian Bureau of Statistics,active,http://www.abs.gov.au,26331428522,http://www.abs.gov.au/websitedbs/D3310114.nsf/51c9a3d36edfd0dfca256acb00118404/86158083b1e61cc5ca256ac5007eac24!OpenDocument,"",http://www.abs.gov.au/AUSSTATS/abs@.nsf/second+level+view?ReadForm&prodno=1001.0&viewtitle=Australian%20Bureau%20of%20Statistics%20--%20Annual%20Report~2009-10~Latest~27/10/2010&&tabname=Past%20Future%20Issues&prodno=1001.0&issue=2009-10&num=&view=&,"",http://www.abs.gov.au/websitedbs/D3310114.nsf/4a256353001af3ed4b2562bb00121564/f8961758d807999dca257214001e1281!OpenDocument,"",http://www.abs.gov.au/websitedbs/D3310114.nsf/4a256353001af3ed4b2562bb00121564/95e66d20b24927d7ca25747c002dc9ee!OpenDocument,""
-Australian Centre for International Agricultural Research,active,http://www.aciar.gov.au,34864955427,"","","","","","","",""
-Australian Commission for Law Enforcement Integrity,active,http://www.aclei.gov.au,78796734093,http://www.aclei.gov.au/www/aclei/aclei.nsf/Page/Accountability_and_Reporting,"","http://www.aclei.gov.au/www/aclei/aclei.nsf/Page/AccountabilityandReporting_Reports,SubmissionsandSpeeches","",http://www.aclei.gov.au/www/aclei/aclei.nsf/Page/Accountability_and_Reporting,http://www.aclei.gov.au/www/aclei/aclei.nsf/AllDocs/39D8AB36FD3CC755CA25734B007CC961?OpenDocument,http://www.aclei.gov.au/www/aclei/aclei.nsf/Page/FreedomofInformation_FreedomofInformation,""
-Australian Communications and Media Authority (ACMA),suspended,http://www.acma.gov.au,55386169386,"","","","","","","",""
-Australian Customs and Border Protection Service,active,http://www.customs.gov.au,66015286036,http://www.customs.gov.au/site/page4247.asp,"",http://www.customs.gov.au/site/page4283.asp,"","",http://www.customs.gov.au/site/page4530.asp,"",""
-Australian Electoral Commission,suspended,http://www.aec.gov.au,21133285851,"","","","","","","",""
-Australian Fair Pay Commission,suspended,http://www.fairpay.gov.au,14460763247,"","","","","","","",""
-Australian Federal Police,active,http://www.afp.gov.au,17864931143,http://www.afp.gov.au/about-the-afp/accountability-requirements/senate-order-contracts.aspx,http://www.afp.gov.au/about-the-afp/accountability-requirements/grants.aspx,http://www.afp.gov.au/media-centre/publications/annual-reports/afp.aspx,http://www.afp.gov.au/about-the-afp/accountability-requirements/consultancy-services.aspx,http://www.afp.gov.au/about-the-afp/accountability-requirements/afp-report-on-legal-services-expenditure.aspx,http://www.afp.gov.au/about-the-afp/accountability-requirements/harradine-report.aspx,"",""
-Australian Fisheries Management Authority,active,http://www.afma.gov.au,81098497517,http://www.afma.gov.au/resource-centre/publications-and-forms/corporate/external-reporting/,"",http://www.afma.gov.au/resource-centre/publications-and-forms/corporate/annual-report/,"",http://www.afma.gov.au/resource-centre/publications-and-forms/corporate/external-reporting/,http://www.afma.gov.au/resource-centre/publications-and-forms/corporate/external-reporting/,http://www.afma.gov.au/resource-centre/publications-and-forms/corporate/freedom-of-information/,""
-Australian Hearing Services,active,http://www.hearing.com.au/,83605426759,"","",http://www.hearing.com.au/annual-reports,"","","",http://www.centrelink.gov.au/internet/internet.nsf/legal/foi_table.htm,""
-Australian Human Rights Commission,active,http://www.hreoc.gov.au,47996232602,"","","","","","","",""
-Australian Industrial Registry,suspended,http://www.business.gov.au,83674573738,"","","","","","","",""
-Australian Institute of Criminology,active,http://www.aic.gov.au,63257175248,"","","","","","","",""
-Australian Institute of Health and Welfare,active,http://www.aihw.gov.au,16515245497,"","","","","","","",""
-Australian Institute of Marine Science,suspended,http://www.aims.gov.au,78961616230,"","","","","","","",""
-Australian Law Reform Commission,active,http://www.alrc.gov.au,88913413914,"","","","","","","",""
-Australian Maritime Safety Authority,suspended,http://www.amsa.gov.au,65377938320,"","","","","","","",""
-Australian National Maritime Museum,suspended,http://www.anmm.gov.au,35023590988,"","","","","","","",""
-Australian Nuclear Science and Technology Organisation (ANSTO),suspended,http://www.ansto.gov.au,47956969590,"","","","","","","",""
-Australian Office of Financial Management,active,http://www.aofm.gov.au,13059525039,"","","","","","","",""
-Australian Organ and Tissue Donation and Transplantation Authority,active,http://www.donatelife.gov.au,56253405315,"","","","","","","",""
-Australian Pesticides and Veterinary Medicines Authority,active,http://www.apvma.gov.au,19495043447,"","","","","","","",""
-Australian Public Service Commission,active,http://www.apsc.gov.au,99470863260,"","","","","","","",""
-Australian Research Council,suspended,http://www.arc.gov.au,35201451156,"","","","","","","",""
-Australian Reward Investment Alliance (ARIA),suspended,http://aria.gov.au,48882817243,"","","","","","","",""
-Australian Securities and Investments Commission,active,http://www.asic.gov.au,86768265615,"","","","","","","",""
-Australian Security Intelligence Organisation,active,http://blu.asio.gov.au,37467566201,"","","","","","","",""
-Australian Sports Anti-Doping Authority (ASADA),suspended,http://checksubstances.asada.gov.au,91592527503,"","","","","","","",""
-Australian Taxation Office,active,http://www.ato.gov.au,51824753556,"","","","","","","",""
-Australian Transaction Reports and Analysis Centre (AUSTRAC),active,http://www.austrac.gov.au,50008559486,"","","","","","","",""
-Australian Transport Safety Bureau,active,http://www.atsb.gov.au,65061156887,"","","","","","","",""
-Australian War Memorial,active,http://www.awm.gov.au,64909221257,"","","","","","","",""
-Bureau of Meteorology,suspended,http://www.bom.gov.au,92637533532,"","","","","","","",""
-Cancer Australia,active,http://www.canceraustralia.gov.au,21075951918,"","","","","","","",""
-Centrelink,active,http://www.centrelink.gov.au,29468422437,"","","","","","","",""
-Civil Aviation Safety Authority,suspended,http://www.casa.gov.au,44808014470,"","","","","","","",""
-Comcare,suspended,http://www.comcare.gov.au,41640788304,"","","","","","","",""
-Commonwealth Grants Commission,suspended,http://www.cgc.gov.au,86267354017,"","","","","","","",""
-Corporations and Markets Advisory Committee,active,http://www.camac.gov.au,85005260622,"","","","","","","",""
-Crimtrac,active,http://www.crimtrac.gov.au,17193904699,"","","","","","","",""
-CSIRO,suspended,http://www.csiro.au/,41687119230,http://www.csiro.au/org/pskc.html,"","","","","","",""
-Defence Housing Australia,active,http://www.dha.gov.au,72968504934,"","","","","","","",""
-Defence Materiel Organisation,active,http://www.defence.gov.au,68706814312,"","","","","","","",""
-"Department of Agriculture, Fisheries and Forestry",active,http://www.daff.gov.au/,24113085695,"","","","","","","",""
-"Department of Broadband, Communications and the Digital Economy",active,http://www.dbcde.gov.au,51491646726,"","","","","","","",""
-Department of Climate Change and Energy Efficiency,active,http://www.climatechange.gov.au,48072377158,"","","","","","","",""
-Department of Defence,active,http://www.defence.gov.au,68706814312,"","","","","","","",""
-"Department of Families, Housing, Community Services and Indigenous Affairs",active,http://www.fahcsia.gov.au/,36342015855,"","","","","","","",""
-Department of Finance and Deregulation,active,http://www.finance.gov.au,61970632495,"","","","","","","",""
-Department of Foreign Affairs and Trade,active,http://www.dfat.gov.au,47065634525,"","","","","","","",""
-Department of Health and Ageing,active,http://www.health.gov.au,83605426759,"","","","","","","",""
-Department of Human Services,active,http://www.centrelink.gov.au,29468422437,"","","","","","","",""
-Department of Immigration & Citizenship,active,http://www.eta.immi.gov.au,33380054835,"","","","","","","",""
-Department of Infrastructure and Transport,active,http://www.infrastructure.gov.au,86267354017,"","","","","","","",""
-Department of Parliamentary Services,active,http://www.aph.gov.au,52997141147,"","","","","","","",""
-"Department of Regional Australia, Regional Development and Local Government",active,http://www.regional.gov.au/,37862725624,"",http://www.regional.gov.au/department/grants/index.aspx,http://www.regional.gov.au/department/annual_report/index.aspx,"","",http://www.regional.gov.au/department/file_listing/index.aspx,http://www.regional.gov.au/department/foi/index.aspx,""
-"Department of Resources, Energy and Tourism",active,http://www.ret.gov.au,71278859567,"","","","","","","",""
-"Department of Sustainability, Environment, Water, Population and Communities",active,http://www.environment.gov.au,34190894983,"","","","","","","",""
-Department of the House of Representatives,active,http://www.aph.gov.au,18526287740,"","","","","","","",""
-Department of the Prime Minister and Cabinet,active,http://www.dpmc.gov.au,18108001191,"","","","","","","",""
-Department of the Senate,active,http://www.aph.gov.au,23991641527,"","","","","","","",""
-Department of the Treasury,active,http://www.treasury.gov.au,92802414793,"","","","","","","",""
-Director of National Parks,suspended,http://www.environment.gov.au,13051694963,"","","","","","","",""
-Equal Opportunity for Women in the Workplace Agency,suspended,http://www.eowa.gov.au,47641643874,"","","","","","","",""
-Export Finance and Insurance Corporation (EFIC),active,http://www.efic.gov.au,96874024697,"","","","","","","",""
-Fair Work Australia,active,http://www.fairwork.gov.au,93614579199,"","","","","","","",""
-Family Court of Australia,active,http://www.ag.gov.au,63684208971,"","","","","","","",""
-Federal Magistrates Court,active,http://www.fmc.gov.au,60265617271,"","","","","","","",""
-Food Standards Australia New Zealand,active,http://www.foodstandards.gov.au,20537066246,"","","","","","","",""
-Future Fund Management Agency,suspended,http://www.futurefund.gov.au/,53156699293,"","","","","","","",""
-Geoscience Australia,suspended,http://www.ga.gov.au,80091799039,"","","","","","","",""
-Grains Research and Development Corporation,active,http://www.grdc.com.au/,55611223291,"","","","","","","",""
-Great Barrier Reef Marine Park Authority,suspended,http://www.gbrmpa.gov.au,12949356885,"","","","","","","",""
-Insolvency and Trustee Service Australia (ITSA),active,http://www.itsa.gov.au,63384330717,"","","","","","","",""
-Inspector-General of Taxation,active,http://www.igt.gov.au,51248702319,"","","","","","","",""
-Medicare Australia,active,http://www.medicareaustralia.gov.au,75174030967,"","","","","","","",""
-Migration Review Tribunal and Refugee Review Tribunal (MRT-RRT),active,http://www.mrt-rrt.gov.au,50760799564,"","","","","","","",""
-National Archives of Australia,suspended,http://www.naa.gov.au,36889228992,"","","","","","","",""
-National Blood Authority,active,http://www.nba.gov.au,87361602478,"","","","","","","",""
-National Capital Authority,suspended,http://www.nationalcapital.gov.au,75149374427,"","","","","","","",""
-National Competition Council,active,http://www.ncc.gov.au,56552760098,"","","","","","","",""
-National Film and Sound Archive,active,http://www.nfsa.gov.au,41251017588,"","","","","","","",""
-National Gallery of Australia,suspended,http://nga.gov.au,27855975449,"","","","","","","",""
-National Health and Medical Research Council,active,http://www.nhmrc.gov.au,88601010284,"","","","","","","",""
-National Library of Australia,suspended,http://catalogue.nla.gov.au,28346858075,"","","","","","","",""
-National Museum of Australia,suspended,http://www.nma.gov.au,70592297967,"","","","","","","",""
-National Offshore Petroleum Safety Authority,suspended,http://www.nopsa.gov.au,22385178289,"","","","","","","",""
-National Water Commission,suspended,http://www.nwc.gov.au,94364176431,"","","","","","","",""
-Office of Parliamentary Counsel,active,http://www.opc.gov.au/,41425630817,http://www.opc.gov.au/about/list_contracts.htm,"",http://www.opc.gov.au/about/documents.htm,http://www.opc.gov.au/about/list_consultancy_contracts.html,http://www.opc.gov.au/about/legal_services.htm,http://www.opc.gov.au/about/list_docs.htm,"",""
-Office of the Auditing and Assurance Standards Board,active,http://www.auasb.gov.au,41127556389,"","","","","","","",""
-Office of the Australian Accounting Standards Board,active,http://www.aasb.com.au/Home.aspx,92702019575,"","",http://www.aasb.com.au/About-the-AASB/AASB-annual-reports.aspx,"","","","",""
-Office of the Australian Building and Construction Commissioner (ABCC),suspended,http://www.abcc.gov.au,68003725098,"","","","","","","",""
-Office of the Australian Information Commissioner,active,http://www.oic.qld.gov.au,70810284665,"","","","","","","",""
-Office of the Commonwealth Ombudsman,active,http://www.ombudsman.gov.au,53003678148,"","","","","","","",""
-Office of the Director of Public Prosecutions,active,http://www.cdpp.gov.au,41036606436,"","","","","","","",""
-Office of the Fair Work Ombudsman,active,http://www.fairwork.gov.au,43884188232,"","","","","","","",""
-Office of the Inspector-General of Intelligence and Security,active,http://www.igis.gov.au/,67332668643,"","",http://www.igis.gov.au/annual_report/index.cfm,"","","","",""
-Office of the Renewable Energy Regulator,suspended,http://www.environment.gov.au,68574011917,"","","","","","","",""
-Private Health Insurance Ombudsman,active,http://www.pc.gov.au,61673137709,"","","","","","","",""
-Productivity Commission,active,http://www.pc.gov.au,30004116223,"","","","","","","",""
-Professional Services Review,active,http://www.psr.gov.au,45307308260,"","","","","","","",""
-Reserve Bank of Australia,active,http://www.austrac.gov.au,50008559486,"","","","","","","",""
-Royal Australian Mint,active,http://mintissue.ramint.gov.au,45852104259,"","","","","","","",""
-Safe Work Australia,active,http://safeworkaustralia.gov.au,76116948344,"","","","","","","",""
-Seacare,suspended,http://www.seacare.gov.au/,32745854352,"","",http://www.seacare.gov.au/publications/corporate_publications/annual_reports2,"","",http://www.seacare.gov.au/publications/corporate_publications/harradine_reports2,"",""
-Social Security Appeals Tribunal,suspended,http://www.aat.gov.au,90680970626,"","","","","","","",""
-Sydney Harbour Federation Trust,suspended,http://www.harbourtrust.gov.au/,14178614905,"","","","","","","",""
-Therapeutic Goods Administration,active,http://www.tga.gov.au,40939406804,"","","","","","","",""
-Tourism Australia,suspended,http://www.ret.gov.au,99657548712,"","","","","","","",""
-Aboriginal and Torres Strait Islander Services,suspended,http://www.atsis.gov.au,13013281264,"","","","","","","",""
-Australia-Japan Foundation,suspended,http://www.dfat.gov.au,47065634525,"","","","","","","",""
-Australian Film Commission,suspended,http://afcarchive.screenaustralia.gov.au/,57859074040,"","",http://afcarchive.screenaustralia.gov.au/profile/annrpt/profilepage_12.aspx,"","",http://afcarchive.screenaustralia.gov.au/profile/afc_files/profilepage_21.aspx,"",""
-Australian Film Television and Radio School,suspended,http://www.planning.nsw.gov.au,29003234571,"","","","","","","",""
-Australian Institute of Aboriginal and Torres Strait Islander Studies (AIATSIS),suspended,http://www.aiatsis.gov.au,62020533641,"","","","","","","",""
-Biosecurity Australia,suspended,http://www.aph.gov.au,27009590729,"","","","","","","",""
-Child Support Agency,suspended,http://www.centrelink.gov.au,29468422437,"","","","","","","",""
-Dairy Adjustment Authority,suspended,http://www.daff.gov.au/agriculture-food/meat-wool-dairy/dairy/dairy_adjustment_authority,28714145393,"","","","","","","",""
-Department of Climate Change,suspended,http://www.climatechange.gov.au,83814086707,"","","","","","","",""
-"Department of Communications, Information Technology and the Arts",suspended,http://www.dbcde.gov.au,51491646726,"","","","","","","",""
-"Department of Education, Science and Training",suspended,http://www.dest.gov.au,51452193160,"","","","","","","",""
-Department of Employment and Workplace Relations,suspended,http://www.dest.gov.au,40376417416,"","","","","","","",""
-"Department of Families, Community Services & Indigenous Affairs",suspended,http://www.centrelink.gov.au,29468422437,"","","","","","","",""
-Department of Finance and Administration,suspended,http://www.finance.gov.au,61970632495,"","","","","","","",""
-Department of Immigration and Multicultural Affairs,suspended,http://www.immi.gov.au,33380054835,"","","","","","","",""
-"Department of Industry, Tourism and Resources",suspended,http://www.business.gov.au,51835430479,"","","","","","","",""
-"Department of Infrastructure, Transport, Regional Development and Local Government",suspended,http://www.business.gov.au,86267354017,"","","","","","","",""
-Department of the Environment and Water Resources,suspended,http://www.environment.gov.au,34190894983,"","","","","","","",""
-"Department of the Environment, Water, Heritage and the Arts",suspended,http://www.environment.gov.au,34190894983,"","","","","","","",""
-Department of Transport and Regional Services,suspended,http://www.infrastructure.gov.au,86267354017,"","","","","","","",""
-Emergency Management Australia,suspended,http://www.health.gov.au,83605426759,"","","","","","","",""
-Export Wheat Commission,suspended,http://australia.gov.au,40485918341,"","","","","","","",""
-Land and Water Australia,suspended,http://lwa.gov.au/,25602743013,"","","","","","","",""
-Office of Film and Literature Classification,suspended,http://www.acma.gov.au,16001170433,"","","","","","","",""
-Office of the Privacy Commissioner,suspended,http://www.privacy.gov.au,13152473225,"","","","","","","",""
-Office of Workplace Services,suspended,http://deewr.gov.au,71141751477,"","","","","","","",""
-Questacon,suspended,http://www.tenders.gov.au,74599608295,"","","","","","","",""
-Refugee Review Tribunal,suspended,http://www.mrt-rrt.gov.au,50760799564,"","","","","","","",""
-Screen Australia,suspended,http://www.screenaustralia.gov.au,46741353180,"","","","","","","",""
-The National Institute of Clinical Studies Ltd,suspended,http://www.nhmrc.gov.au/nics/index.htm,60095459804,"","","","","","","",""
-Workplace Ombudsman,suspended,http://www.fairwork.gov.au,43884188232,"","","","","","","",""
-Department of Immigration and Citizenship,,http://www.eta.immi.gov.au,33380054835,"","","","","","","",""
-Department of Education Employment and Workplace Relations,,http://www.dest.gov.au,0,"","","","","","","",""
-Department of Veterans' Affairs,active,"",0,"","","","","","","",""
-Department of Resources Energy and Tourism,,http://www.ret.gov.au,96127997719,"","","","","","","",""
-Department of Broadband Communications and the Digital Economy,,http://www.dbcde.gov.au,51491646726,"","","","","","","",""
-Department of Innovation Industry Science and Research,,http://australia.gov.au,0,"","","","","","","",""
-Department of Agriculture Fisheries and Forestry,,http://www.centrelink.gov.au,29468422437,"","","","","","","",""
+

--- a/couchdb/couchdb-lucene
+++ /dev/null

--- /dev/null
+++ b/couchdb/settee

--- a/exportAgencies.csv.php
+++ /dev/null
@@ -1,65 +1,1 @@
-<?php
 
-include_once("./lib/common.inc.php");
-setlocale(LC_CTYPE, 'C');
-// source: http://stackoverflow.com/questions/81934/easy-way-to-export-a-sql-table-without-access-to-the-server-or-phpmyadmin#81951
-
-$unspsc = Array();
-$unspscresult = $conn->prepare('select * from "UNSPSCcategories" where "UNSPSC"::text like \'%00000\';');
-$unspscresult->execute();
-foreach ($unspscresult->fetchAll() as $row) {
-    $unspsc[$row['UNSPSC']] = $row['Title'];
-}
-
-$query = $conn->prepare('
-SELECT "CNID",contractnotice."agencyName",agency_nametoabn.abn as "agencyABN",
-EXTRACT(EPOCH FROM "publishDate") as "publishDate",
-EXTRACT(EPOCH FROM "contractStart") as "contractStart",
-EXTRACT(EPOCH FROM "contractEnd") as "contractEnd",
-value,description,category,
-"supplierName",(case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID,
-(\'https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN\'::text || "CNID"::text) as sourceURL 
-FROM contractnotice join agency_nametoabn on contractnotice."agencyName"=agency_nametoabn."agencyName"  
-where "childCN" is null'
-        , array(PDO::ATTR_CURSOR => PDO::FETCH_ORI_NEXT));
-$query->execute();
-$errors = $conn->errorInfo();
-if ($errors[2] != "") {
-    die("Export terminated, db error" . print_r($errors, true));
-}
-
-$num_fields = $query->columnCount();
-$headers = Array();
-for ($i = 0; $i < $num_fields; $i++) { // for each column in query, make a CSV header
-    $meta = $query->getColumnMeta($i);
-    $headers[] = $meta['name'];
-}
-$fp = fopen('php://output', 'w');
-if ($fp && $query) {
-    header('Content-Type: text/csv');
-    header('Content-Disposition: attachment; filename="export.' . date("c") . '.csv"');
-    header('Pragma: no-cache');
-    header('Expires: 0');
-    fputcsv($fp, $headers);
-    while ($row = $query->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_NEXT)) {
-        foreach ($row as $key => &$colvalue) {
-
-            $colvalue = preg_replace('/[^[:print:]]/', '', utf8_encode($colvalue));
-            if ($headers[$key] == "publishDate" || $headers[$key] == "contractStart"
-                    || $headers[$key] == "contractEnd") {
-                $colvalue = date("Y-m-d", $colvalue);
-            }
-           /* if ($headers[$key] == "CNID") {
-                $colvalue = str_replace("A","", $colvalue);
-}*/
-            if ($headers[$key] == "cat1" || $headers[$key] == "cat2"
-                    || $headers[$key] == "cat3") {
-                $colvalue = $unspsc[$colvalue];
-            }
-        }
-        fputcsv($fp, array_values($row));
-    }
-    die;
-}
-?>
-

--- a/foundation.html
+++ /dev/null
@@ -1,137 +1,1 @@
-<!DOCTYPE html>
 
-<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
-<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
-<!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
-<!--[if IE 8]>    <html class="no-js lt-ie9" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!--> <html lang="en"> <!--<![endif]-->
-<head>
-	<meta charset="utf-8" />
-
-	<!-- Set the viewport width to device width for mobile -->
-	<meta name="viewport" content="width=device-width" />
-
-	<title>Welcome to Foundation</title>
-  
-	<!-- Included CSS Files -->
-	<link rel="stylesheet" href="stylesheets/foundation.css">
-	<link rel="stylesheet" href="stylesheets/app.css">
-
-	<!--[if lt IE 9]>
-		<link rel="stylesheet" href="stylesheets/ie.css">
-	<![endif]-->
-
-
-	<!-- IE Fix for HTML5 Tags -->
-	<!--[if lt IE 9]>
-		<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-	<![endif]-->
-
-</head>
-<body>
-
-	<!-- container -->
-	<div class="container">
-
-		<div class="row">
-			<div class="twelve columns">
-				<h2>Welcome to Foundation</h2>
-				<p>This is version 2.1.4 released on December 19, 2011</p>
-				<hr />
-			</div>
-		</div>
-
-		<div class="row">
-			<div class="eight columns">
-				<h3>The Grid</h3>
-
-				<!-- Grid Example -->
-				<div class="row">
-					<div class="twelve columns">
-						<div class="panel">
-							<p>This is a twelve column section in a row. Each of these includes a div.panel element so you can see where the columns are - it's not required at all for the grid.</p>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="six columns">
-						<div class="panel">
-							<p>Six columns</p>
-						</div>
-					</div>
-					<div class="six columns">
-						<div class="panel">
-							<p>Six columns</p>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="four columns">
-						<div class="panel">
-							<p>Four columns</p>
-						</div>
-					</div>
-					<div class="four columns">
-						<div class="panel">
-							<p>Four columns</p>
-						</div>
-					</div>
-					<div class="four columns">
-						<div class="panel">
-							<p>Four columns</p>
-						</div>
-					</div>
-				</div>
-
-				<h3>Tabs</h3>
-				<dl class="tabs">
-					<dd><a href="#simple1" class="active">Simple Tab 1</a></dd>
-					<dd><a href="#simple2">Simple Tab 2</a></dd>
-					<dd><a href="#simple3">Simple Tab 3</a></dd>
-				</dl>
-
-				<ul class="tabs-content">
-					<li class="active" id="simple1Tab">This is simple tab 1's content. Pretty neat, huh?</li>
-					<li id="simple2Tab">This is simple tab 2's content. Now you see it!</li>
-					<li id="simple3Tab">This is simple tab 3's content. It's, you know...okay.</li>
-				</ul>
-
-				<h3>Buttons</h3>
-
-				<p><a href="#" class="small blue button">Small Blue Button</a></p>
-				<p><a href="#" class="blue button">Medium Blue Button</a></p>
-				<p><a href="#" class="large blue button">Large Blue Button</a></p>
-
-				<p><a href="#" class="nice radius small blue button">Nice Blue Button</a></p>
-				<p><a href="#" class="nice radius blue button">Nice Blue Button</a></p>
-				<p><a href="#" class="nice radius large blue button">Nice Blue Button</a></p>
-
-			</div>
-
-			<div class="four columns">			
-				<h4>Getting Started</h4>
-				<p>We're stoked you want to try Foundation! To get going, this file (index.html) includes some basic styles you can modify, play around with, or totally destroy to get going.</p>
-
-				<h4>Other Resources</h4>
-				<p>Once you've exhausted the fun in this document, you should check out:</p>
-				<ul class="disc">
-					<li><a href="http://foundation.zurb.com/docs">Foundation Documentation</a><br />Everything you need to know about using the framework.</li>
-					<li><a href="http://github.com/zurb/foundation">Foundation on Github</a><br />Latest code, issue reports, feature requests and more.</li>
-					<li><a href="http://twitter.com/foundationzurb">@foundationzurb</a><br />Ping us on Twitter if you have questions. If you build something with this we'd love to see it (and send you a totally boss sticker).</li>
-				</ul>
-			</div>
-		</div>
-
-	</div>
-	<!-- container -->
-
-
-
-
-	<!-- Included JS Files -->
-	<script src="javascripts/foundation.js"></script>
-	<script src="javascripts/app.js"></script>
-
-</body>
-</html>
-

--- a/getAgency.php
+++ b/getAgency.php
@@ -1,57 +1,135 @@
 <?php
-function createAgencyDesignDoc()
-{
-	global $sag;
-	//See if the design doc exists, creating it if it doesn't
-	try {
-		//it does exist, so finish early
-		if ($sag->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;
+
+include_once('include/common.inc.php');
+include_header();
+
+function displayValue($key, $value, $mode) {
+    if ($mode == "view") {
+        if (is_array($value)) {
+            echo "<tr><td>$key</td><td><ol>";
+            foreach ($value as $subkey => $subvalue) {
+                echo "<li>$subvalue</li>";
+            }
+            echo "</ol></td></tr>";
+        } else {
+            echo "<tr><td>$key</td><td>$value</td></tr>";
+        }
+    }
+    if ($mode == "edit") {
+        if (is_array($value)) {
+            echo '<div class="row">
+						<div class="seven columns">
+							<fieldset>
+								<h5>' . $key . '</h5>';
+            foreach ($value as $subkey => $subvalue) {
+                echo "<label>$subkey</label><input  class='input-text' type='text' id='$key$subkey' name='$key" . '[' . $subkey . "]' value='$subvalue'/></tr>";
+            }
+            echo "</fieldset>
+						</div>
+					</div>";
+        } else {
+            if (strpos($key, "_") === 0) {
+                echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
+            } if (strpos($key, "has") === 0) {
+                echo "<label for='$key'><input type='checkbox' id='$key' name='$key' value='$value'> $key</label>";
+            } else {
+                echo "<label>$key</label><input  class='input-text' type='text' id='$key' name='$key' value='$value'/>";
+                if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") {
+                   echo "<a href='$value'>view</a>"; 
+                }
+                if ($key == 'abn') {
+                   echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>view abn</a>";
+                }
+            }
+        }
+    }
+    // 
 }
-require_once 'sag/src/Sag.php';
-$sag = new Sag();
-$sag->setDatabase("disclosr-agencies", true);
-//get an agency record as json/html, search by name/abn/id
+
+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?
-createAgencyDesignDoc();
-$rows = $sag->get('/_design/app/_view/byABN?include_docs=true')->body->rows; // &endkey='.$searchVar
-foreach ($rows as $row) {
-	echo "<table>";
-	echo '<tr> <td colspan="2"><h3>' . $row->doc->agencyName. "</h3></td></tr>";
-	echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
-	foreach ($row->doc as $key => $value) {
-		echo "<tr><td>$key</td><td>$value</td></tr>";
-	} // also show documents/URLs available
-	echo "</table>";
-}
 
+    $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.";
+        }
+    }
+
+    $mode = "edit";
+    $row = addDefaultFields(object_to_array($row));
+    if ($mode == "view") {
+        echo '<table width="100%">';
+        echo '<tr> <td colspan="2"><h3>' . $row['name'] . "</h3></td></tr>";
+        echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
+    }
+    if ($mode == "edit") {
+        ?>
+        <input  id="addfield" type="button" value="Add Field"/>
+        <script>
+            window.onload = function() {
+                $(document).ready(function() {
+                    // put all your jQuery goodness in here.
+                    // http://charlie.griefer.com/blog/2009/09/17/jquery-dynamically-adding-form-elements/
+                    $('#addfield').click(function() {
+                        var field_name=window.prompt("fieldname?","");
+                        if (field_name !="") {
+                            $('#submitbutton').before($('<span></span>')
+                            .append("<label>"+field_name+"</label>")
+                            .append("<input  class='input-text' type='text' id='"+field_name+"' name='"+field_name+"'/>")
+                        );
+                        }
+                    });
+                });
+            };
+        </script>
+        <form id="editform" class="nice" method="post">
+            <?php
+
+        }
+        foreach ($row as $key => $value) {
+            echo displayValue($key, $value, $mode);
+        }
+        if ($mode == "view") {
+            echo "</table>";
+        }
+        if ($mode == "edit") {
+            echo '<input id="submitbutton" type="submit"/></form>';
+        }
+    } else {
+
+        try {
+            $rows = $db->get_view("app", "showNamesABNs")->rows;
+            //print_r($rows);
+            foreach ($rows as $row) {
+                //   print_r($row);
+                echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
+                (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
+                . '</a></li>';
+            }
+        } catch (SetteeRestClientException $e) {
+            setteErrorHandler($e);
+        }
+    }
+    include_footer();
+    ?>

--- a/humans.txt
+++ /dev/null
@@ -1,8 +1,1 @@
-/* Foundation was made by ZURB, an interaction design and design strategy firm in Campbell, CA */
-/* zurb.com */
-/* humanstxt.org */
 
-/* SITE */
-  Standards: HTML5, CSS3
-  Components: jQuery, Orbit, Reveal
-  Software: Coda, Textmate, Git

--- a/import.php
+++ b/import.php
@@ -1,31 +1,34 @@
 <?php
-require_once 'sag/src/Sag.php';
-$sag = new Sag();
-$sag->setDatabase("disclosr-agencies", true);
-$file = "agencies.csv";
-$handle = fopen($file, "r");
-$fieldNames = Array();
-$line = 0;
-while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
-	if ($line == 0) {
-		$fieldNames = $data;
-	}
-	else {
-		$agency = Array();
-		$valueCount = 0;
-		foreach ($data as $value) {
-			if ($value != "") $agency[$fieldNames[$valueCount]] = $value;
-			$valueCount++;
-		}
-		$agency["lastScraped"] = "1/1/1970";
-		$agency["scrapeDepth"] = 1;
-		var_dump($agency);
-                $sag->post($agency);
-	}
-	$line++;
-	if ($line % 10000 == 0) echo "$line records... \n";
+
+require_once 'include/common.inc.php';
+try {
+    $server->create_db('disclosr-agencies');
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
 }
-fclose($handle);
-echo "Found a total of $line records in $file.\n";
+$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<br>";
+    } catch (SetteeRestClientException $e) {
+        setteErrorHandler($e);
+    }
+}
 ?>
 

--- /dev/null
+++ b/include/common.inc.php
@@ -1,1 +1,39 @@
+<?php
 
+include_once ('couchdb.inc.php');
+include_once ('template.inc.php');
+
+# Convert a stdClass to an Array. http://www.php.net/manual/en/language.types.object.php#102735
+
+function object_to_array(stdClass $Class) {
+    # Typecast to (array) automatically converts stdClass -> 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 @@
+<?php
 
+include "schemas/schemas.inc.php";
+
+function createAgencyDesignDoc() {
+    global $db;
+    $obj = new stdClass();
+    $obj->_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() . "<br>" . PHP_EOL;
+}
+
+?>
+

--- /dev/null
+++ b/include/template.inc.php
@@ -1,1 +1,75 @@
+<?php
 
+function include_header() {
+    ?>
+    <!DOCTYPE html>
+
+    <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
+    <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
+    <!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
+    <!--[if IE 8]>    <html class="no-js lt-ie9" lang="en"> <![endif]-->
+    <!--[if gt IE 8]><!--> <html lang="en"> <!--<![endif]-->
+        <head>
+            <meta charset="utf-8" />
+
+            <!-- Set the viewport width to device width for mobile -->
+            <meta name="viewport" content="width=device-width" />
+
+            <title>Disclosr</title>
+
+            <!-- Included CSS Files -->
+            <link rel="stylesheet" href="stylesheets/foundation.css">
+            <link rel="stylesheet" href="stylesheets/app.css">
+
+            <!--[if lt IE 9]>
+                    <link rel="stylesheet" href="stylesheets/ie.css">
+            <![endif]-->
+
+
+            <!-- IE Fix for HTML5 Tags -->
+            <!--[if lt IE 9]>
+                    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <![endif]-->
+
+        </head>
+        <body>
+
+            <!-- navBar -->
+            <div id="navbar" class="container">
+                <div class="row">
+                    <div class="four columns">
+                        <h1><a href="/">Disclosr</a></h1>
+                    </div>
+                    <div class="eight columns hide-on-phones">
+                        <strong class="right">
+                            <a href="getAgency.php">Agencies</a>
+                             <a href="about.php">About/FAQ</a>
+                        </strong>
+                    </div>
+                </div>
+            </div>
+            <!-- /navBar -->
+
+            <!-- container -->
+            <div class="container">
+            <?php }
+
+            function include_footer() { ?>
+            </div>
+            <!-- container -->
+
+
+
+
+            <!-- Included JS Files -->
+            <script src="javascripts/foundation.js"></script>
+            <script src="javascripts/app.js"></script>
+            <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
+
+        </body>
+    </html>
+
+<?php } 
+
+?>
+

--- a/lastUpdated.php
+++ /dev/null
@@ -1,2 +1,1 @@
-for each agency, record when last changed (number of days too) and show a couple of URLs that were in that change
 

--- /dev/null
+++ b/lib/FeedItem.php
@@ -1,1 +1,168 @@
+<?php
+ /**
+ * Univarsel Feed Writer
+ * 
+ * FeedItem class - Used as feed element in FeedWriter class
+ *
+ * @package         UnivarselFeedWriter
+ * @author          Anis uddin Ahmad <anisniit@gmail.com>
+ * @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 @@
-
+<?php
+// RSS 0.90  Officially obsoleted by 1.0
+// RSS 0.91, 0.92, 0.93 and 0.94  Officially obsoleted by 2.0
+// So, define constants for RSS 1.0, RSS 2.0 and ATOM 	
+
+	define('RSS1', 'RSS 1.0', true);
+	define('RSS2', 'RSS 2.0', true);
+	define('ATOM', 'ATOM', true);
+
+ /**
+ * Univarsel Feed Writer class
+ *
+ * Genarate RSS 1.0, RSS2.0 and ATOM Feed
+ *                             
+ * @package     UnivarselFeedWriter
+ * @author      Anis uddin Ahmad <anisniit@gmail.com>
+ * @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 <admin@ajaxray.com>
+  * @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  = '<?xml version="1.0" encoding="utf-8"?>' . "\n";
+		
+		if($this->version == RSS2)
+		{
+			$out .= '<rss version="2.0"
+					xmlns:content="http://purl.org/rss/1.0/modules/content/"
+					xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+				  >' . PHP_EOL;
+		}    
+		elseif($this->version == RSS1)
+		{
+			$out .= '<rdf:RDF 
+					 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+					 xmlns="http://purl.org/rss/1.0/"
+					 xmlns:dc="http://purl.org/dc/elements/1.1/"
+					>' . PHP_EOL;;
+		}
+		else if($this->version == ATOM)
+		{
+			$out .= '<feed xmlns="http://www.w3.org/2005/Atom">' . 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 '</channel>' . PHP_EOL . '</rss>'; 
+		}    
+		elseif($this->version == RSS1)
+		{
+			echo '</rdf:RDF>';
+		}
+		else if($this->version == ATOM)
+		{
+			echo '</feed>';
+		}
+	  
+	}
+
+	/**
+	* 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}><![CDATA[" : "<{$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))? "]]></$tagName>" : "</$tagName>";
+
+		return $nodeText . PHP_EOL;
+	}
+	
+	/**
+	* @desc     Print channels
+	* @access   private
+	* @return   void
+	*/
+	private function printChannels()
+	{
+		//Start channel tag
+		switch ($this->version) 
+		{
+		   case RSS2: 
+				echo '<channel>' . PHP_EOL;        
+				break;
+		   case RSS1: 
+				echo (isset($this->data['ChannelAbout']))? "<channel rdf:about=\"{$this->data['ChannelAbout']}\">" : "<channel rdf:about=\"{$this->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