From: Alexander Sadleir <maxious@lambdacomplex.org>
Date: Thu, 12 Jan 2012 09:26:34 +0000
Subject: Better graph, include social media in schema for agencies
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=37c23e5391b4f72ead17bf17882d1fcd76d64cbd
---
Better graph, include social media in schema for agencies


Former-commit-id: c8de24923a04e8b3ef19fcae4db577255ebef88f
---


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

--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,10 @@
-[submodule "sag"]
-	path = sag
-	url = git://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
+[submodule "lib/springy"]
+	path = lib/springy
+	url = https://github.com/dhotson/springy.git
 

--- /dev/null
+++ b/about.php
@@ -1,1 +1,61 @@
+<?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 receive 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 completely 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.
+
+Webpage Assessment
+Much due care has been put into correctly recording disclosure URLs. Typically the "About", "Corporate", "Publications" and "Sitemap" sections are checked at the very least. 
+Occasionally it is nessicary to use a site or Google search. In several rare cases, there is a secret "Disclosure" navigation menu you can find if you find one of the mandatory publishing obligations in that category (seriously).
+Some rules about leniency:
+    An empty FOI disclosure log counts, a page outlining what the FOI Act is does not.
+    A disclosure log in PDF or Word format counts :(
+    An empty File/Record list counts (although that's very minimalistic that you have no files, electronic or paper)
+    Only a current information publication scheme page counts, not a s.9 FOI Act page or an organisation chart.
+    If there isn't a page easily listing all current and past Annual Reports, the most current one (html, pdf) counts.
+    Consultancy contracts might not need it's own webpage (if in Annual Report), grants/appointments might not apply to all organisations but Legal Services Expenditure (and all other obligations) does need a webpage. 
+
+<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();
+?>

--- /dev/null
+++ b/admin/cacfma.csv
@@ -1,1 +1,191 @@
+AAF Company,82?008?629?490
+Aboriginal Hostels Limited ,47?008?504?587
+Administrative Appeals Tribunal,90?680?970?626
+Aged Care Standards and Accreditation Agency Ltd,64?079?618?652
+Airservices Australia  ,59?698?720?886
+Albury-Wodonga Development Corporation  ,71?893?478?442
+Anindilyakwa Land Council ,45?175?406?445
+Army and Air Force Canteen Service ,69?289?134?420
+ASC Pty Ltd ,64?008?605?034
+Attorney-General's Department,92?661?124?436
+Australia Business Arts Foundation Ltd ,88?072?479?835
+Australia Council,38?392?626?187
+Australian Agency for International Development (AusAID),62?921?558?838
+Australian Broadcasting Corporation,52?429?278?345
+Australian Bureau of Statistics,26?331?428?522
+Australian Centre for International Agricultural Research (ACIAR),34?864?955?427
+Australian Commission for Law Enforcement Integrity (ACLEI),78?796?734?093
+Australian Commission on Safety and Quality in Health Care,97250687371
+Australian Communications and Media Authority (ACMA),55?386?169?386
+Australian Competition and Consumer Commission,94?410?483?623
+Australian Crime Commission,11?259?448?410
+"Australian Curriculum, Assessment and Reporting Authority ",54?735?928?084
+Australian Customs and Border Protection Service,66?015?286?036
+Australian Electoral Commission,21?133?285?851
+Australian Federal Police,17?864?931?143
+"Australian Film, Television and Radio School",19?892?732?021
+Australian Fisheries Management Authority,81?098?497?517
+Australian Government Solicitor,69?405?937?639
+Australian Hearing Services ,80?308?797?003
+Australian Human Rights Commission,47?996?232?602
+Australian Industry Development,55?085?059?559
+Australian Institute for Teaching and School Leadership Limited,17?117?362?740
+Australian Institute of Aboriginal and Torres Strait Islander Studies,62?020?533?641
+Australian Institute of Criminology,63257175248
+Australian Institute of Family Studies (AIFS),64?001?053?079
+Australian Institute of Health and Welfare  ,16?515?245?497
+Australian Institute of Marine Science,78?961?616?230
+Australian Law Reform Commission,88913413914
+Australian Learning and Teaching Council Limited ,30?109?826?628
+Australian Maritime Safety Authority,65?377?938?320
+Australian Military Forces Relief Trust Fund ,52?168?913?646
+Australian National Audit Office ,33?020?645?631
+Australian National Maritime Museum,35?023?590?988
+Australian National Preventive Health Agency (ANPHA),33?965?140?953
+Australian National University,52?234?063?906
+Australian Nuclear Science and Technology Organisation ,47?956?969?590
+Australian Office of Financial Management (AOFM),13?059?525?039
+Australian Pesticides and Veterinary Medicines Authority (APVMA),19?495?043?447
+Australian Postal Corporation,28?864?970?579
+Australian Prudential Regulation Authority (APRA),79?635?582?658
+Australian Public Service Commission (APS Commission),99?470?863?260
+Australian Radiation Protection and Nuclear Safety Agency (ARPANSA),61?321?195?155
+Australian Rail Track Corporation Limited ,75?081?455?754
+Australian Reinsurance Pool Corporation,74?807?136?872
+Australian Research Council,35?201?451?156
+Australian River Co. Limited,94?008?654?206
+Australian Secret Intelligence Service,49?667?785?014
+Australian Securities and Investments Commission,86?768?265?615
+Australian Security Intelligence Organisation,37?467?566?201
+Australian Skills Quality Authority (National Vocational Education and Training Regulator),72581678650
+Australian Solar Institute Limited ,65138300688
+Australian Sports Anti-Doping Authority (ASADA),91?592?527?503
+Australian Sports Commission,67374695240
+Australian Sports Foundation Limited ,27?008?613?858
+Australian Strategic Policy Institute Limited ,77?097?369?045
+Australian Taxation Office,51?824?753?556
+Australian Trade Commission (Austrade),11?764?698?227
+Australian Transaction Reports and Analysis Centre (AUSTRAC),32?770?513?371
+Australian Transport Safety Bureau (ATSB),86?267?354?017
+Australian War Memorial ,64?909?221?257
+Bundanon Trust,72?058?829?217
+Bureau of Meteorology,92?637?533?532
+Cancer Australia,21?075?951?918
+Central Land Council,71?979?619?393
+Civil Aviation Safety Authority,44?808?014?470
+Coal Mining Industry (Long Service Leave Funding) Corporation,12?039?670?644
+Comcare  ,41?640?788?304
+Commonwealth Grants Commission,64?703?642?210
+Commonwealth Scientific and Industrial Research Organisation,41?687?119?230
+Commonwealth Superannuation Corporation ,48882817243
+ComSuper,77?310?752?950
+Corporations and Markets Advisory Committee (CAMAC),41?574?479?010
+Cotton Research and Development Corporation,71?054?238?316
+CrimTrac Agency,17?193?904?699
+Defence Housing Australia,72?968?504?934
+"Department of Agriculture, Fisheries and Forestry ",24?113?085?695
+"Department of Broadband, Communications and the Digital Economy",51?491?646?726
+Department of Climate Change and Energy Efficiency,50?182?626?845
+"Department of Education, Employment and Workplace Relations",63?578?775?294
+"Department of Families, Housing, Community Services and Indigenous Affairs",36?342?015?855
+Department of Finance and Deregulation,61?970?632?495
+Department of Foreign Affairs and Trade,47?065?634?525
+Department of Health and Ageing,83?605?426?759
+Department of Human Services,90?794?605?008
+Department of Immigration and Citizenship,33?380?054?835
+Department of Infrastructure and Transport,86?267?354?017
+"Department of Innovation, Industry, Science and Research",74?599?608?295
+Department of Parliamentary Services,52?997?141?147
+"Department of Regional Australia, Regional Development and Local Government",37?862?725?624
+"Department of Resources, Energy and Tourism",46?252?861?927
+"Department of Sustainability, Environment, Water, Population and Communities",34?190?894?983
+Department of the House of Representatives,18?526?287?740
+Department of the Prime Minister and Cabinet,18?108?001?191
+Department of the Senate,23?991?641?527
+Department of the Treasury,92?802?414?793
+Department of Veterans' Affairs,23?964?290?824
+Director of National Parks ,13?051?694?963
+Equal Opportunity for Women in the Workplace Agency,47?641?643?874
+Export Finance and Insurance Corporation,96?874?024?697
+Fair Work Australia (FWA),93?614?579?199
+Family Court of Australia,63?684?208?971
+Federal Court of Australia,49?110?847?399
+Federal Magistrates Court of Australia,60?265?617?271
+Fisheries Research and Development Corporation,74?311?094?913
+Food Standards Australia New Zealand,20?537?066?246
+Future Fund Management Agency,53?156?699?293
+General Practice Education and Training Limited,95?095?433?140
+Geoscience Australia,80?091?799?039
+Grains Research and Development Corporation ,55?611?223?291
+Grape and Wine Research and Development Corporation,72?618?007?571
+Great Barrier Reef Marine Park Authority,12?949?356?885
+Health Workforce Australia,21?295?050?589
+HIH Claims Support Limited,92?096?857?635
+IIF Investments Pty Limited,55?082?153?884
+Indigenous Business Australia,25?192?932?833
+Indigenous Land Corporation,59?912?679?254
+Insolvency and Trustee Service Australia (ITSA),63?384?330?717
+Inspector-General of Taxation,51?248?702?319
+Interim Independent Hospital Pricing Authority,27598959960
+IP Australia,38?113?072?755
+Low Carbon Australia Limited,63?097?727?968
+Medibank Private Limited ,47?080?890?259
+Migration Review Tribunal and Refugee Review Tribunal ,50?760?799?564
+Murray-Darling Basin Authority,13?679?821?382
+National Archives of Australia,36?889?228?992
+National Australia Day Council Limited ,76?050?300?626
+National Blood Authority,87?361?602?478
+National Breast and Ovarian Cancer Centre,85?094?118?902
+National Capital Authority,75?149?374?427
+National Competition Council ,56?552?760?098
+National Film and Sound Archive,41?251?017?588
+National Gallery of Australia,27?855?975?449
+National Health and Medical Research Council (NHMRC),88?601?010?284
+National Library of Australia ,28?346?858?075
+National Museum of Australia ,70?592?297?967
+National Native Title Tribunal,70?238?042?351
+National Offshore Petroleum Safety Authority (NOPSA),22?385?178?289
+National Water Commission ,94?364?176?431
+NBN Co Limited,86?136?533?741
+Northern Land Council,56?327?515?336
+Office of National Assessments,87?904?367?991
+Office of Parliamentary Counsel,41?425?630?817
+Office of the Auditing and Assurance Standards Board ,80?959?780?601
+Office of the Australian Accounting Standards Board (AASB),92?702?019?575
+Office of the Australian Building and Construction Commissioner,68?003?725?098
+Office of the Australian Information Commissioner ,85249230937
+Office of the Commonwealth Ombudsman,53?003?678?148
+Office of the Director of Public Prosecutions,41?036?606?436
+Office of the Fair Work Ombudsman,71?141?751?477
+Office of the Inspector-General of Intelligence and Security,67?332?668?643
+Office of the Official Secretary to the Governor-General,67?582?329?284
+Office of the Renewable Energy Regulator,68?574?011?917
+Old Parliament House,30?620?774?963
+Organ and Tissue Authority (Australian Organ and Tissue Donation and Transplantation Authority),56?253?405?315
+Outback Stores Pty Ltd ,63120661234
+Private Health Insurance Administration Council ,50?831?782?014
+Private Health Insurance Ombudsman,61?673?137?709
+Productivity Commission,78?094?372?050
+Professional Services Review Scheme,45?307?308?260
+RAAF Welfare Recreational Company ,45?008?499?303
+Reserve Bank of Australia,50?008?559?486
+Royal Australian Air Force Veterans' Residences Trust Fund ,40?594?141?285
+Royal Australian Air Force Welfare Trust Fund ,24?616?803?717
+Royal Australian Mint,45?852?104?259
+Royal Australian Navy Central Canteens Board,50?616?294?781
+Royal Australian Navy Relief Trust Fund ,49?934?525?476
+Rural Industries Research and Development Corporation,25?203?754?319
+Safe Work Australia,81?840?374?163
+Screen Australia ,46?741?353?180
+"Seafarers Safety, Rehabilitation and Compensation Authority (Seacare Authority)",32?745?854?352
+Special Broadcasting Service Corporation,91?314?398?574
+Sugar Research and Development Corporation,41?343?997?980
+Sydney Harbour Federation Trust,14?178?614?905
+Tertiary Education Quality and Standards Agency,50658250012
+Tiwi Land Council,86?106?441?085
+Torres Strait Regional Authority,57?155?285?807
+Tourism Australia ,99?657?548?712
+Wheat Exports Australia,40?485?918?341
+Wine Australia Corporation ,59?728?300?326
+Wreck Bay Aboriginal Community Council,62?564?797?956
 

--- /dev/null
+++ b/admin/import.php
@@ -1,1 +1,34 @@
+<?php
 
+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<br>";
+    } catch (SetteeRestClientException $e) {
+        setteErrorHandler($e);
+    }
+}
+?>
+

