From: Maxious Date: Wed, 26 Sep 2012 12:43:09 +0000 Subject: fix unwanted schema calls X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=14c16f319fe1b054a2e122bec91ded2f57fd5a95 --- fix unwanted schema calls Former-commit-id: 9d266fd87ed07650704948b36f2ca15865b40869 --- --- a/.gitmodules +++ b/.gitmodules @@ -4,13 +4,28 @@ [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 [submodule "lib/php-diff"] path = lib/php-diff url = https://github.com/chrisboulton/php-diff.git -[submodule "javascripts/flot"] - path = javascripts/flot - url = https://github.com/paradoxxxzero/flot.git +[submodule "lib/Requests"] + path = lib/Requests + url = https://github.com/rmccue/Requests.git +[submodule "js/flotr2"] + path = js/flotr2 + url = https://github.com/HumbleSoftware/Flotr2.git +[submodule "lib/phpquery"] + path = lib/phpquery + url = https://github.com/TobiaszCudnik/phpquery.git +[submodule "js/sigma"] + path = js/sigma + url = https://github.com/jacomyal/sigma.js.git +[submodule "js/bubbletree"] + path = js/bubbletree + url = https://github.com/okfn/bubbletree.git +[submodule "lib/querypath"] + path = lib/querypath + url = https://github.com/technosophos/querypath.git +[submodule "lib/amon-php"] + path = lib/amon-php + url = https://github.com/martinrusev/amon-php.git --- a/about.php +++ b/about.php @@ -1,17 +1,19 @@

About/FAQ

Lorem ipsum.

What is this?

-Disclosr is a project to monitor Australian Federal Government agencies -compliance with their "proactive disclosure requirements". -OGRE (Open Government Realization Evaluation) is a ranking of compliance with these requirements. -Prometheus is the agent which polls agency websites to assess compliance. - +Disclo.gs is a project to monitor Australian Federal Government agencies +compliance with their "proactive disclosure requirements" to make a transparency league table as suggested by gov2 taskforce http://gov2.net.au/blog/2009/09/19/a-league-ladder-of-psi-openness/. +

Attributions

+National Archives of Australia, Australian Governments’ Interactive Functions Thesaurus, 2nd edition, September 2005, published at http://www.naa.gov.au/recordkeeping/thesaurus/index.htm
+data.gov.au http://data.gov.au/dataset/directory-gov-au-full-data-export/
+directory.gov.au
+australia.gov.au http://australia.gov.au/about/copyright

Open everything

All documents released CC-BY 3 AU Open source git @ @@ -22,6 +24,8 @@ 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
+ +Fraud in gov depts by Fairfax Media http://www.smh.com.au/national/public-service-keeps-fraud-cases-private-20110923-1kpdr.html 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. --- /dev/null +++ b/admin/0203apsemployees.csv @@ -1,1 +1,75 @@ +"Agriculture, Fisheries & Forestry",3530 +Attorney-Generals,708 +Administrative Appeals Tribunal,108 +AUSTRAC,60 +Australian Crime Commission,225 +Australian Customs Service,4934 +Australian Protective Service,1124 +CrimTrac Agency,34 +Family Court of Australia,574 +Federal Court of Australia,221 +Federal Magistrates Service,46 +Federal Privacy Commissioner,32 +HREOC,79 +ITSA,227 +National Native Title Tribunal,241 +Office of the D.P.P.,403 +Office of Film & Literature Class,39 +Office of the Parl. Counsel,45 +Communications IT & the Arts,776 +Aust. Broadcasting Authority,114 +Aust. Communications Authority,391 +Aust. National Maritime Museum,90 +National Archives of Australia,363 +National Library of Australia,443 +National Museum of Australia,185 +NOIE,160 +Defence,18231 +Defence Housing Authority,661 +DEST,1464 +Australian Research Council,50 +DEWR,2055 +EOWA,11 +Australian Industrial Registry,185 +Comcare,300 +NOHSC,89 +Environment and Heritage,1271 +Australian Greenhouse Office,167 +Bureau of Meteorology,1403 +GBRMPA,153 +National Oceans Office,31 +Family and Community Services,4832 +Aust. Institute of Family Studies,39 +Centrelink,25147 +Finance and Administration,771 +Australian Electoral Comm.,729 +ComSuper,338 +Foreign Affairs & Trade,2763 +ACIAR,44 +Health & Ageing,5137 +Aust. Institute of Health & Welfare,152 +ARPANSA,126 +FSANZ,110 +PSR,25 +DIMIA,4089 +Aboriginal Hostels Ltd.,341 +ATSIC,1072 +AIATSIS,62 +Torres Strait Regional Authority,30 +Industry Tourism & Resources,2691 +Prime Minister & Cabinet,344 +ANAO,278 +Commonwealth Ombudsman,78 +Office of National Assessments,47 +APS Commission,164 +Transport & Regional Services,945 +National Capital Authority,76 +Treasury,906 +Australian Bureau of Statistics,3024 +ACCC,446 +ASIC,1048 +Australian Taxation Office,20238 +Productivity Commission,197 +Veterans Affairs,2335 +Australian War Memorial,215 --- /dev/null +++ b/admin/0304apsemployees.csv @@ -1,1 +1,78 @@ +"Agriculture, Fisheries and Forestry",3928 +Attorney-General's,781 +Administrative Appeals Tribunal,117 +AUSTRAC,61 +Australian Crime Commission,315 +Australian Customs Service,4736 +Australian Protective Service,1234 +CrimTrac Agency,44 +Family Court of Australia,608 +Federal Court of Australia,238 +Federal Magistrates Service,56 +Federal Privacy Commissioner,29 +HREOC,84 +ITSA,240 +National Native Title Tribunal,243 +Office of the D.P.P.,416 +Office of Film & Literature Class.,37 +Office of Parliamentary Counsel,46 +Communications IT & the Arts,607 +Aust. Broadcasting Authority,114 +Aust. Communications Authority,407 +Australian Film Commission,176 +AGIMO,95 +Aust. National Maritime Museum,93 +National Archives of Australia,386 +National Library of Australia,438 +National Museum of Australia,186 +Defence,18301 +Defence Housing Authority,679 +DEST,1684 +Australian Research Council,53 +DEWR,2171 +Australian Industrial Registry,188 +Comcare,325 +EOWA,10 +NOHSC,89 +Environment and Heritage,1276 +Australian Greenhouse Office,166 +Bureau of Meteorology,1371 +GBRMPA,162 +National Oceans Office,39 +Family and Community Services,4818 +Aust. Institute of Family Studies,38 +Centrelink,24904 +Finance and Administration,895 +Australian Electoral Comm.,765 +ComSuper,329 +Foreign Affairs and Trade,2809 +ACIAR,40 +Health and Ageing,5365 +Aust. Institute of Health & Welfare,157 +ARPANSA,117 +FSANZ,104 +National Blood Authority,33 +OPSR,27 +DIMIA,4487 +Aboriginal Hostels Ltd.,291 +AIATSIS,59 +ATSIC,24 +ATSIS,1109 +Torres Strait Regional Authority,34 +"Industry, Tourism & Resources",2878 +Prime Minister & Cabinet,372 +ANAO,287 +APS Commission,172 +Commonwealth Ombudsman,82 +Office of National Assessments,51 +Transport & Regional Services,885 +National Capital Authority,68 +Treasury,984 +Australian Bureau of Statistics,2866 +ACCC,450 +ASIC,1137 +Australian Taxation Office,20501 +Productivity Commission,183 +Veterans' Affairs,2356 +Australian War Memorial,196 --- /dev/null +++ b/admin/0405apsemployees.csv @@ -1,1 +1,88 @@ +"Agriculture, Fisheries & Forestry ",1297 +AQIS,3028 +Attorney-Generals ,1011 +Administrative Appeals Tribunal,154 +AUSTRAC,137 +Australian Crime Commission,412 +Australian Customs Service,5054 +Commonwealth DPP,451 +CrimTrac Agency,51 +Family Court of Australia,737 +Federal Court of Australia,403 +Federal Magistrates Service,102 +Federal Privacy Commissioner,40 +HREOC,95 +ITSA,275 +National Native Title Tribunal,265 +Office of Film & Literature Class,41 +Office of the Parl. Counsel,43 +"Communications, IT & the Arts ",804 +Aust. Broadcasting Authority,106 +Aust. Communications Authority,416 +Australian Film Commission,167 +Aust. National Maritime Museum,114 +National Archives of Australia,514 +National Library of Australia,523 +National Museum of Australia,260 +Defence ,18638 +Defence Housing Authority,685 +DEST ,2001 +Australian Research Council,71 +Questacon,211 +DEWR ,3141 +Australian Industrial Registry,202 +Comcare,384 +EOWA,28 +Environment & Heritage ,1852 +Bureau of Meteorology,1442 +GBRMPA,170 +ORER,11 +Family & Community Services ,1949 +Aust. Institute of Family Studies,66 +Finance & Administration ,1297 +Australian Electoral Comm.,808 +Commonwealth Grants Commission,40 +ComSuper,393 +Foreign Affairs & Trade ,2468 +ACIAR,47 +AusAID,615 +Health & Ageing ,4220 +Aust. Institute of Health & Welfare,215 +ARPANSA,130 +FSANZ,121 +National Blood Authority,40 +Professional Services Review,18 +Human Services ,37 +Centrelink,25317 +Child Support Agency,3238 +CRS Australia,1998 +Immigration ,5769 +Aboriginal Hostels Ltd.,458 +AIATSIS,116 +Migration Review Tribunal,132 +Refugee Review Tribunal,176 +Torres Strait Regional Authority,48 +"Industry, Tourism & Resources ",1906 +Geoscience Australia,635 +IP Australia,821 +NOPSA,28 +Prime Minister & Cabinet ,402 +ANAO,313 +Australian Public Service Commission,211 +Commonwealth Ombudsman,113 +National Water Commission,27 +Office of National Assessments,93 +Transport & Regional Services ,1178 +National Capital Authority,91 +Treasury ,885 +Australian Bureau of Statistics,3095 +ACCC,509 +AOFM,33 +ASIC,1494 +Australian Taxation Office,23417 +National Competition Council,11 +Productivity Commission,200 +Royal Australian Mint,117 +Veterans Affairs ,2655 +Australian War Memorial,310 --- /dev/null +++ b/admin/0506apsemployees.csv @@ -1,1 +1,90 @@ +"Agriculture, Fisheries & Forestry",1498 +AQIS,3289 +Attorney-Generals,1226 +Administrative Appeals Tribunal,156 +AUSTRAC,141 +Australian Crime Commission,425 +Australian Customs Service,5574 +CrimTrac Agency,53 +Family Court of Australia,765 +Federal Court of Australia,412 +Federal Magistrates Service,112 +Federal Privacy Commissioner,44 +HREOC,102 +ITSA,270 +National Native Title Tribunal,244 +Commonwealth DPP,469 +Office of Film & Literature Class,49 +Office of the Parl. Counsel,46 +"Communications, IT & the Arts",833 +Australian Communications & Media Authority,497 +Australian Film Commission,255 +Australian National Maritime Museum,107 +Australian Sports Anti-Doping Authority,46 +National Archives of Australia,467 +National Library of Australia,499 +National Museum of Australia,301 +Defence,19791 +Defence Housing Authority,699 +DEST,2359 +AIATSIS,128 +Australian Research Council,69 +Questacon,230 +DEWR,3853 +Australian Building and Construction Commission,85 +Australian Fair Pay Commission,11 +Australian Industrial Registry,175 +Comcare,379 +EOWA,30 +Office of Workplace Services,188 +Environment & Heritage,2060 +Bureau of Meteorology,1404 +GBRMPA,172 +ORER,11 +FaCSIA,2589 +Aboriginal Hostels Ltd.,489 +Australian Institute of Family Studies,53 +Torres Strait Regional Authority,72 +Finance & Administration,1409 +Australian Electoral Commission,790 +Commonwealth Grants Commission,41 +ComSuper,435 +Foreign Affairs & Trade,2551 +ACIAR,50 +AusAID,706 +Health & Ageing,4301 +Australian Institute of Health & Welfare,203 +ARPANSA,136 +FSANZ,125 +National Blood Authority,52 +Professional Services Review,14 +Human Services,5545 +Centrelink,26549 +Medicare Australia,5393 +Immigration,6341 +Migration Review Tribunal,103 +Refugee Review Tribunal,161 +"Industry, Tourism & Resources",1979 +Geoscience Australia,669 +IP AUSTRALIA,888 +NOPSA,34 +Prime Minister & Cabinet,590 +ANAO,308 +Australian Public Service Commission,253 +Commonwealth Ombudsman,141 +National Water Commission,45 +Office of National Assessments,122 +Transport & Regional Services,1327 +National Capital Authority,95 +Treasury,915 +Australian Bureau of Statistics,3511 +ACCC,582 +AOFM,39 +ASIC,1540 +Australian Taxation Office,22568 +National Competition Council,9 +Productivity Commission,205 +Royal Australian Mint,145 +Veterans Affairs,2521 +Australian War Memorial,316 --- /dev/null +++ b/admin/0607apsemployees.csv @@ -1,1 +1,92 @@ +"Agriculture, Fisheries & Forestry",4951 +Attorney-Generals,1504 +Administrative Appeals Tribunal,162 +AUSTRAC,247 +ACLEI,6 +Australian Crime Commission,554 +Australian Customs Service,5904 +CrimTrac Agency,81 +Family Court of Australia,727 +Federal Court of Australia,401 +Federal Magistrates Court,160 +Federal Privacy Commissioner,58 +HREOC,116 +ITSA,285 +National Native Title Tribunal,244 +Commonwealth DPP,497 +Office of the Parl. Counsel,48 +"Communications, IT & the Arts",914 +ACMA,552 +Australian Film Commission,244 +Aust. National Maritime Museum,109 +ASADA,55 +National Archives of Australia,465 +National Library of Australia,521 +National Museum of Australia,282 +Defence,21177 +Defence Housing Australia,699 +DEST,2470 +AIATSIS,114 +Australian Research Council,73 +Questacon,231 +DEWR,3862 +ABCC,128 +Australian Fair Pay Commission,28 +Australian Industrial Registry,175 +Comcare,426 +EOWA,21 +Office of Workplace Services,303 +Environment & Water Resources,2292 +Bureau of Meteorology,1451 +GBRMPA,171 +ORER,11 +FaCSIA,3099 +Aboriginal Hostels Ltd.,491 +Aust. Institute of Family Studies,59 +Torres Strait Regional Authority,76 +Finance & Administration,1514 +Australian Electoral Commission,886 +Commonwealth Grants Commission,41 +ComSuper,595 +Future Fund Management Agency,12 +Foreign Affairs & Trade,2784 +ACIAR,52 +AusAID,775 +Austrade,515 +Health & Ageing,4830 +Aust. Institute of Health & Welfare,211 +ARPANSA,134 +Cancer Australia,26 +FSANZ,131 +National Blood Authority,50 +NHMRC,221 +Professional Services Review,16 +Human Services,6433 +Centrelink,27296 +Medicare Australia,5959 +Immigration,6788 +MRT/RRT,304 +"Industry, Tourism & Resources",2075 +Geoscience Australia,682 +IP AUSTRALIA,913 +NOPSA,42 +Prime Minister & Cabinet,711 +ANAO,330 +Australian Public Service Commission,250 +Commonwealth Ombudsman,153 +National Water Commission,32 +Office of National Assessments,133 +Transport & Regional Services,1330 +National Capital Authority,106 +Treasury,996 +Australian Bureau of Statistics,3167 +ACCC,647 +AOFM,33 +ASIC,1664 +Australian Taxation Office,23110 +National Competition Council,9 +Productivity Commission,207 +Royal Australian Mint,181 +Veterans' Affairs,2401 +Australian War Memorial,293 --- /dev/null +++ b/admin/0708apsemployees.csv @@ -1,1 +1,98 @@ +"Agriculture, Fisheries & Forestry",4785 +APVMA,130 +Export Wheat Commission,15 +Attorney-General's,1420 +Administrative Appeals Tribunal,114 +ACLEI,11 +AUSTRAC,332 +Australian Crime Commission,495 +Australian Customs Service,6106 +CrimTrac Agency,138 +Family Court of Australia,558 +Federal Court of Australia,261 +Federal Magistrates Court,141 +HREOC,93 +ITSA,270 +National Capital Authority,47 +National Native Title Tribunal,217 +Commonwealth DPP,509 +Office of the Parl. Counsel,50 +DBCDE,559 +ACMA,569 +Climate Change,218 +ORER,10 +Defence,20819 +Defence Housing Australia,565 +DEEWR,5619 +ABCC,137 +Australian Fair Pay Commission,25 +Australian Industrial Registry,157 +AIATSIS,48 +Comcare,469 +Office of the Workplace Ombudsman,365 +Workplace Authority,610 +"Environment, Water, Heritage and the Arts",2333 +Australian Film Commission,256 +Aust. National Maritime Museum,105 +Bureau of Meteorology,1265 +GBRMPA,184 +National Library of Australia,444 +National Museum of Australia,226 +National Water Commission,29 +FaHCSIA,2810 +Aboriginal Hostels Ltd.,362 +EOWA,17 +Torres Strait Regional Authority,36 +Finance & Deregulation,1349 +Australian Electoral Comm.,697 +ComSuper,533 +Future Fund Management Agency,38 +National Archives of Australia,390 +Foreign Affairs & Trade,2665 +ACIAR,32 +AusAID,801 +AUSTRADE,485 +Health & Ageing,4445 +Aust. Institute of Health & Welfare,228 +Australian Sports Anti-Doping Authority,60 +ARPANSA,132 +Cancer Australia,22 +FSANZ,118 +National Blood Authority,44 +NHMRC,209 +Private Health Insurance Ombudsman,11 +Professional Services Review,19 +Human Services,5951 +Centrelink,25416 +Medicare Australia,5593 +Immigration,6495 +RRT and MRT,270 +Infrastructure,1225 +DIISR,1656 +Australian Research Council,87 +IP AUSTRALIA,968 +Questacon,82 +Prime Minister & Cabinet,483 +Aust. Institute of Family Studies,42 +ANAO,307 +Australian Public Service Commission,201 +Commonwealth Ombudsman,155 +Federal Privacy Commissioner,61 +OIGIS,9 +Office of National Assessments,96 +"Resources, Energy and Tourism",329 +Geoscience Australia,611 +NOPSA,49 +Treasury,973 +Australian Bureau of Statistics,2858 +ACCC,658 +AOFM,30 +ASIC,1451 +Australian Taxation Office,22486 +Commonwealth Grants Commission,39 +National Competition Council,7 +Productivity Commission,179 +Royal Australian Mint,146 +Veterans' Affairs,2250 +Australian War Memorial,228 --- /dev/null +++ b/admin/0809apsemployees.csv @@ -1,1 +1,103 @@ +"Agriculture, Fisheries & Forestry",5168 +Australian Fisheries Management Authority,260 +APVMA,161 +Wheat Exports Australia,17 +Attorney-General's,1663 +Administrative Appeals Tribunal,155 +ACLEI,18 +AUSTRAC,343 +Australian Crime Commission,527 +Australian Customs and Border Protection Service,6031 +CrimTrac Agency,187 +Family Court of Australia,669 +Federal Court of Australia,376 +Federal Magistrates Court,213 +HREOC,122 +ITSA,294 +National Capital Authority,58 +National Native Title Tribunal,246 +Commonwealth DPP,614 +Office of Parliamentary Counsel,50 +DBCDE,651 +ACMA,624 +Climate Change,415 +ORER,21 +Defence,21152 +Defence Housing Australia,728 +DEEWR,5996 +ABCC,156 +Australian Fair Pay Commission Secretariat,29 +Australian Industrial Registry,203 +Comcare,570 +Office of the Workplace Ombudsman,484 +Workplace Authority,470 +"Environment, Water, Heritage and the Arts",3392 +Australian National Maritime Museum,119 +Bureau of Meteorology,1545 +GBRMPA,241 +Murray Darling Basin Authority,235 +National Library of Australia,513 +National Museum of Australia,295 +National Film and Sound Archive,235 +National Water Commission,48 +Screen Australia,78 +FaHCSIA,3455 +Aboriginal Hostels Ltd.,519 +EOWA,31 +Torres Strait Regional Authority,77 +Finance & Deregulation,1706 +Australian Electoral Commission,805 +ComSuper,574 +Future Fund Management Agency,57 +National Archives of Australia,506 +Foreign Affairs & Trade,2984 +ACIAR,48 +AusAID,981 +AUSTRADE,524 +Health & Ageing,4912 +Australian Institute of Health & Welfare,265 +AOTDTA,15 +Australian Sports Anti-Doping Authority,60 +ARPANSA,152 +Cancer Australia,25 +FSANZ,123 +National Blood Authority,42 +NHMRC,238 +Private Health Insurance Ombudsman,10 +Professional Services Review,30 +Human Services,6620 +Centrelink,27973 +Medicare Australia,5844 +Immigration & Citizenship,7052 +MRT & RRT,273 +Infrastructure,1279 +DIISR,1843 +AIATSIS,119 +Australian Research Council,107 +IP AUSTRALIA,1049 +Questacon,233 +Prime Minister & Cabinet,647 +Australian Institute of Family Studies,75 +ANAO,365 +Australian Public Service Commission,241 +Commonwealth Ombudsman,168 +Federal Privacy Commissioner,64 +OIGIS,13 +Office of National Assessments,148 +Old Parliament House,88 +"Resources, Energy and Tourism",401 +Geoscience Australia,745 +NOPSA,54 +Treasury,1103 +Australian Bureau of Statistics,2871 +ACCC,787 +AOFM,36 +ASIC,1882 +Australian Taxation Office,23505 +Commonwealth Grants Commission,46 +National Competition Council,9 +Productivity Commission,183 +Royal Australian Mint,197 +Veterans' Affairs,2165 +Australian War Memorial,313 --- /dev/null +++ b/admin/0910apsemployees.csv @@ -1,1 +1,103 @@ +National Competition Council,9 +Private Health Insurance Ombudsman,12 +OIGIS,12 +Wheat Exports Australia,13 +Cancer Australia,19 +ACLEI,20 +ORER,25 +Professional Services Review,30 +AOTDTA,31 +AOFM,35 +EOWA,36 +Commonwealth Grants Commission,40 +National Blood Authority,46 +ACIAR,51 +NOPSA,51 +Office of the Parl. Counsel,54 +National Water Commission,57 +Office of the Privacy Commissioner,58 +National Capital Authority,60 +ASADA,69 +Future Fund Management Agency,70 +Aust. Institute of Family Studies,76 +Torres Strait Regional Authority,82 +Old Parliament House,95 +Screen Australia,102 +Australian Transport Safety Bureau,107 +Safe Work Australia,109 +Australian Research Council,109 +Human Rights Commission,124 +AIATSIS,126 +FSANZ,130 +Aust. National Maritime Museum,132 +Office of National Assessments,146 +ABCC,151 +ARPANSA,152 +APVMA,155 +Commonwealth Ombudsman,156 +Administrative Appeals Tribunal,165 +Royal Australian Mint,171 +CrimTrac Agency,185 +Federal Magistrates Court,186 +Productivity Commission,196 +Questacon,218 +National Native Title Tribunal,223 +AFMA,225 +National Film and Sound Archive,232 +GBRMPA,237 +Australian Public Service Commission,247 +NHMRC,249 +MRT & RRT,273 +Australian War Memorial,291 +Fair Work Australia,299 +National Museum of Australia,312 +Murray Darling Basin Authority,314 +AUSTRAC,318 +ITSA,321 +Federal Court of Australia,360 +ANAO,367 +Aust. Institute of Health & Welfare,383 +"Resources, Energy and Tourism",454 +National Archives of Australia,504 +National Library of Australia,540 +Australian Crime Commission,543 +Aboriginal Hostels Ltd.,556 +Commonwealth DPP,558 +AUSTRADE,563 +ComSuper,587 +Comcare,593 +Defence Housing Australia,630 +Family Court of Australia,660 +ACMA,663 +Prime Minister & Cabinet,680 +DBCDE,715 +Geoscience Australia,723 +ACCC,804 +Australian Electoral Commission,922 +Office of the Fair Work Ombudsman,969 +Climate Change and Energy Efficiency,1019 +AusAID,1037 +IP AUSTRALIA,1050 +Infrastructure,1105 +Treasury,1133 +Bureau of Meteorology,1656 +Attorney-General's,1707 +Finance & Deregulation,1841 +DIISR,2072 +ASIC,2080 +Veterans' Affairs,2144 +"Environment, Water, Heritage and the Arts",3115 +Foreign Affairs & Trade,3160 +Australian Bureau of Statistics,3332 +FaHCSIA,3685 +"Agriculture, Fisheries & Forestry",4892 +Health & Ageing,5232 +Medicare Australia,5695 +Customs,5940 +DEEWR,6054 +Human Services,6607 +Immigration & Citizenship,7014 +Defence,21458 +Australian Taxation Office,24070 +Centrelink,27312 --- /dev/null +++ b/admin/1011apsemployees.csv @@ -1,1 +1,98 @@ +"Agriculture, Fisheries and Forestry",5219 +Australian Fisheries Management Authority,227 +APVMA,165 +Wheat Exports Australia,13 +Attorney-General's,1618 +Administrative Appeals Tribunal,162 +ACLEI,27 +AUSTRAC,332 +Australian Crime Commission,635 +Aust. Customs & Border Prot. Service,5767 +Aust. Human Rights Commission,139 +Commonwealth DPP,514 +CrimTrac Agency,181 +Family Court of Australia,670 +Federal Court of Australia,362 +Federal Magistrates Court,195 +ITSA,344 +National Native Title Tribunal,176 +Office of the Parl. Counsel,55 +DBCDE,700 +ACMA,662 +Climate Change and Energy Efficiency,984 +ORER,44 +Defence,22481 +Defence Housing Australia,614 +DEEWR,5468 +ABCC,150 +Comcare,667 +Fair Work Australia,310 +Office of the Fair Work Ombudsman,955 +Safe Work Australia,121 +FaHCSIA,3500 +Aboriginal Hostels Ltd.,563 +EOWA,34 +Torres Strait Regional Authority,107 +Finance and Deregulation,1964 +Australian Electoral Commission,913 +ComSuper,545 +Future Fund Management Agency,80 +Foreign Affairs and Trade,3354 +ACIAR,50 +AusAID,1245 +AUSTRADE,546 +Health and Ageing,5396 +Aust. Institute of Health and Welfare,393 +AOTDTA,33 +ARPANSA,162 +Cancer Australia,22 +FSANZ,133 +National Blood Authority,50 +NHMRC,248 +Private Health Insurance Ombudsman,14 +Professional Services Review,30 +Human Services,6443 +Centrelink,25225 +Medicare Australia,5842 +Immigration and Citizenship,7903 +MRT RRT,283 +Infrastructure,1001 +Australian Transport Safety Bureau,109 +DIISR,3594 +AIATSIS,136 +Australian Research Council,112 +Prime Minister and Cabinet,1140 +Aust. Institute of Family Studies,81 +ANAO,360 +Aust. National Maritime Museum,127 +Australian Public Service Commission,332 +Australian Sports Anti-Doping Authority,67 +Commonwealth Ombudsman,183 +National Archives of Australia,494 +National Library of Australia,494 +National Museum of Australia,287 +National Film and Sound Archive,235 +Office of the Australian Information Commissioner,86 +OIGIS,13 +Office of National Assessments,148 +Old Parliament House,92 +Screen Australia,35 +Regional Australia,336 +National Capital Authority,69 +"Resources, Energy and Tourism",1262 +NOPSA,60 +"Sustainability, Environment, Water, Population and Communities",2949 +Bureau of Meteorology,1775 +GBRMPA,266 +Murray Darling Basin Authority,314 +National Water Commission,74 +Treasury,1397 +Australian Bureau of Statistics,3540 +ACCC,825 +ASIC,1905 +Australian Taxation Office,24902 +National Competition Council,9 +Productivity Commission,203 +Veterans' Affairs,2146 +Australian War Memorial,302 --- /dev/null +++ b/admin/agls.php @@ -1,1 +1,35 @@ + + namefunction"; +$db = $server->get_db('disclosr-agencies'); +try { + $agencies = $db->get_view("app", "byCanonicalName", null, true)->rows; + + + if ($agencies) { + foreach ($agencies as $row) { + + echo "" . $row->value->name . ""; + if (isset($row->value->metaTags)) { + if (is_array($row->value->metaTags)) { + $tags =$row->value->metaTags; + } else { + $tags = object_to_array($row->value->metaTags); + } + if (isset($tags['AGLS.Function'])) { + echo "" . $tags['AGLS.Function'] . ""; + } + } + echo ""; + } + } +} catch (SetteeRestClientException $e) { + setteErrorHandler($e); +} +include_footer(); +?> + --- /dev/null +++ b/admin/conflicts.php @@ -1,1 +1,48 @@ +get_db('disclosr-agencies'); + +try { + $rows = $db->get_view("app", "getConflicts", null, true)->rows; + //print_r($rows); + foreach ($rows as $row) { +echo "

".$row->id."

"; +$request = Requests::get($serverAddr."disclosr-agencies/".$row->id); +$origSort = object_to_array(json_decode($request->body)); +ksort($origSort); + $origDoc = explode(",",json_encode($origSort)); + foreach($row->value as $conflictRev) { +$conflictURL = $serverAddr."disclosr-agencies/".$row->id."?rev=".$conflictRev; +$request = Requests::get($conflictURL); +$conflictSort = object_to_array(json_decode($request->body)); +ksort($conflictSort); + $conflictDoc = explode(",",json_encode($conflictSort)); +echo "curl -X DELETE ".$conflictURL."
".PHP_EOL; + // Options for generating the diff + $options = array( + //'ignoreWhitespace' => true, + //'ignoreCase' => true, + ); + + // Initialize the diff class + $diff = new Diff($conflictDoc, $origDoc, $options); + + // Generate a side by side diff + $renderer = new Diff_Renderer_Html_SideBySide; + echo $diff->Render($renderer); +} +die(); + + } +} catch (SetteeRestClientException $e) { + setteErrorHandler($e); +} + +include_footer(); +?> + --- /dev/null +++ b/admin/directory.gexf.php @@ -1,1 +1,59 @@ + "gov", "label" => "Federal Government")); +$edges = Array(); + +function addEdge($source, $target) { + global $edges; + $edges[] = Array("id" => md5($source . $target), "source" => $source, "target" => $target); +} + +function addNode($id, $label, $pid) { + global $nodes; + $nodes[] = Array("id" => $id, "label" => $label , "pid" => $pid); +} + +function addChildren($parentID, $parentXML) { + foreach ($parentXML as $childXML) { + + if ($childXML->getName() == "organization" || $childXML->getName() == "organizationalUnit" || $childXML->getName() == "person") { + $attr = $childXML->attributes(); + $id = $attr['UUID']; + if ($childXML->getName() == "organization" || $childXML->getName() == "organizationalUnit") { + + $label = $childXML->name; + } else if ($childXML->getName() == "person") { + $label = $childXML->fullName; + } + addNode($id, $label, $parentID); + addEdge($id, $parentID); + addChildren($id, $childXML); + } + } +} + +if (file_exists('directoryexport.xml')) { + $xml = simplexml_load_file('directoryexport.xml'); + + addChildren("gov", $xml); +} else { + exit('Failed to open directoryexport.xml'); +} + header('Content-Type: application/gexf+xml'); +echo ' + + + '; +foreach ($nodes as $node) { + echo ' '; +} +echo ' + '; +foreach ($edges as $edge) { + echo ' '; +} +echo ' + +'; +?> + --- /dev/null +++ b/admin/directoryexport.xml --- /dev/null +++ b/admin/exportEmployees.csv.php @@ -1,1 +1,86 @@ +get_db('disclosr-agencies'); +try { + $rows = $db->get_view("app", "all", null, true)->rows; + + $dataValues = Array(); + foreach ($rows as $row) { + if (isset($row->value->statistics->employees)) { + + $headers = array_unique(array_merge($headers, array_keys(object_to_array($row->value->statistics->employees)))); + + } + } +} catch (SetteeRestClientException $e) { + setteErrorHandler($e); +} + +$fp = fopen('php://output', 'w'); +if ($fp && $db) { + if ($format == "csv") { + header('Content-Type: text/csv; charset=utf-8'); + header('Content-Disposition: attachment; filename="export.employeestats.' . date("c") . '.csv"'); + } + header('Pragma: no-cache'); + header('Expires: 0'); + if ($format == "csv") { + fputcsv($fp, $headers); + } else if ($format == "json") { + echo '{ + "labels" : ["' . implode('","', $headers) . '"],'.PHP_EOL; + } + try { + $agencies = $db->get_view("app", "all", null, true)->rows; + //print_r($agencies); + $first = true; + if ($format == "json") { + echo '"data" : ['.PHP_EOL; + + } + foreach ($agencies as $agency) { + + if (isset($agency->value->statistics->employees)) { + $row = Array(); + $agencyEmployeesArray = object_to_array($agency->value->statistics->employees); + foreach ($headers as $i => $fieldName) { + if (isset($agencyEmployeesArray[$fieldName])) { + $row[] = '['.$i.','.$agencyEmployeesArray[$fieldName]["value"].']'; + } else { + $row[] = '['.$i.',0]'; + } + } + if ($format == "csv") { + fputcsv($fp, array_values($row)); + } else if ($format == "json") { + if (!$first) echo ","; + echo '{"data" : [' . implode(",", array_values($row)) . '], "label": "'.$agency->value->name.'", "lines" : { "show" : true }, "points" : { "show" : true }}'.PHP_EOL; + $first = false; + } + } + } + if ($format == "json") { + echo '] + }'.PHP_EOL; + + } + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } + + die; +} +?> + --- /dev/null +++ b/admin/exportScore.csv.php @@ -1,1 +1,73 @@ +get_db('disclosr-agencies'); +$format = "csv"; +//$format = "json"; +if (isset($_REQUEST['format'])) $format = $_REQUEST['format']; + +setlocale(LC_CTYPE, 'C'); + + $headers = Array(); + +$fp = fopen('php://output', 'w'); +if ($fp && $db) { + if ($format == "csv") { + header('Content-Type: text/csv; charset=utf-8'); + header('Content-Disposition: attachment; filename="export.score.' . date("c") . '.csv"'); + } + header('Pragma: no-cache'); + header('Expires: 0'); + + try { + $agencies = $db->get_view("score", "score", null, true)->rows; + //print_r($agencies); + $first = true; + if ($format == "json") { + echo '"data" : ['.PHP_EOL; + + } + foreach ($agencies as $agency) { + $agencyArray = object_to_array($agency->value); + if ($first) { + $headers = array_keys($agencyArray); +if ($format == "csv") { + fputcsv($fp, $headers); + } else if ($format == "json") { + echo '{ + "labels" : ["' . implode('","', $headers) . '"],'.PHP_EOL; + } + } + $row = Array(); + + foreach ($headers as $i => $fieldName) { + if (isset($agencyArray[$fieldName])) { + $row[] = $agencyArray[$fieldName]; + } else { + $row[] = ''; + } + } + if ($format == "csv") { + fputcsv($fp, array_values($row)); + } else if ($format == "json") { + if (!$first) echo ","; + echo '{"data" : [' . implode(",", array_values($row)) . '], "label": "'.$agency->value->name.'", "lines" : { "show" : true }, "points" : { "show" : true }}'.PHP_EOL; + + } + $first = false; + } + + if ($format == "json") { + echo '] + }'.PHP_EOL; + + } + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } + + die; +} +?> + --- /dev/null +++ b/admin/genericAgencyFixer.php @@ -1,1 +1,44 @@ +get_db('disclosr-agencies'); + +try { + $agencies = $db->get_view("app", "byCanonicalName", null, true)->rows; + //print_r($rows); + foreach ($agencies as $agency) { + //echo $agency->value->name . " ".$agency->value->website."
\n"; + // print_r($agency); + //hasRestricitiveLicence" hasRestrictiveLicense -> has Restrictive Licence + // "hasYoutube" -> Tube + // "comment" -> "comments" + if (!isset($agency->value->metaTags) && isset($agency->value->website)) { + echo $agency->value->name . " ".$agency->value->website."
\n"; + $agency->value->metaTags = Array(); + $request = Requests::get($agency->value->website); + $html = phpQuery::newDocumentHTML($request->body); + phpQuery::selectDocument($html); + foreach (pq('meta')->elements as $meta) { + $tagName = $meta->getAttribute('name');; + $content = $meta->getAttribute('content'); + if ($tagName != "") { +echo "$tagName == $content
\n"; + $agency->value->metaTags[$tagName] = $content; + } + } + //print_r($agency->value->metaTags); + $db->save($agency->value); + echo "
"; + flush(); + } + } +} catch (SetteeRestClientException $e) { + setteErrorHandler($e); +} +?> + --- a/admin/import.php +++ /dev/null @@ -1,34 +1,1 @@ -create_db('disclosr-agencies'); -} catch (SetteeRestClientException $e) { - setteErrorHandler($e); -} -$db = $server->get_db('disclosr-agencies'); -createAgencyDesignDoc(); -$conn = new PDO("pgsql:dbname=contractDashboard;user=postgres;password=snmc;host=localhost"); -$namesQ = 'select agency.abn, string_agg("agencyName",\'|\') as names from agency inner join agency_nametoabn on agency.abn::text = agency_nametoabn.abn group by agency.abn;'; -$abntonames = Array(); -foreach ($conn->query($namesQ) as $row) { - $abntonames[$row['abn']] = explode("|", $row['names']); -} -$result = $conn->query("select * from agency"); -while ($agency = $result->fetch(PDO::FETCH_ASSOC)) { - $agency['_id'] = md5($agency['abn']); - $agency['otherNames'] = $abntonames[$agency['abn']]; - if (sizeof($abntonames[$agency['abn']]) == 1) - $agency['name'] = $abntonames[$agency['abn']][0]; - $agency["lastScraped"] = "1/1/1970"; - $agency["scrapeDepth"] = 1; - try { - $doc = $db->save($agency); - //print_r($doc); - echo $agency['abn'] . " imported \n
"; - } catch (SetteeRestClientException $e) { - setteErrorHandler($e); - } -} -?> - --- /dev/null +++ b/admin/importAPSCEmployees.php @@ -1,1 +1,67 @@ +get_db('disclosr-agencies'); +$rows = $db->get_view("app", "byName")->rows; +$nametoid = Array(); +$sums = Array(); +foreach ($rows as $row) { + $nametoid[trim($row->key)] = $row->value; +} +$employeeCSVs = Array("2002-2003" => "0203apsemployees.csv", + "2003-2004" => "0304apsemployees.csv", + "2004-2005" => "0405apsemployees.csv", + "2005-2006" => "0506apsemployees.csv", + "2006-2007" => "0607apsemployees.csv", + "2007-2008" => "0708apsemployees.csv", + "2008-2009" => "0809apsemployees.csv", + "2009-2010" => "0910apsemployees.csv", + "2010-2011" => "1011apsemployees.csv" +); +foreach ($employeeCSVs as $timePeriod => $employeeCSV) { + echo $employeeCSV . "
" . PHP_EOL; + $row = 1; + if (($handle = fopen($employeeCSV, "r")) !== FALSE) { + while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) { + //print_r($data); + $name = trim($data[0]); + if (isset($nametoid[$name])) { + $id = $nametoid[$name]; + //echo $id . "
" . PHP_EOL; + @$sums[$id][$timePeriod] += $data[1]; + } else { + echo "
ERROR NAME MISSING FROM ID LIST

" . PHP_EOL; + + die(); + } + } + fclose($handle); + } +} +foreach ($sums as $id => $sum) { + echo $id . "
" . PHP_EOL; + $doc = $db->get($id); + echo $doc->name . "
" . PHP_EOL; + // print_r($doc); + $changed = false; + if (!isset($doc->statistics)) { + $changed = true; + $doc->statistics = Array(); + } + foreach ($sum as $timePeriod => $value) { + if (!isset($doc->statistics->employees->$timePeriod->value) + || $doc->statistics->employees->$timePeriod->value != $value) { + $changed = true; + $doc->statistics["employees"][$timePeriod] = Array("value" => $value, "source" => "http://apsc.gov.au/stateoftheservice/"); + } + } + if ($changed) { + $db->save($doc); + } else { + echo "not changed" . "
" . PHP_EOL; + } +} +// employees: timeperiod, source = apsc state of service, value +?> + --- /dev/null +++ b/admin/importAustraliaGovAuGov2.php @@ -1,1 +1,61 @@ +get_db('disclosr-agencies'); +$rows = $db->get_view("app", "byName")->rows; +$nametoid = Array(); +$accounts = Array(); +foreach ($rows as $row) { + $nametoid[trim($row->key)] = $row->value; +} + +function extractCSVAccounts($url, $nameField, $accountField, $filter) { + global $accounts, $nametoid; + $request = Requests::get($url); + $Data = str_getcsv($request->body, "\n"); //parse the rows + $headers = Array(); + foreach ($Data as $num => $line) { + $Row = str_getcsv($line, ","); + if ($num == 0) { + + } else if ($num == 1) { + $headers = $Row; + //print_r($headers); + } else { + if (isset($Row[array_search($nameField, $headers)])) { + $agencyName = $Row[array_search($nameField, $headers)]; + if (!$filter || $Row[array_search("State", $headers)] == "NAT") { + if (!in_array(trim($agencyName), array_keys($nametoid))) { + echo "$agencyName missing" . PHP_EOL; + } else { + // echo $Row[array_search($nameField, $headers)] . PHP_EOL; + } + } + } else { + //echo "error finding agency" . $line . PHP_EOL; + } + } + } +} + +// http://agimo.govspace.gov.au/page/gov2register/ +// twitter +//extractCSVAccounts("https://docs.google.com/spreadsheet/pub?key=0Ap1exl80wB8OdHNKVmQ5RVlvQWpibDAxNHkzcU1nV2c&single=true&gid=0&output=csv", "Agency/Body/Event", "", true); +// RSS +// https://docs.google.com/spreadsheet/pub?hl=en_GB&hl=en_GB&key=0Ah41IAK0HzSTdGJxandJREhLSGlWWUZfZ2xKOTNHZ0E&output=csv +// facebook +extractCSVAccounts("https://docs.google.com/spreadsheet/pub?hl=en_GB&hl=en_GB&key=0Ah41IAK0HzSTdGtjcW9vOXdyZ3pOV21vQU51VmhzQnc&single=true&gid=0&output=csv","Agency","Name"); + +/* + * http://australia.gov.au/news-and-media/media-release-rss-feeds + * http://australia.gov.au/news-and-media/social-media/blogs + * http://australia.gov.au/news-and-media/social-media/twitter + * http://australia.gov.au/news-and-media/social-media/facebook + * http://australia.gov.au/news-and-media/social-media/youtube + * http://australia.gov.au/news-and-media/social-media/flickr + * http://australia.gov.au/news-and-media/social-media/apps http://www.harmony.gov.au/get-involved/app-downloads.htm http://www.em.gov.au/Resources/Pages/Before-the-Storm-phone-game.aspx + * http://australia.gov.au/news-and-media/social-media/podcasts + */ +?> + --- /dev/null +++ b/admin/importContractDashboardAgencies.php @@ -1,1 +1,34 @@ +create_db('disclosr-agencies'); +} catch (SetteeRestClientException $e) { + setteErrorHandler($e); +} +$db = $server->get_db('disclosr-agencies'); +createAgencyDesignDoc(); +$conn = new PDO("pgsql:dbname=contractDashboard;user=postgres;password=snmc;host=localhost"); +$namesQ = 'select agency.abn, string_agg("agencyName",\'|\') as names from agency inner join agency_nametoabn on agency.abn::text = agency_nametoabn.abn group by agency.abn;'; +$abntonames = Array(); +foreach ($conn->query($namesQ) as $row) { + $abntonames[$row['abn']] = explode("|", $row['names']); +} +$result = $conn->query("select * from agency"); +while ($agency = $result->fetch(PDO::FETCH_ASSOC)) { + $agency['_id'] = md5($agency['abn']); + $agency['otherNames'] = $abntonames[$agency['abn']]; + if (sizeof($abntonames[$agency['abn']]) == 1) + $agency['name'] = $abntonames[$agency['abn']][0]; + $agency["lastScraped"] = "1/1/1970"; + $agency["scrapeDepth"] = 1; + try { + $doc = $db->save($agency); + //print_r($doc); + echo $agency['abn'] . " imported \n
"; + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } +} +?> + --- /dev/null +++ b/admin/importDirectoryUUIDs.php @@ -1,1 +1,37 @@ +get_db('disclosr-agencies'); +$rows = $db->get_view("app", "byName")->rows; +$nametoid = Array(); +$sums = Array(); +foreach ($rows as $row) { + $nametoid[trim($row->key)] = $row->value; +} + +if (file_exists('index.xml')) { + $xml = simplexml_load_file('index.xml'); + + foreach ($xml as $agency) { + $names = Array(); + $names[] = "".$agency->name; + + if (isset($agency->shortName)) { + $names[] = "".$agency->shortName; + } + foreach ($names as $name) { + if (!in_array($name, array_keys($nametoid))) { + echo "$name missing".PHP_EOL; + print_r($names); + echo $agency->dn; + echo PHP_EOL; + echo PHP_EOL; + } + } + } +} else { + exit('Failed to open test.xml.'); +} +?> + --- /dev/null +++ b/admin/importGov2RegisterRSSFacebookTwitter.php @@ -1,1 +1,100 @@ +get_db('disclosr-agencies'); +$rows = $db->get_view("app", "byName")->rows; +$nametoid = Array(); +$accounts = Array(); +foreach ($rows as $row) { + $nametoid[trim($row->key)] = $row->value; +} + +function extractHTMLAccounts($url, $accountType) { + global $accounts, $nametoid; + $request = Requests::get($url); + $doc = phpQuery::newDocumentHTML($request->body); + phpQuery::selectDocument($doc); + foreach (pq('tr')->elements as $tr) { + //echo $tr->nodeValue.PHP_EOL; + $agency = ""; + $url = ""; + foreach ($tr->childNodes as $td) { + $class = $td->getAttribute("class"); + //echo "cccc $class ".$td->nodeValue.PHP_EOL; + if ($class == "s11" || $class == "s10" || $class == "s7") { + $agency = $td->nodeValue; + } else if ($class == "s6" || $class == "s9") { + $url = $td->nodeValue; + foreach ($td->childNodes as $a) { + $href = $a->getAttribute("href"); + if ($href != "") { + $url = $href; + } + } + } + } + if ($agency != "" && $url != "") { + if (!in_array(trim($agency), array_keys($nametoid))) { + echo trim($agency) . " missing" . PHP_EOL; + } else { + // echo $agency." = ".$url.PHP_EOL; + $accounts[$nametoid[trim($agency)]][$accountType][] = $url; + } + } + } +} + +function extractCSVAccounts($url, $accountType, $nameField, $accountField, $filter) { + global $accounts, $nametoid; + $request = Requests::get($url); + $Data = str_getcsv($request->body, "\n"); //parse the rows + $headers = Array(); + foreach ($Data as $num => $line) { + $Row = str_getcsv($line, ",", '"'); + if ($num == 0) { + + } else if ($num == 1) { + $headers = $Row; + //print_r($headers); + } else { + if (isset($Row[array_search($nameField, $headers)])) { + $agencyName = $Row[array_search($nameField, $headers)]; + if (!$filter || $Row[array_search("State", $headers)] == "NAT") { + if (!in_array(trim($agencyName), array_keys($nametoid))) { + echo trim($agencyName) . " missing" . PHP_EOL; + } else { + // echo $Row[array_search($nameField, $headers)] . PHP_EOL; + $accounts[$nametoid[trim($agencyName)]][$accountType][] = $Row[array_search($accountField, $headers)]; + } + } + } else { + //echo "error finding agency" . $line . PHP_EOL; + } + } + } +} + +// http://agimo.govspace.gov.au/page/gov2register/ +// twitter +extractCSVAccounts("https://docs.google.com/spreadsheet/pub?key=0Ap1exl80wB8OdHNKVmQ5RVlvQWpibDAxNHkzcU1nV2c&single=true&gid=0&output=csv", "Twitter", "Agency/Body/Event", "", true); +// RSS +extractHTMLAccounts("https://docs.google.com/spreadsheet/pub?hl=en_GB&hl=en_GB&key=0Ah41IAK0HzSTdGJxandJREhLSGlWWUZfZ2xKOTNHZ0E&output=html", "RSS"); +// facebook +extractHTMLAccounts("https://docs.google.com/spreadsheet/pub?hl=en_GB&hl=en_GB&key=0Ah41IAK0HzSTdGtjcW9vOXdyZ3pOV21vQU51VmhzQnc&single=true&gid=0&output=html", "Facebook"); +foreach ($accounts as $id => $accountTypes) { + echo $id . "
" . PHP_EOL; + $doc = object_to_array($db->get($id)); + // print_r($doc); + + foreach ($accountTypes as $accountType => $accounts) { + if (!isset($doc["has" . $accountType]) || !is_array($doc["has" . $accountType])) { + $doc["has" . $accountType] = Array(); + } + $doc["has" . $accountType] = array_unique(array_merge($doc["has" . $accountType], $accounts)); + } + $db->save($doc); +} +?> + --- /dev/null +++ b/admin/index.xml @@ -1,1 +1,2607 @@ + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + +A + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + + +A + + + + + + + + + + + +B + + + + + + + + + + + +B + + + + + + + + + + +C + + + + + + + + + + + +C + + + + + + + + + + + + +C + + + + + + + + + + + + +C + + + + + + + + + + + + +C + + + + + + + + + + + + +C + + + + + + + + + + + + +C + + + + + + + + + + + + +C + + + + + + + + + + + +C + + + + + + + + + + + + +C + + + + + + + + + + + +C + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + +D + + + + + + + + + + + + +D + + + + + + + + + + + + +D + + + + + + + + + +D + + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + +D + + + + + + + + + + +D + + + + + + + + + + +D + + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + + + +D + + + + + + + + + +D + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + + +D + + + + + + + + + + +D + + + + + + + + + + +E + + + + + + + + + + +E + + + + + + + + + + + + +E + + + + + + + + + + + + +E + + + + + + + + + + +F + + + + + + + + + + + +F + + + + + + + + + + +F + + + + + + + + + + +F + + + + + + + + + + + +F + + + + + + + + + + +F + + + + + + + + + + + + +F + + + + + + + + + + +F + + + + + + + + + +F + + + + + + + + + + + + +F + + + + + + + + + + +F + + + + + + + + + + + +G + + + + + + + + + + + +G + + + + + + + + + + + + +G + + + + + + + + + + + + +G + + + + + + + + + + + +G + + + + + + + + + + +H + + + + + + + + + + + +I + + + + + + + + + + + + +I + + + + + + + + + + +I + + + + + + + + + + + + +I + + + + + + + + + + + + +I + + + + + + + + + + + + +I + + + + + + + + + + + + +I + + + + + + + + + + + + +I + + + + + + + + + + +I + + + + + + + + + + + +I + + + + + + + + + + + + +L + + + + + + + + + + +M + + + + + + + + + + + +M + + + + + + + + + + +M + + + + + + + + + + +M + + + + + + + + + + + +M + + + + + + + + + + +M + + + + + + + + + + +M + + + + + + + + + + + + +M + + + + + + + + + + + +M + + + + + + + + + + + + +N + + + + + + + + + + + + +N + + + + + + + + + + + + +N + + + + + + + + + + + +N + + + + + + + + + + + + +N + + + + + + + + + + +N + + + + + + + + + + + + +N + + + + + + + + + + + + +N + + + + + + + + + + + + +N + + + + + + + + + + + + +N + + + + + + + + + + + + +N + + + + + + + + + + + +N + + + + + + + + +N + + + + + + + + + + + +N + + + + + + + + + + + +N + + + + + + + + + +O + + + + + + + + + + + +O + + + + + + + + + + + + +O + + + + + + + + + + + + +O + + + + + + + + + + + +O + + + + + + + + +O + + + + + + + + + + + +O + + + + + + + + +O + + + + + + + + + + + +O + + + + + + + + + + + +O + + + + + + + + + + + +P + + + + + + + + + + + +P + + + + + + + + + + +P + + + + + + + + + + + +P + + + + + + + + + + + +Q + + + + + + + + + + + + +Q + + + + + + + + + + + + +R + + + + + + + + + + + +R + + + + + + + + + + + + +R + + + + + + + + + + + + +R + + + + + + + + + + + +R + + + + + + + + + + + + +R + + + + + + + + +R + + + + + + + + + + + +R + + + + + + + + + + + + +R + + + + + + + + + + + +S + + + + + + + + + + +S + + + + + + + + + + + + +S + + + + + + + + + + + + +S + + + + + + + + + +S + + + + + + + + + + + +S + + + + + + + + + + + +S + + + + + + + + + + + +S + + + + + + + + + + + + +S + + + + + + + + + + + + +S + + + + + + + + + + +S + + + + + + + + + +S + + + + + + + + + + + +S + + + + + + + + + + + +S + + + + + + + + + + + +T + + + + + + + + + +T + + + + + + + + + + +T + + + + + + + + + + + + +T + + + + + + + + + + +T + + + + + + + + + + + + +T + + + + + + + + + + + + +T + + + + + + + + + + +W + + + + + + + + + + + +W + + + --- /dev/null +++ b/admin/metadata.py @@ -1,1 +1,22 @@ +#http://packages.python.org/CouchDB/client.html +import couchdb +from BeautifulSoup import BeautifulSoup +couch = couchdb.Server('http://127.0.0.1:5984/') + +# select database +docsdb = couch['disclosr-documents'] + +for row in docsdb.view('app/getMetadataExtractRequired'): + print row.id + html = docsdb.get_attachment(row.id,row.value.iterkeys().next()).read() + metadata = [] + # http://www.crummy.com/software/BeautifulSoup/documentation.html + soup = BeautifulSoup(html) +metatags = soup.meta + for metatag in metatags: + print metatag['name'] + doc = docsdb.get(row.id) + //doc['metadata'] = metadata + //docsdb.save(doc) + --- /dev/null +++ b/admin/naa-agift-tree.php @@ -1,1 +1,2504 @@ + + + + Demo of the tree layout in D3.js + + + + + +
+
+ + + + + + + + + + --- /dev/null +++ b/admin/naa-agift.json @@ -1,1 +1,2232 @@ - +[ + "Home", + "index.htm", + [ + "BUSINESS SUPPORT AND REGULATION", + "000411.htm", + [ + "Association registration", + "000396.htm" + ], + [ + "Business process auditing", + "000413.htm" + ], + [ + "Business registration and licensing", + "000414.htm" + ], + [ + "Business sponsorship", + "001371.htm" + ], + [ + "Consumer protection", + "000439.htm" + ], + [ + "Fair trading compliance", + "000482.htm", + [ + "Prices surveillance", + "000533.htm" + ], + [ + "Product safety", + "000534.htm" + ], + [ + "Trade practices compliance", + "000583.htm" + ] + ], + [ + "Financial institutions regulation", + "000485.htm" + ], + [ + "Government procurement regulation", + "000491.htm" + ], + [ + "Industry assistance schemes", + "000499.htm" + ], + [ + "Industry development", + "000500.htm" + ], + [ + "Insurance regulation", + "000501.htm", + [ + "General insurance", + "000489.htm" + ], + [ + "Life insurance", + "000505.htm" + ] + ], + [ + "Professional accreditation", + "000535.htm" + ], + [ + "Small business services", + "000565.htm", + [ + "Small business advocacy", + "000563.htm" + ], + [ + "Small business development", + "000564.htm" + ] + ], + [ + "Stock market regulation", + "000572.htm" + ] + ], + [ + "CIVIC INFRASTRUCTURE", + "000424.htm", + [ + "Civic management", + "000425.htm", + [ + "Architectural services", + "000387.htm" + ], + [ + "Building approval services", + "000406.htm" + ], + [ + "Building regulations and standards", + "000408.htm" + ], + [ + "Engineering services", + "000477.htm" + ], + [ + "Town planning", + "000582.htm" + ] + ], + [ + "Energy supply", + "000476.htm" + ], + [ + "Integrated services planning", + "000503.htm" + ], + [ + "Public housing", + "000536.htm", + [ + "Public housing construction", + "000537.htm" + ], + [ + "Public housing design", + "000538.htm" + ], + [ + "Public housing maintenance", + "000540.htm" + ] + ], + [ + "Public land management", + "000541.htm", + [ + "Burial ground management", + "000410.htm" + ], + [ + "Cultural centre management", + "000444.htm" + ], + [ + "Garden management", + "000488.htm" + ], + [ + "Memorial maintenance", + "000509.htm" + ], + [ + "Recreational park management", + "000549.htm" + ], + [ + "Sporting facilities management", + "000571.htm" + ] + ], + [ + "Regional development", + "000552.htm" + ], + [ + "Transport network maintenance", + "000586.htm" + ], + [ + "Waste management", + "001349.htm" + ] + ], + [ + "COMMUNICATIONS", + "000433.htm", + [ + "Advertising standards", + "000381.htm" + ], + [ + "Broadcasting", + "000403.htm", + [ + "Broadcasting standards", + "000404.htm" + ], + [ + "Radio broadcasting", + "000546.htm" + ], + [ + "Television broadcasting", + "000580.htm" + ] + ], + [ + "Call centre administration", + "000417.htm" + ], + [ + "Electronic commerce", + "000468.htm", + [ + "Authentication", + "000399.htm" + ], + [ + "Online transaction standards", + "000526.htm" + ] + ], + [ + "Government media", + "000490.htm" + ], + [ + "Information management standards", + "000283.htm", + [ + "Data management", + "000448.htm" + ], + [ + "Information dissemination", + "000502.htm" + ], + [ + "Information technology standards", + "000282.htm" + ] + ], + [ + "Media ownership regulation", + "000508.htm" + ], + [ + "Postal services", + "000530.htm", + [ + "Courier services", + "000441.htm" + ], + [ + "Electronic postal services", + "000469.htm" + ], + [ + "Retail postal services", + "000554.htm" + ] + ], + [ + "Publishing", + "000543.htm", + [ + "Electronic publishing", + "000470.htm" + ], + [ + "Publishing standards", + "000544.htm" + ], + [ + "Website development", + "000591.htm" + ] + ], + [ + "Radio communication", + "000547.htm", + [ + "Apparatus licensing", + "000385.htm" + ], + [ + "Spectrum management", + "000570.htm" + ] + ], + [ + "Satellite communication", + "000560.htm" + ], + [ + "Telecommunications", + "000578.htm", + [ + "Carriage service providers", + "000420.htm" + ], + [ + "Carrier licensing", + "000421.htm" + ], + [ + "Equipment licensing", + "000480.htm" + ], + [ + "Mobile telephone services", + "000516.htm" + ], + [ + "Telephone services", + "000579.htm" + ] + ] + ], + [ + "COMMUNITY SERVICES", + "000435.htm", + [ + "Accommodation services", + "000377.htm", + [ + "Defence housing", + "000458.htm" + ], + [ + "Emergency accommodation", + "000471.htm" + ], + [ + "Public housing entitlements", + "000539.htm" + ], + [ + "Refuge support", + "000551.htm" + ] + ], + [ + "Community support", + "000436.htm", + [ + "Adoption services", + "000378.htm" + ], + [ + "Aged care services", + "000382.htm" + ], + [ + "Child and youth support", + "000422.htm" + ], + [ + "Child-care services", + "000423.htm" + ], + [ + "Defence community programs", + "000452.htm" + ], + [ + "Family reunion programs", + "000483.htm" + ], + [ + "Veterans\" entitlements", + "000587.htm" + ] + ], + [ + "Counselling services", + "000440.htm" + ], + [ + "Emergency services", + "000474.htm", + [ + "Ambulance services", + "000384.htm" + ], + [ + "Emergency funding", + "000472.htm" + ], + [ + "Firefighting services", + "000487.htm" + ] + ], + [ + "Financial assistance", + "000484.htm", + [ + "Benefits", + "000402.htm" + ], + [ + "Income support schemes", + "000494.htm" + ] + ], + [ + "Natural disasters", + "000521.htm", + [ + "Disaster recovery", + "000462.htm" + ], + [ + "Disaster relief", + "000463.htm" + ] + ], + [ + "Rural community development", + "000557.htm" + ], + [ + "Social justice and equity", + "000566.htm" + ], + [ + "Transport access schemes", + "000901.htm" + ] + ], + [ + "CULTURAL AFFAIRS", + "000442.htm", + [ + "Arts development", + "000391.htm", + [ + "Arts funding", + "000393.htm" + ], + [ + "Arts incentive schemes", + "000394.htm" + ], + [ + "Arts promotion", + "000395.htm" + ] + ], + [ + "Collection access", + "000427.htm", + [ + "Descriptive standards", + "000461.htm" + ], + [ + "Finding aids development", + "000486.htm" + ], + [ + "Reference services", + "000550.htm" + ] + ], + [ + "Collection management", + "000430.htm", + [ + "Artefact export regulation", + "000390.htm" + ], + [ + "Collection accessioning", + "000428.htm" + ], + [ + "Collection acquisition", + "000429.htm" + ], + [ + "Collection storage", + "000432.htm" + ], + [ + "Preservation services", + "000532.htm" + ] + ], + [ + "Collection promotion", + "000431.htm", + [ + "Exhibition programs", + "000481.htm" + ], + [ + "Publicity programs", + "000542.htm" + ] + ], + [ + "Cultural awards and scholarships", + "000443.htm" + ], + [ + "Cultural festivals", + "000445.htm" + ], + [ + "Cultural gifts programs", + "000446.htm" + ], + [ + "Multicultural heritage promotion", + "000518.htm", + [ + "Multicultural festivals", + "000517.htm" + ], + [ + "Multicultural services", + "000519.htm" + ] + ] + ], + [ + "DEFENCE", + "000449.htm", + [ + "Australian Defence Forces", + "000397.htm", + [ + "Air Force", + "002266.htm" + ], + [ + "Army", + "000388.htm" + ], + [ + "Badges and insignia", + "000401.htm" + ], + [ + "Cadets", + "000416.htm" + ], + [ + "Defence force commands", + "000456.htm" + ], + [ + "Military bands", + "000510.htm" + ], + [ + "Navy", + "000524.htm" + ], + [ + "Reserves", + "000553.htm" + ], + [ + "Roulettes", + "000556.htm" + ] + ], + [ + "Defence estate management", + "000454.htm" + ], + [ + "Defence force careers", + "000455.htm", + [ + "Defence career development", + "000450.htm" + ], + [ + "Military employment services", + "000512.htm" + ] + ], + [ + "Defence strategic development", + "000574.htm", + [ + "Defence efficiency review", + "000453.htm" + ], + [ + "Defence reform program", + "000460.htm" + ] + ], + [ + "Defence strategic policy", + "000576.htm", + [ + "Strategic decisions", + "000573.htm" + ], + [ + "Strategic planning", + "000575.htm" + ] + ], + [ + "Defence strategic support", + "000577.htm", + [ + "Capital equipment programs", + "000419.htm" + ], + [ + "Defence industry", + "000459.htm" + ], + [ + "Defence science and technology", + "000905.htm" + ], + [ + "Logistics", + "000506.htm" + ] + ], + [ + "Emergency management", + "000473.htm", + [ + "Civil community assistance", + "000426.htm" + ], + [ + "Disaster support", + "000464.htm" + ] + ], + [ + "Military law", + "001814.htm" + ], + [ + "Military operations", + "000515.htm", + [ + "Australian theatre of war", + "000398.htm" + ], + [ + "Military exercises", + "000514.htm" + ], + [ + "Special operations", + "000569.htm" + ], + [ + "Warfare", + "000589.htm" + ] + ] + ], + [ + "EDUCATION AND TRAINING", + "000467.htm", + [ + "Arts education", + "000392.htm" + ], + [ + "Community education", + "000434.htm", + [ + "Adult education programs", + "000379.htm" + ], + [ + "Adult migrant education", + "000380.htm" + ], + [ + "Road safety awareness", + "000555.htm" + ] + ], + [ + "Curriculum development", + "000447.htm" + ], + [ + "Early childhood education", + "000466.htm" + ], + [ + "Military education and training", + "000511.htm", + [ + "Army reserve training", + "000389.htm" + ], + [ + "Defence college training", + "000451.htm" + ] + ], + [ + "Overseas skills recognition", + "000527.htm" + ], + [ + "School education", + "000561.htm", + [ + "Discipline programs", + "000465.htm" + ], + [ + "School transport regulation", + "000562.htm" + ], + [ + "Special needs programs", + "000568.htm" + ] + ], + [ + "Tertiary education", + "000581.htm" + ], + [ + "Vocational education", + "000588.htm", + [ + "Apprenticeship programs", + "000386.htm" + ], + [ + "Hospital teaching programs", + "000493.htm" + ], + [ + "Trainee programs", + "000584.htm" + ], + [ + "Workplace training", + "000595.htm" + ] + ] + ], + [ + "EMPLOYMENT", + "000016.htm", + [ + "Human resources development", + "000348.htm", + [ + "Occupational health and safety", + "000355.htm" + ], + [ + "Recruitment programs", + "000356.htm" + ], + [ + "Termination processes", + "002103.htm" + ], + [ + "Workers compensation schemes", + "000363.htm" + ], + [ + "Workplace discrimination monitoring", + "000364.htm" + ], + [ + "Workplace equity and justice programs", + "000365.htm" + ] + ], + [ + "Industrial awards and conditions", + "000349.htm", + [ + "Award conditions", + "000366.htm" + ], + [ + "Remuneration review", + "000368.htm" + ] + ], + [ + "Labour market programs", + "000347.htm", + [ + "Employment services marketing", + "000351.htm" + ], + [ + "Job placement programs", + "000352.htm" + ], + [ + "Job vacancy data management", + "000353.htm" + ] + ], + [ + "Workplace agreement processes", + "000350.htm", + [ + "Agreement bargaining processes", + "002141.htm" + ], + [ + "Agreement dispute mediation", + "000370.htm" + ], + [ + "Certified employment conditions", + "000371.htm" + ], + [ + "Employment advocacy services", + "000374.htm" + ] + ] + ], + [ + "ENVIRONMENT", + "000478.htm", + [ + "Built environment", + "000409.htm", + [ + "Building acoustics", + "000405.htm" + ], + [ + "Building preservation", + "000407.htm" + ] + ], + [ + "Climate information services", + "000203.htm" + ], + [ + "Conservation programs", + "000438.htm", + [ + "Endangered species protection", + "000475.htm" + ], + [ + "Landcare programs", + "000504.htm" + ], + [ + "Soil preservation programs", + "000567.htm" + ] + ], + [ + "Environmental impact assessment", + "000479.htm" + ], + [ + "Historic relic protection", + "000492.htm" + ], + [ + "Marine life protection programs", + "000507.htm" + ], + [ + "Natural heritage protection", + "000522.htm", + [ + "National park management", + "000520.htm" + ], + [ + "Nature reserve management", + "000523.htm" + ], + [ + "Wilderness area management", + "000593.htm" + ], + [ + "Wildlife sanctuary management", + "000594.htm" + ] + ], + [ + "Oceans governance", + "000525.htm" + ], + [ + "Pollutant prevention programs", + "000529.htm" + ], + [ + "World heritage listings", + "000596.htm" + ] + ], + [ + "FINANCE MANAGEMENT", + "000001.htm", + [ + "Commonwealth State funding", + "000017.htm" + ], + [ + "Currency", + "000018.htm", + [ + "Counterfeiting control", + "000027.htm" + ] + ], + [ + "Financial investment", + "000021.htm", + [ + "Investment scheme regulation", + "000031.htm" + ] + ], + [ + "Financial system management", + "002302.htm", + [ + "Financial system monitoring", + "002306.htm" + ], + [ + "Payments management", + "002297.htm" + ] + ], + [ + "Fiscal policy", + "000022.htm", + [ + "Public borrowing", + "000032.htm" + ], + [ + "Public debt", + "000033.htm" + ], + [ + "Public expenditure", + "000034.htm" + ] + ], + [ + "Foreign investment control", + "000030.htm" + ], + [ + "International monetary regulation", + "000023.htm" + ], + [ + "Monetary policy", + "000020.htm", + [ + "Exchange rates", + "000028.htm" + ], + [ + "Inflation", + "000029.htm" + ], + [ + "Interest rates", + "002295.htm" + ] + ], + [ + "Resource management", + "000024.htm", + [ + "Contract management", + "000037.htm" + ], + [ + "Financial administration", + "000035.htm" + ], + [ + "Financial budgeting", + "000036.htm" + ] + ], + [ + "Retirement income", + "000025.htm", + [ + "Asset assessment", + "000038.htm" + ], + [ + "Retirement saving", + "000039.htm" + ], + [ + "Superannuation regulation", + "000040.htm" + ] + ], + [ + "Statistical analysis", + "000019.htm" + ], + [ + "Taxation", + "000026.htm", + [ + "Income assessment", + "000041.htm" + ], + [ + "Revenue raising", + "000042.htm" + ], + [ + "Taxation compliance", + "000043.htm" + ] + ] + ], + [ + "GOVERNANCE", + "000002.htm", + [ + "Civic celebrations", + "000046.htm" + ], + [ + "Constitutional matters", + "000048.htm", + [ + "Constitutional conventions", + "000061.htm" + ], + [ + "Constitutional referenda", + "000062.htm" + ] + ], + [ + "Electoral matters", + "000049.htm", + [ + "Declaration of interests", + "000063.htm" + ], + [ + "Election campaigning", + "000064.htm" + ], + [ + "Electoral boundary assessment", + "000065.htm" + ] + ], + [ + "Honours and awards programs", + "000050.htm" + ], + [ + "Intergovernmental relations", + "000052.htm", + [ + "Cross-border cooperation", + "000067.htm" + ], + [ + "Intergovernment policy dissemination", + "000069.htm" + ] + ], + [ + "Legislative drafting", + "000053.htm", + [ + "Draft Bill amendment process", + "000070.htm" + ], + [ + "Legislation review", + "000071.htm" + ], + [ + "Preparation of legislative regulations", + "000072.htm" + ] + ], + [ + "Official protocol", + "000054.htm", + [ + "Ceremonial events and representation", + "000073.htm" + ], + [ + "Head of Government protocol", + "000074.htm" + ], + [ + "Official establishment management", + "000075.htm" + ], + [ + "Official hospitality", + "000076.htm" + ], + [ + "Official visits", + "000077.htm" + ] + ], + [ + "Parliamentary chamber support", + "000045.htm", + [ + "Hansard services", + "000058.htm" + ], + [ + "Parliamentary papers", + "000059.htm" + ], + [ + "Tabling of official documents", + "000060.htm" + ] + ], + [ + "Parliamentary committee and member support", + "000047.htm" + ], + [ + "Population census", + "000044.htm", + [ + "Demographic surveys", + "000055.htm" + ], + [ + "Household census", + "000056.htm" + ], + [ + "Population distribution analysis", + "000057.htm" + ] + ], + [ + "Public administration", + "002290.htm", + [ + "Government auditing", + "002291.htm" + ], + [ + "Public service", + "002292.htm" + ], + [ + "Territories administration", + "002293.htm" + ] + ], + [ + "Statistics", + "002289.htm" + ] + ], + [ + "HEALTH CARE", + "000003.htm", + [ + "Community health services", + "000078.htm", + [ + "Clinical health services", + "000087.htm" + ], + [ + "Health promotion", + "000089.htm" + ], + [ + "Primary health care", + "000090.htm" + ] + ], + [ + "Health insurance schemes", + "000079.htm" + ], + [ + "Health protocol administration", + "000080.htm", + [ + "Drugs and poisons regulation", + "000091.htm" + ], + [ + "Food hygiene regulation", + "000092.htm" + ], + [ + "Practitioner discipline", + "000093.htm" + ], + [ + "Practitioner registration", + "000095.htm" + ] + ], + [ + "Hospital services", + "000081.htm", + [ + "Hospital administration", + "000096.htm" + ], + [ + "Patient care", + "000097.htm" + ], + [ + "Pharmaceutical and drug support", + "000098.htm" + ] + ], + [ + "Medical research", + "000083.htm", + [ + "Ethical compliance", + "000099.htm" + ], + [ + "Medical aids regulation", + "000100.htm" + ], + [ + "Medical research funding", + "000101.htm" + ], + [ + "National referral laboratory services", + "000102.htm" + ], + [ + "Population-based research", + "000103.htm" + ] + ], + [ + "Public health services", + "000084.htm", + [ + "Epidemiology", + "000104.htm" + ], + [ + "Health disaster preparedness", + "000106.htm" + ], + [ + "Health hazard prevention", + "000105.htm" + ], + [ + "Medical quarantine services", + "000108.htm" + ], + [ + "Notifiable disease management", + "000109.htm" + ] + ], + [ + "Special needs services", + "000085.htm", + [ + "Dental health services", + "000111.htm" + ], + [ + "Independent living services", + "000112.htm" + ], + [ + "Mental health services", + "000113.htm" + ], + [ + "Residential services", + "000114.htm" + ] + ], + [ + "Veterans\" health services", + "000086.htm" + ] + ], + [ + "IMMIGRATION", + "000004.htm", + [ + "Citizenship", + "000115.htm", + [ + "Naturalisation assessment", + "000121.htm" + ], + [ + "Presentation arrangements", + "000122.htm" + ] + ], + [ + "Deportation", + "000116.htm" + ], + [ + "Detention programs", + "000117.htm" + ], + [ + "Migrant services", + "000118.htm", + [ + "Interpreter services", + "000123.htm" + ], + [ + "Migrant accommodation services", + "000125.htm" + ], + [ + "Migrant settlement programs", + "000126.htm" + ] + ], + [ + "Refugee services", + "000119.htm" + ], + [ + "Travel authorisation", + "000120.htm", + [ + "Permanent entry arrangements", + "000127.htm" + ], + [ + "Temporary entry arrangements", + "000128.htm" + ] + ] + ], + [ + "INDIGENOUS AFFAIRS", + "002285.htm", + [ + "Indigenous cultural heritage", + "000495.htm", + [ + "Cultural artefact repatriation", + "001772.htm" + ] + ], + [ + "Indigenous enterprise development", + "000496.htm" + ], + [ + "Indigenous health services", + "000082.htm" + ], + [ + "Indigenous heritage conservation", + "000497.htm" + ], + [ + "Indigenous reconciliation", + "000051.htm" + ], + [ + "Indigenous welfare programs", + "000498.htm" + ] + ], + [ + "INTERNATIONAL RELATIONS", + "000005.htm", + [ + "Consular services", + "000129.htm" + ], + [ + "Defence liaison", + "000132.htm", + [ + "Defence attachés", + "000140.htm" + ], + [ + "Defence cooperation programs", + "000141.htm" + ], + [ + "Defence personnel exchanges", + "000142.htm" + ], + [ + "Military advisors", + "000143.htm" + ] + ], + [ + "Diplomatic missions", + "000130.htm" + ], + [ + "International affairs", + "000131.htm", + [ + "Disarmament and arms control", + "000137.htm" + ], + [ + "Nuclear safeguards", + "000139.htm" + ] + ], + [ + "International treaties", + "000133.htm", + [ + "Treaty administration", + "001384.htm" + ] + ], + [ + "Overseas aid programs", + "000134.htm", + [ + "Development assistance programs", + "000146.htm" + ], + [ + "Overseas student scholarship programs", + "000147.htm" + ] + ], + [ + "Overseas promotion", + "000135.htm" + ], + [ + "Passport services", + "000136.htm" + ] + ], + [ + "JUSTICE ADMINISTRATION", + "000006.htm", + [ + "Administrative law", + "000149.htm", + [ + "Administrative decision appeal", + "000163.htm" + ], + [ + "Administrative decision review", + "000164.htm" + ], + [ + "Censorship standards", + "000165.htm" + ], + [ + "Copyright regulation", + "000166.htm" + ], + [ + "Recordkeeping standards", + "000167.htm" + ] + ], + [ + "Associations and corporate law", + "000150.htm", + [ + "Bankruptcy proceedings", + "000168.htm" + ], + [ + "Merger regulation", + "000169.htm" + ] + ], + [ + "Civil law", + "000151.htm", + [ + "Civil registration", + "000170.htm" + ], + [ + "Conveyancing", + "000171.htm" + ], + [ + "Dispute mediation programs", + "000174.htm" + ], + [ + "Family law proceedings", + "000172.htm" + ], + [ + "Probate applications", + "000173.htm" + ] + ], + [ + "Commissions of inquiry", + "000152.htm" + ], + [ + "Coronial law", + "000153.htm" + ], + [ + "Court reporting", + "000154.htm" + ], + [ + "Criminal law", + "000155.htm" + ], + [ + "Human rights obligations", + "000156.htm" + ], + [ + "Juvenile justice", + "000157.htm" + ], + [ + "Legal aid services", + "000158.htm" + ], + [ + "Local laws and ordinances", + "000159.htm" + ], + [ + "Native title claims", + "000160.htm", + [ + "Native title mediation programs", + "000180.htm" + ], + [ + "Native title settlement negotiations", + "000181.htm" + ] + ], + [ + "Privacy guideline monitoring", + "000161.htm" + ], + [ + "Prosecution services", + "000162.htm" + ] + ], + [ + "MARITIME SERVICES", + "000007.htm", + [ + "Cargo control", + "000198.htm" + ], + [ + "Harbour management", + "000183.htm" + ], + [ + "Marina management", + "000184.htm" + ], + [ + "Navigation", + "000185.htm", + [ + "Charting sea lanes", + "000191.htm" + ], + [ + "Light station maintenance", + "000192.htm" + ], + [ + "Navigation systems development", + "000193.htm" + ] + ], + [ + "Pilotage management", + "000182.htm" + ], + [ + "Port regulation", + "001471.htm" + ], + [ + "Sea passengers", + "001487.htm" + ], + [ + "Search and rescue", + "000187.htm", + [ + "Rescue coordination", + "000194.htm" + ], + [ + "Search technology development", + "000195.htm" + ] + ], + [ + "Ship personnel", + "000188.htm", + [ + "Personnel safety standards", + "000196.htm" + ], + [ + "Pilot licensing", + "000197.htm" + ] + ], + [ + "Ship safety", + "000189.htm", + [ + "Seaworthiness", + "000201.htm" + ], + [ + "Ship commissioning", + "000199.htm" + ], + [ + "Ship inspection", + "000200.htm" + ] + ] + ], + [ + "NATURAL RESOURCES", + "000009.htm", + [ + "Crown land administration", + "000218.htm" + ], + [ + "Energy resources", + "001451.htm", + [ + "Fossil fuel management", + "000226.htm" + ], + [ + "Renewable energy development", + "000227.htm" + ] + ], + [ + "Land use planning", + "000220.htm", + [ + "Land use zoning", + "001429.htm" + ] + ], + [ + "Land valuation", + "000222.htm" + ], + [ + "Mineral resources", + "000223.htm", + [ + "Land rehabilitation programs", + "000231.htm" + ], + [ + "Mining regulations", + "000232.htm" + ] + ], + [ + "Pollution emission control", + "000224.htm" + ], + [ + "Water resources", + "000225.htm", + [ + "Water conservation plans", + "000233.htm" + ], + [ + "Water quality monitoring", + "000234.htm" + ], + [ + "Water usage management", + "000235.htm" + ], + [ + "Waterway management", + "000236.htm" + ] + ] + ], + [ + "PRIMARY INDUSTRIES", + "000008.htm", + [ + "Chemical and pesticide regulation", + "000202.htm" + ], + [ + "Marine and rural regulation", + "000204.htm", + [ + "Agricultural industry", + "000208.htm" + ], + [ + "Fisheries industry", + "000209.htm" + ], + [ + "Food quality assurance", + "000213.htm" + ], + [ + "Forestry industry", + "000210.htm" + ] + ], + [ + "Marine and rural support", + "000205.htm", + [ + "Aquaculture industry", + "000212.htm" + ], + [ + "Horticultural industry", + "000214.htm" + ], + [ + "Pastoral industry", + "000215.htm" + ], + [ + "Silvicultural industry", + "000216.htm" + ], + [ + "Viticultural industry", + "000217.htm" + ] + ], + [ + "Quarantine", + "000211.htm" + ], + [ + "Rural field day promotion", + "000206.htm" + ], + [ + "Rural partnership programs", + "000207.htm" + ] + ], + [ + "SCIENCE", + "000010.htm", + [ + "Agricultural sciences", + "000237.htm" + ], + [ + "Animal and veterinary sciences", + "000238.htm" + ], + [ + "Applied sciences", + "000239.htm", + [ + "Engineering and technology sciences", + "000246.htm" + ], + [ + "Weights and measures standards", + "000247.htm" + ] + ], + [ + "Biological sciences", + "000240.htm", + [ + "Biochemistry", + "000248.htm" + ], + [ + "Biodiversity preservation", + "000249.htm" + ], + [ + "Biotechnology development", + "000250.htm" + ], + [ + "Botany", + "000251.htm" + ], + [ + "Entomology", + "000252.htm" + ], + [ + "Genetic engineering", + "000253.htm" + ], + [ + "Physiology", + "000254.htm" + ] + ], + [ + "Earth sciences", + "000241.htm", + [ + "Atmospheric sciences", + "000255.htm" + ], + [ + "Hydrology", + "000256.htm" + ], + [ + "Mineral exploration", + "000257.htm" + ], + [ + "Oceanography", + "000258.htm" + ], + [ + "Seismology", + "000259.htm" + ] + ], + [ + "Mathematical sciences", + "000242.htm" + ], + [ + "Medical and health sciences", + "001229.htm" + ], + [ + "Physical sciences", + "000244.htm", + [ + "Astronomical sciences", + "000260.htm" + ], + [ + "Atomic and molecular sciences", + "000261.htm" + ], + [ + "Nuclear sciences", + "000262.htm" + ] + ], + [ + "Spatial information research", + "000245.htm" + ] + ], + [ + "SECURITY", + "000011.htm", + [ + "Corrective services", + "000263.htm", + [ + "Community based corrections", + "000270.htm" + ], + [ + "Detention centre management", + "000271.htm" + ] + ], + [ + "External security", + "000264.htm", + [ + "Peacekeeping forces", + "000273.htm" + ] + ], + [ + "Information security", + "000265.htm" + ], + [ + "Intelligence", + "000266.htm", + [ + "Forensic analysis", + "000275.htm" + ], + [ + "Intelligence liaison", + "001159.htm" + ], + [ + "Intelligence support", + "000277.htm" + ] + ], + [ + "Law enforcement", + "000267.htm", + [ + "Community policing", + "000278.htm" + ], + [ + "Criminology", + "000279.htm" + ], + [ + "Police administration", + "000280.htm" + ], + [ + "Protective services", + "000281.htm" + ] + ], + [ + "National security", + "001548.htm", + [ + "Coastal surveillance", + "000269.htm" + ] + ] + ], + [ + "SPORT AND RECREATION", + "000012.htm", + [ + "Caravan and camping services", + "000284.htm" + ], + [ + "Community recreational programs", + "000285.htm", + [ + "Gambling support services", + "000290.htm" + ], + [ + "Public fitness promotion", + "000291.htm" + ], + [ + "Social club support", + "000292.htm" + ], + [ + "Volunteer support programs", + "000293.htm" + ] + ], + [ + "Gaming industry regulation", + "000286.htm" + ], + [ + "Park and reserve services", + "000289.htm" + ], + [ + "Sport and fitness development", + "000287.htm", + [ + "Athlete scholarship programs", + "000295.htm" + ], + [ + "Fundraising and donation schemes", + "000296.htm" + ], + [ + "Games administration", + "000297.htm" + ], + [ + "Games promotion", + "000298.htm" + ], + [ + "Sporting grants administration", + "000299.htm" + ] + ], + [ + "Sports drugs monitoring", + "000288.htm", + [ + "Doping detection research", + "000300.htm" + ] + ] + ], + [ + "TOURISM", + "000013.htm", + [ + "Tourism industry development", + "000301.htm" + ], + [ + "Tourist event promotion", + "000302.htm", + [ + "Advertising campaigns", + "000305.htm" + ] + ], + [ + "Travel missions", + "000303.htm" + ] + ], + [ + "TRADE", + "000014.htm", + [ + "Export regulation", + "000311.htm", + [ + "Export promotion", + "000320.htm" + ], + [ + "Prohibited export control", + "000321.htm" + ] + ], + [ + "Import regulation", + "000312.htm", + [ + "Prohibited import control", + "000323.htm" + ], + [ + "Tariff regulation", + "000322.htm" + ] + ], + [ + "Intellectual property management", + "000910.htm", + [ + "Copyright registration", + "000308.htm" + ], + [ + "Design registration", + "000310.htm" + ], + [ + "Patent registration", + "000315.htm" + ], + [ + "Trademark registration", + "000318.htm" + ] + ], + [ + "International trade agreements", + "000313.htm" + ], + [ + "Interstate trade agreements", + "000314.htm" + ], + [ + "Trade development programs", + "000316.htm" + ], + [ + "Trade expositions", + "000317.htm" + ] + ], + [ + "TRANSPORT", + "000015.htm", + [ + "Air transport", + "000324.htm", + [ + "Air transport safety", + "000332.htm" + ], + [ + "Aircraft standards", + "000330.htm" + ], + [ + "Airport services", + "000331.htm" + ] + ], + [ + "Freight movement regulation", + "000325.htm" + ], + [ + "Passenger services", + "000326.htm" + ], + [ + "Rail transport", + "000327.htm", + [ + "Rail harmonisation standards", + "000333.htm" + ], + [ + "Rail land acquisition regulation", + "000336.htm" + ], + [ + "Rail transport safety", + "000337.htm" + ], + [ + "Railway maintenance", + "000338.htm" + ], + [ + "Rolling stock regulation", + "000339.htm" + ] + ], + [ + "Road transport", + "000328.htm", + [ + "Driving licences administration", + "000340.htm" + ], + [ + "Road surface maintenance", + "000341.htm" + ], + [ + "Road traffic regulation", + "000342.htm" + ], + [ + "Road transport safety", + "000343.htm" + ], + [ + "Vehicle registration", + "000344.htm" + ], + [ + "Vehicle standards", + "000345.htm" + ] + ], + [ + "Transport infrastructure development", + "000329.htm" + ] + ] +] --- /dev/null +++ b/admin/validation.py @@ -1,1 +1,30 @@ +#http://packages.python.org/CouchDB/client.html +import couchdb +import json +import pprint +import re +from tidylib import tidy_document +couch = couchdb.Server('http://127.0.0.1:5984/') + +# select database +docsdb = couch['disclosr-documents'] + +def f(x): + invalid = re.compile(r"ensure|testing|flicker|updating|longdesc|Accessibility Checks|not recognized") + valid = re.compile(r"line") + return (not invalid.search(x)) and valid.search(x) and x != '' + +for row in docsdb.view('app/getValidationRequired'): + print row.id + html = docsdb.get_attachment(row.id,row.value.iterkeys().next()).read() + #print html + document, errors = tidy_document(html,options={'accessibility-check':1,'show-warnings':0,'markup':0},keep_doc=True) + #http://www.aprompt.ca/Tidy/accessibilitychecks.html + #print document + errors = '\n'.join(filter(f,errors.split('\n'))) + #print errors + doc = docsdb.get(row.id) + doc['validation'] = errors + docsdb.save(doc) + --- a/alaveteli/exportAgencies.csv.php +++ b/alaveteli/exportAgencies.csv.php @@ -1,20 +1,6 @@ id; $row["name"] = trim($agency->value->name); - if (isset($agency->value->foiEmail)) { - $row["request_email"] = $agency->value->foiEmail; - } else { - if ($agency->value->orgType == "FMA-DepartmentOfState") { - $row["request_email"] = "foi@" . GetDomain($agency->value->website); - } else { - $row["request_email"] = $foiEmail[$agency->value->parentOrg]; + $row["request_email"] = (isset($agency->value->foiEmail) ? $agency->value->foiEmail : ""); + $row["short_name"] = (isset($agency->value->shortName) ? $agency->value->shortName : ""); + $row["notes"] = (isset($agency->value->description) ? $agency->value->description : ""); + + $otherBodies = Array(); + if (isset($agency->value->foiBodies)) { + $otherBodies = array_merge($otherBodies, $agency->value->foiBodies); + } + if (isset($agency->value->positions)) { + $positions = Array(); + foreach ($agency->value->positions as $position) { + $positions[] = "Office of the ".$position; } + $otherBodies = array_merge($otherBodies, $positions); } - if (isset($agency->value->shortName)) { - $row["short_name"] = $agency->value->shortName; - } else { - $row["short_name"] = shortName($agency->value->name); + sort($otherBodies); + if (count($otherBodies) > 0) { + $row["notes"] .= "
This department also responds to requests for information held by " . implode(", ", $otherBodies); } - $row["notes"] = ""; + $row["publication_scheme"] = (isset($agency->value->infoPublicationSchemeURL) ? $agency->value->infoPublicationSchemeURL : ""); $row["home_page"] = (isset($agency->value->website) ? $agency->value->website : ""); if ($agency->value->orgType == "FMA-DepartmentOfState") { - $row["tag_string"] = $tag[$agency->value->_id] . " " . $agency->value->orgType; + $row["tag_string"] = $tag[$agency->value->_id]; } else { - $row["tag_string"] = $tag[$agency->value->parentOrg] . " " . $agency->value->orgType; + $row["tag_string"] = $tag[$agency->value->parentOrg]; } - + $row["tag_string"] .= " " . $agency->value->orgType; + $row["tag_string"] .= " federal"; fputcsv($fp, array_values($row)); - - if (isset($agency->value->foiBodies)) { - foreach ($agency->value->foiBodies as $foiBody) { - $row['name'] = iconv("UTF-8", "ASCII//TRANSLIT",$foiBody); - $row["short_name"] = shortName($foiBody); - fputcsv($fp, array_values($row)); - } - } } } } catch (SetteeRestClientException $e) { --- /dev/null +++ b/bubbletree.php @@ -1,1 +1,126 @@ + + + + + Minimal BubbleTree Demo + + + + + + + + + + + + + +
+
+
+ + + --- a/charts.php +++ b/charts.php @@ -1,100 +1,131 @@ get_db('disclosr-agencies'); - - ?>

Charts

Lorem ipsum.

-
+
+
"; - echo "" . $schemas['agency']["properties"][$key]['x-title'] . "
" . $schemas['agency']["properties"][$key]['description'] . ""; + echo ""; + if (isset($schemas['agency']["properties"][$key])) { + echo $schemas['agency']["properties"][$key]['x-title'] . "
" . $schemas['agency']["properties"][$key]['description'].""; + } + echo ""; if (is_array($value)) { echo "
    "; foreach ($value as $subkey => $subvalue) { - if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) { - echo '
  1. '; - } else { - echo "
  2. "; - } + + echo "
  3. "; + echo "$subvalue
  4. "; } echo "
"; } else { - if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) { - echo ''; + if (isset($schemas['agency']["properties"][$key]['x-property'])) { + echo ''; } else { echo ""; } - if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { - echo "view"; - } else { - echo "$value"; - } + if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { + echo "$value"; + } else { + echo "$value"; + } } echo ""; } @@ -53,15 +61,16 @@ } else if ($key == "parentOrg") { echo ""; - } else { + } else { echo ""; if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { - echo "view"; + echo "view"; + } if ($key == 'abn') { echo "view abn"; @@ -69,7 +78,7 @@ } } } - // +// } function addDefaultFields($row) { @@ -78,13 +87,22 @@ foreach ($defaultFields as $defaultField) { if (!isset($row[$defaultField])) { if ($schemas['agency']['properties'][$defaultField]['type'] == "string") { - - $row[$defaultField] = ""; - + $row[$defaultField] = ""; } if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { - $row[$defaultField] = Array(""); + } + } else if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { + if (is_array($row[$defaultField])) { + $row[$defaultField][] = ""; + $row[$defaultField][] = ""; + $row[$defaultField][] = ""; + } else { + $value = $row[$defaultField]; + $row[$defaultField] = Array($value); + $row[$defaultField][] = ""; + $row[$defaultField][] = ""; + } } } @@ -94,42 +112,53 @@ $db = $server->get_db('disclosr-agencies'); if (isset($_REQUEST['id'])) { - //get an agency record as json/html, search by name/abn/id +//get an agency record as json/html, search by name/abn/id // by name = startkey="Ham"&endkey="Ham\ufff0" // edit? - $row = $db->get($_REQUEST['id']); - //print_r($row); + $obj = $db->get($_REQUEST['id']); + include_header($obj->name); +//print_r($row); if (sizeof($_POST) > 0) { - //print_r($_POST); +//print_r($_POST); foreach ($_POST as $postkey => $postvalue) { if ($postvalue == "") { unset($_POST[$postkey]); } - if (is_array($postvalue) && count($postvalue) == 1 && $postvalue[0] == "") { - unset($_POST[$postkey]); + if (is_array($postvalue)) { + if (count($postvalue) == 1 && $postvalue[0] == "") { + unset($_POST[$postkey]); + } else { + foreach ($_POST[$postkey] as $key => &$value) { + if ($value == "") { + unset($_POST[$postkey][$key]); + } + } + } } } 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); + $obj = $db->save($newdoc); } else { echo "ALERT doc revised by someone else while editing. Document not saved."; } } - $mode = "edit"; + $mode = "view"; + $rowArray = object_to_array($obj); +ksort($rowArray); if ($mode == "edit") { - $row = addDefaultFields(object_to_array($row)); + $row = addDefaultFields($rowArray); } else { - $row = object_to_array($row); - } - + $row = $rowArray; + } + if ($mode == "view") { - echo '
'; - echo '"; + echo '

' . $row['name'] . "

'; + echo '"; echo ""; } if ($mode == "edit") { @@ -153,40 +182,45 @@ }; - $value) { - echo displayValue($key, $value, $mode); - } - if ($mode == "view") { - echo "

' . $row['name'] . "

Field NameField Value
"; - } - if ($mode == "edit") { - echo ''; - } -} else { - - try { - /* $rows = $db->get_view("app", "showNamesABNs")->rows; - //print_r($rows); - foreach ($rows as $row) { - // print_r($row); - echo '
  • ' . - (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) - . '
  • '; - } */ - $rows = $db->get_view("app", "byName")->rows; - //print_r($rows); - foreach ($rows as $row) { - // print_r($row); - echo '
  • '; - } - } catch (SetteeRestClientException $e) { - setteErrorHandler($e); - } -} -include_footer(); -?> + $value) { + echo displayValue($key, $value, $mode); + } + if ($mode == "view") { + echo ""; + } + if ($mode == "edit") { + echo ''; + } + } else { +// show all list + include_header('Agencies'); + try { + /* $rows = $db->get_view("app", "showNamesABNs")->rows; + //print_r($rows); + foreach ($rows as $row) { + // print_r($row); + echo '
  • ' . + (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) + . '
  • '; + } */ + $rows = $db->get_view("app", "byCanonicalName")->rows; + //print_r($rows); + echo '"; + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } + } + include_footer(); + ?> + --- /dev/null +++ b/google676a414ad086cefb.html @@ -1,1 +1,2 @@ +google-site-verification: google676a414ad086cefb.html --- a/graph.php +++ b/graph.php @@ -6,36 +6,46 @@ $format = $_REQUEST['format']; } -function add_node($id, $label) { +function add_node($id, $label, $parent="") { global $format; if ($format == "html") { - echo "nodes[\"$id\"] = graph.newNode({label: \"$label\"});" . PHP_EOL; + // echo "nodes[\"$id\"] = graph.newNode({label: \"$label\"});" . PHP_EOL; } if ($format == "dot" && $label != "") { echo "$id [label=\"$label\"];". PHP_EOL; } + if ($format == "gexf") { + echo "":">") + ."" + ."". PHP_EOL; + } } function add_edge($from, $to, $color) { global $format; if ($format == "html") { - echo "graph.newEdge(nodes[\"$from\"], nodes['$to'], {color: '$color'});" . PHP_EOL; + // echo "graph.newEdge(nodes[\"$from\"], nodes['$to'], {color: '$color'});" . PHP_EOL; } if ($format == "dot") { echo "$from -> $to ".($color != ""? "[color=$color]":"").";". PHP_EOL; } + if ($format == "gexf") { + echo "". PHP_EOL; + } +} +if ($format == "gexf") { + //header('Content-Type: text/xml'); + header('Content-Type: application/gexf+xml'); +echo ' + + + Gexf.net + A hello world! file + + + '. PHP_EOL; } -if ($format == "html") { - ?> - - - - +
    + + + + + +
    +
    '. PHP_EOL; +} //include_footer(); ?> --- a/include/common.inc.php +++ b/include/common.inc.php @@ -11,7 +11,14 @@ include_once ('couchdb.inc.php'); include_once ('template.inc.php'); +require_once $basePath.'lib/Requests/library/Requests.php'; +Requests::register_autoloader(); +require $basePath."lib/amon-php/amon.php"; +Amon::config(array('address'=> 'http://127.0.0.1:2464', + 'protocol' => 'http', + 'secret_key' => "I2LJ6dOMmlnXgVAkTPFXd5M3ejkga8Gd2FbBt6iqZdw")); +Amon::setup_exception_handler(); # Convert a stdClass to an Array. http://www.php.net/manual/en/language.types.object.php#102735 function object_to_array(stdClass $Class) { @@ -49,6 +56,9 @@ function phrase_to_tag ($phrase) { return str_replace(" ","_",str_replace("'","",str_replace(",","",strtolower($phrase)))); } +function local_url() { + return "http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . "/"; +} function GetDomain($url) { $nowww = ereg_replace('www\.','',$url); --- a/include/couchdb.inc.php +++ b/include/couchdb.inc.php @@ -3,6 +3,31 @@ include $basePath . "schemas/schemas.inc.php"; require ($basePath . 'couchdb/settee/src/settee.php'); + +function createDocumentsDesignDoc() { + /* "views": { + "web_server": { + "map": "function(doc) {\n emit(doc.web_server, 1);\n}", + "reduce": "function (key, values, rereduce) {\n return sum(values);\n}" + }, + "byAgency": { + "map": "function(doc) {\n emit(doc.agencyID, 1);\n}", + "reduce": "function (key, values, rereduce) {\n return sum(values);\n}" + }, + "byURL": { + "map": "function(doc) {\n emit(doc.url, doc);\n}" + }, + "agency": { + "map": "function(doc) {\n emit(doc.agencyID, doc);\n}" + }, + "byWebServer": { + "map": "function(doc) {\n emit(doc.web_server, doc);\n}" + }, + "getValidationRequired": { + "map": "function(doc) {\nif (doc.mime_type == \"text/html\" \n&& typeof(doc.validation) == \"undefined\") {\n emit(doc._id, doc._attachments);\n}\n}" + } + } */ +} function createAgencyDesignDoc() { global $db; @@ -29,9 +54,17 @@ $obj->views->byName->map = 'function(doc) { if (typeof(doc["status"]) == "undefined" || doc["status"] != "suspended") { emit(doc.name, doc._id); +if (typeof(doc.shortName) != "undefined" && doc.shortName != doc.name) { + emit(doc.shortName, doc._id); +} for (name in doc.otherNames) { if (doc.otherNames[name] != "" && doc.otherNames[name] != doc.name) { emit(doc.otherNames[name], doc._id); +} + } + for (name in doc.foiBodies) { +if (doc.foiBodies[name] != "" && doc.foiBodies[name] != doc.name) { + emit(doc.foiBodies[name], doc._id); } } } @@ -62,27 +95,31 @@ } }"; // http://stackoverflow.com/questions/646628/javascript-startswith - $obj->views->scoreHas->map = 'if(!String.prototype.startsWith){ + $obj->views->score->map = 'if(!String.prototype.startsWith){ String.prototype.startsWith = function (str) { return !this.indexOf(str); } } -if(!String.prototype.endsWith){ - String.prototype.endsWith = function(suffix) { -     return this.indexOf(suffix, this.length - suffix.length) !== -1; - }; -} + function(doc) { -if (typeof(doc["status"]) == "undefined" || doc["status"] != "suspended") { -for(var propName in doc) { - if(typeof(doc[propName]) != "undefined" && (propName.startsWith("has") || propName.endsWith("URL"))) { - emit(propName, 1); - } -} - emit("total", 1); - } + count = 0; + if (doc["status"] != "suspended") { + for(var propName in doc) { + if(typeof(doc[propName]) != "undefined" && doc[propName] != "") { + count++; + } + } + portfolio = doc.parentOrg; + if (doc.orgType == "FMA-DepartmentOfState") { + portfolio = doc._id; + } + if (doc.orgType == "Court-Commonwealth" || doc.orgType == "FMA-DepartmentOfParliament") { + portfolio = doc.orgType; + } + emit(count+doc._id, {id:doc._id, name: doc.name, score:count, orgType: doc.orgType, portfolio:portfolio}); + } }'; - $obj->views->scoreHas->map = 'if(!String.prototype.startsWith){ + $obj->views->scoreHas->map = 'if(!String.prototype.startsWith){ String.prototype.startsWith = function (str) { return !this.indexOf(str); } @@ -105,7 +142,7 @@ $obj->views->scoreHas->reduce = 'function (key, values, rereduce) { return sum(values); }'; - $obj->views->fieldNames->map = ' + $obj->views->fieldNames->map = ' function(doc) { for(var propName in doc) { emit(propName, doc._id); @@ -120,16 +157,18 @@ } if (php_uname('n') == "vanille") { - - $server = new SetteeServer('http://192.168.178.21:5984'); + $serverAddr = 'http://192.168.178.21:5984/'; } else if (php_uname('n') == "KYUUBEY") { - $server = new SetteeServer('http://192.168.1.148:5984'); + $serverAddr = 'http://192.168.1.148:5984/'; } else { - $server = new SetteeServer('http://127.0.0.1:5984'); + $serverAddr = 'http://127.0.0.1:5984/'; +} +$server = new SetteeServer($serverAddr); + +function setteErrorHandler($e) { + Amon::log($e->getMessage() . " " . print_r($_SERVER,true), array('error')); + echo $e->getMessage() . "
    " . PHP_EOL; } -function setteErrorHandler($e) { - echo $e->getMessage() . "
    " . PHP_EOL; -} --- a/include/template.inc.php +++ b/include/template.inc.php @@ -1,6 +1,6 @@ @@ -16,7 +16,7 @@ - Disclosr + <?php echo $title; ?> - Disclosr @@ -33,7 +33,7 @@ - +