From: Alex Sadleir Date: Wed, 02 Apr 2014 02:28:56 +0000 Subject: naa import update X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=c1289bb746febc08b38df8942d0ac0f452cfdd00 --- naa import update --- --- a/admin/importOAICFOIrequests.php +++ b/admin/importOAICFOIrequests.php @@ -17,13 +17,13 @@ if ($row >= 1) { // print_r($data); $name = trim($data[2]); - echo "$name
"; +// echo "$name
"; if ($data[0] != "TOTALS" && $data[0] != "") { if (isset($nametoid[$name])) { $id = $nametoid[$name]; $timePeriod = $data[0] . "-Q" . $data[1]; - echo "$timePeriod
"; +// echo "$timePeriod
"; unset($data[0]); unset($data[1]); unset($data[2]); @@ -38,10 +38,13 @@ $result = Array("source" => "http://data.gov.au/dataset/freedom-of-information-quarterly-request-and-review-statistical-data-2011-12/"); foreach ($data as $key => $datum) { if ($datum != 0) { +// tODO prefix header with "FOI" +if (isset($stats[$id][$timePeriod][$key])) $datum += $stats[$id][$timePeriod][$key]; $result[trim($headers[$key])] = $datum; } } $stats[$id][$timePeriod] = $result; +// TODO merge if already exists //print_r($stats); } else { echo "
ERROR NAME MISSING FROM ID LIST

$row" . PHP_EOL; @@ -57,21 +60,24 @@ } fclose($handle); } +echo "all stats loaded successfuly"; foreach ($stats as $id => $stat) { echo $id . "
" . PHP_EOL; - $doc = $db->get($id); + $doc = $db->get($id); echo $doc->name . "
" . PHP_EOL; - print_r($stat); - die(); +// print_r($stat); // print_r($doc); $changed = false; if (!isset($doc->statistics)) { $changed = true; $doc->statistics = Array(); + } else { + $doc->statistics = object_to_array($doc->statistics); } foreach ($stat as $timePeriod => $value) { - if (!isset($doc->statistics->foiRequests->$timePeriod) - || $doc->statistics->foiRequests->$timePeriod != $value) { + if (!isset($doc->statistics["foiRequests"][$timePeriod]) + || $doc->statistics["foiRequests"][$timePeriod] != $value + ) { $changed = true; $doc->statistics["foiRequests"][$timePeriod] = $value; } @@ -81,6 +87,7 @@ } else { echo "not changed" . "
" . PHP_EOL; } +//print_r($doc);die(); } ?> --- a/admin/logo.svg +++ /dev/null @@ -1,34 +1,1 @@ - - - - - - - - - - - - - - - - - - - - - --- /dev/null +++ b/admin/neo4jimporter/.idea/.name @@ -1,1 +1,1 @@ - +neo4jimporter --- /dev/null +++ b/admin/neo4jimporter/.idea/compiler.xml @@ -1,1 +1,34 @@ + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/encodings.xml @@ -1,1 +1,6 @@ + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_3_1.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0_1.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_apache_lucene_lucene_core_3_6_2.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_2.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_2_0.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_neo4j_neo4j_2_0_0_M03.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_neo4j_neo4j_cypher_2_0_0_M03.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_neo4j_neo4j_graph_algo_2_0_0_M03.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_neo4j_neo4j_graph_matching_2_0_0_M03.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_neo4j_neo4j_jmx_2_0_0_M03.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_neo4j_neo4j_kernel_2_0_0_M03.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_neo4j_neo4j_lucene_index_2_0_0_M03.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_neo4j_neo4j_udc_2_0_0_M03.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__org_scala_lang_scala_library_2_10_0.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/libraries/Maven__postgresql_postgresql_9_1_901_jdbc4.xml @@ -1,1 +1,13 @@ - + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/misc.xml @@ -1,1 +1,28 @@ + + + + + + + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/modules.xml @@ -1,1 +1,10 @@ + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/neo4jimporter.iml @@ -1,1 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/scopes/scope_settings.xml @@ -1,1 +1,5 @@ - + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/vcs.xml @@ -1,1 +1,9 @@ + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/.idea/workspace.xml @@ -1,1 +1,702 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Android 4.2 Platform + + + + + + + + neo4jimporter + + + + + + + + 1.7 + + + + + + + + Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.3.1 + + + + + + + + + --- /dev/null +++ b/admin/neo4jimporter/agency-sample.xml @@ -1,1 +1,9967 @@ + + + + CA 1 + 19001029 + Governor-General + + + + + + CA 1 + 19001029 + CEREMONIAL FUNCTIONS + 20071203 + (null) + (null) + + + CA 1 + 19001029 + COMMONWEALTH STATE RELATIONS + 20071203 + (null) + (null) + + + CA 1 + 19001029 + GOVERNOR GENERAL + 20071203 + (null) + (null) + + + CA 1 + (null) + 19140701 + (null) + PCS + (null) + + + CA 1 + (null) + 19001029 + (null) + PCS + (null) + + + CA 1 + (null) + 19820729 + (null) + PCS + (null) + + + CA 1 + (null) + 19350101 + (null) + PCS + circa + + + CA 1 + (null) + 19530501 + (null) + PCS + circa + + + CA 1 + (null) + 19751111 + (null) + PCS + (null) + + + CA 1 + (null) + 19310101 + (null) + PCS + circa + + + CA 1 + (null) + 19540601 + (null) + PCS + circa + + + CA 1</