--- /dev/null
+++ b/admin/verify.php
@@ -1,1 +1,56 @@
+<?php
 
+include_once('include/common.inc.php');
+include_header();
+
+$db = $server->get_db('disclosr-agencies');
+$docs = Array();
+try {
+    $rows = $db->get_view("app", "byABN")->rows;
+    //print_r($rows);
+    foreach ($rows as $row) {
+        $docs["a" . $row->key] = $row->value;
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
+//print_r($docs);
+$row = 1;
+if (($handle = fopen("cacfma.csv", "r")) !== FALSE) {
+    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
+        $row++;
+        echo $data[0] . "   " . str_replace("?", "", $data[1]) . "<br />\n";
+        $name = $data[0];
+        $abn = trim(str_replace("?", "", $data[1]));
+        $aabn = "a".$abn;
+        if (isset($docs[$aabn])) {
+            echo "Existing agency ABN detected<br>";
+            if (!in_array($name, object_to_array($docs[$aabn]->otherNames)) && $name != $docs[$aabn]->name) {
+                $docs[$aabn]->otherNames[] = $name;
+                try {
+                    $docs[$aabn] = $db->save($docs[$aabn]);
+                    //print_r($doc);
+                    echo $abn . " additional names imported \n<br>";
+                } catch (SetteeRestClientException $e) {
+                    setteErrorHandler($e);
+                }
+            }
+        } else {
+            echo "New agency ABN detected<br>";
+            $agency['_id'] = md5($aabn);
+            $agency['name'] = $name;
+            $agency["abn"] = $abn;
+            try {
+                $doc = $db->save($agency);
+                print_r($doc);
+                echo $abn . " imported \n<br>";
+            } catch (SetteeRestClientException $e) {
+                setteErrorHandler($e);
+            }
+        }
+        echo "<hr>";
+    }
+    fclose($handle);
+}
+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,"","","","","","","",""
+

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

--- a/getAgency.php
+++ b/getAgency.php
@@ -1,57 +1,166 @@
 <?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) {
+    global $db;
+    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'/>";
+            } else if ($key == "parentOrg") {
+                echo "<label for='$key'>$key</label><select  id='$key' name='$key'>";
+                  $rows = $db->get_view("app", "byDeptStateName")->rows;
+    //print_r($rows);
+    foreach ($rows as $row) {
+        echo "<option value='{$row->value}'".(($row->value == $value) ? "SELECTED":"")." >".str_replace("Department of ","",$row->key)."</option>";
+    }
+    echo" </select>";
+            } else if (strpos($key, "has") === 0) {
+                echo "<label for='$key'><input type='checkbox' id='$key' name='$key' ".(($value=='true')?"checked='$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) {
+    global $schemas;
+    $defaultFields = array_keys($schemas['agency']['properties']);
+    foreach ($defaultFields as $defaultField) {
+        if (!isset($row[$defaultField])) {
+            if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
+                if (strpos($defaultField, "has") === 0) {
+            $row[$defaultField] = "false";
+                
+                } else {
+            $row[$defaultField] = "";
+                }
+            
+            }
+             if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
+                
+            $row[$defaultField] = Array("");
+            }
+        }
+    }
+    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>';
+            }*/
+            $rows = $db->get_view("app", "byName")->rows;
+            //print_r($rows);
+            foreach ($rows as $row) {
+                //   print_r($row);
+                echo '<li><a href="getAgency.php?id=' . $row->value . '">' .
+                $row->key
+                . '</a></li>';
+            }
+        } catch (SetteeRestClientException $e) {
+            setteErrorHandler($e);
+        }
+    }
+    include_footer();
+    ?>

