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 @@ -25,4 +25,7 @@ [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/alaveteli/exportAgencies.csv.php +++ b/alaveteli/exportAgencies.csv.php @@ -52,18 +52,23 @@ $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)) { - $otherBodies = array_merge($otherBodies, $agency->value->positions); + $positions = Array(); + foreach ($agency->value->positions as $position) { + $positions[] = "Office of the ".$position; + } + $otherBodies = array_merge($otherBodies, $positions); } + sort($otherBodies); if (count($otherBodies) > 0) { - $row["notes"] .= "
This department also responds to requests for information held by ".implode(",",$otherBodies); + $row["notes"] .= "
This department also responds to requests for information held by " . implode(", ", $otherBodies); } - + $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") { @@ -74,9 +79,6 @@ $row["tag_string"] .= " " . $agency->value->orgType; $row["tag_string"] .= " federal"; fputcsv($fp, array_values($row)); - - - } } } catch (SetteeRestClientException $e) { --- a/getAgency.php +++ b/getAgency.php @@ -9,7 +9,11 @@ if (strpos($key, "_") === 0 || $key== "metadata") return; echo ""; - 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) { --- a/include/common.inc.php +++ b/include/common.inc.php @@ -14,6 +14,11 @@ 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) { --- a/include/couchdb.inc.php +++ b/include/couchdb.inc.php @@ -168,6 +168,7 @@ $server = new SetteeServer($serverAddr); function setteErrorHandler($e) { + Amon::log($e->getMessage() . " " . print_r($_SERVER,true), array('error')); echo $e->getMessage() . "
    " . PHP_EOL; } --- /dev/null +++ b/js/bubbletree --- /dev/null +++ b/js/flotr2 --- /dev/null +++ b/js/sigma --- /dev/null +++ b/lib/amon-php