--- /dev/null
+++ b/graph.php
@@ -1,1 +1,58 @@
+<?php
+include_once('include/common.inc.php');
+//include_header();
+?>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
+<script src="lib/springy/springy.js"></script>
+<script src="lib/springy/springyui.js"></script>
+<script>
+    var graph = new Graph();
+    var nodes = [];
+<?php
+$db = $server->get_db('disclosr-agencies');
+echo "nodes[\"fedg\"] = graph.newNode({label: \"Federal Government - Commonwealth of Australia\"});" . PHP_EOL;
+try {
+    $rows = $db->get_view("app", "byCanonicalName", null, true)->rows;
+    //print_r($rows);
+    foreach ($rows as $row) {
+        echo "nodes[\"{$row->value}\"] = graph.newNode({label: \"{$row->key}\"});" . PHP_EOL;
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
 
+try {
+    $rows = $db->get_view("app", "byDeptStateName", null, true)->rows;
+    //print_r($rows);
+    foreach ($rows as $row) {
+        echo "graph.newEdge(nodes[\"fedg\"], nodes['{$row->value}'], {color: '#00A0B0'});" . PHP_EOL;
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
+
+try {
+    $rows = $db->get_view("app", "parentOrgs", null, true)->rows;
+    //   print_r($rows);
+    foreach ($rows as $row) {
+        echo "graph.newEdge(nodes[\"{$row->key}\"], nodes['{$row->value}'], {color: '#FFA0B0'});" . PHP_EOL;
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
+?>
+    window.onload = function() {
+        $(document).ready(function() {
+            var springy = $('#springydemo').springy({
+                graph: graph
+            });
+        });
+    };
+</script>
+
+<canvas id="springydemo" width="1260" height="680" />
+<?php
+//include_footer();
+?>
+
+

--- a/import.php
+++ /dev/null
@@ -1,31 +1,1 @@
-<?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";
-}
-fclose($handle);
-echo "Found a total of $line records in $file.\n";
-?>
 

--- /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,85 @@
+<?php
 
+include "schemas/schemas.inc.php";
+
+function createAgencyDesignDoc() {
+    global $db;
+    $obj = new stdClass();
+    $obj->_id = "_design/" . urlencode("app");
+    $obj->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) {  
+            if (doc.parentOrg || doc.orgType == 'FMA-DepartmentOfState') {
+        emit(doc.name, doc._id); 
+        }
+};";
+        $obj->views->byDeptStateName->map = "function(doc) {  
+            if (doc.orgType == 'FMA-DepartmentOfState') {
+        emit(doc.name, doc._id); 
+        }
+};";
+        $obj->views->parentOrgs->map = "function(doc) {
+            if (doc.parentOrg) {
+        emit(doc._id, doc.parentOrg);
+        }
+};";
+    $obj->views->byName->map = "function(doc) {  
+        emit(doc.name, doc._id); 
+ for (name in doc.otherNames) {
+if (doc.otherNames[name] != '' && doc.otherNames[name] != doc.name) {
+       	 emit(doc.otherNames[name], doc._id); 
+}
+        }
+};";
+    $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}); };";
+    $obj->views->getConflicts->map = "function(doc) {
+  if (doc._conflicts) {
+    emit(null, [doc._rev].concat(doc._conflicts));
+  }
+}";
+    // 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;
+if (typeof(doc["status"]) == "undefined" || doc["status"] != "suspended") {
+for(var propName in doc) {
+      if(typeof(doc[propName]) != "undefined" && propName.startsWith("l")) {
+  	count++
+	}
+}
+  emit(count+doc._id, {id: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');
+
+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.1.8:5984');
+} else {
+    $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 } 
+
+?>
+

--- /dev/null
+++ b/javascripts/app.js
@@ -1,1 +1,95 @@
+/* Foundation v2.1.4 http://foundation.zurb.com */
+$(document).ready(function () {
 
+	/* Use this js doc for all application specific JS */
+
+	/* TABS --------------------------------- */
+	/* Remove if you don't need :) */
+
+	function activateTab($tab) {
+		var $activeTab = $tab.closest('dl').find('a.active'),
+				contentLocation = $tab.attr("href") + 'Tab';
+
+		//Make Tab Active
+		$activeTab.removeClass('active');
+		$tab.addClass('active');
+
+    	//Show Tab Content
+		$(contentLocation).closest('.tabs-content').children('li').hide();
+		$(contentLocation).show();
+	}
+
+	$('dl.tabs').each(function () {
+		//Get all tabs
+		var tabs = $(this).children('dd').children('a');
+		tabs.click(function (e) {
+			activateTab($(this));
+		});
+	});
+
+	if (window.location.hash) {
+		activateTab($('a[href="' + window.location.hash + '"]'));
+	}
+
+	/* ALERT BOXES ------------ */
+	$(".alert-box").delegate("a.close", "click", function(event) {
+    event.preventDefault();
+	  $(this).closest(".alert-box").fadeOut(function(event){
+	    $(this).remove();
+	  });
+	});
+
+
+	/* PLACEHOLDER FOR FORMS ------------- */
+	/* Remove this and jquery.placeholder.min.js if you don't need :) */
+
+	$('input, textarea').placeholder();
+
+
+
+	/* UNCOMMENT THE LINE YOU WANT BELOW IF YOU WANT IE6/7/8 SUPPORT AND ARE USING .block-grids */
+//	$('.block-grid.two-up>li:nth-child(2n+1)').css({clear: 'left'});
+//	$('.block-grid.three-up>li:nth-child(3n+1)').css({clear: 'left'});
+//	$('.block-grid.four-up>li:nth-child(4n+1)').css({clear: 'left'});
+//	$('.block-grid.five-up>li:nth-child(5n+1)').css({clear: 'left'});
+
+
+
+	/* DROPDOWN NAV ------------- */
+
+	var currentFoundationDropdown = null;
+	$('.nav-bar li a, .nav-bar li a:after').each(function() {
+		$(this).data('clicks', 0);
+	});
+	$('.nav-bar li a, .nav-bar li a:after').live('click', function(e) {
+		e.preventDefault();
+		if (currentFoundationDropdown !== $(this).index() || currentFoundationDropdown === null) {
+			$(this).data('clicks', 0);
+			currentFoundationDropdown = $(this).index();
+		}
+		$(this).data('clicks', ($(this).data('clicks') + 1));
+		var f = $(this).siblings('.flyout');
+		if (!f.is(':visible') && $(this).parent('.has-flyout').length > 1) {
+			$('.nav-bar li .flyout').hide();
+			f.show();
+		} else if (($(this).data('clicks') > 1) || ($(this).parent('.has-flyout').length < 1)) {
+			window.location = $(this).attr('href');
+		}
+	});
+	$('.nav-bar').live('click', func