From: Maxious <maxious@lambdacomplex.org>
Date: Sat, 14 Jan 2012 09:31:24 +0000
Subject: Beginnings of visual conflict resolution
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=2b921f90255f3b989b7ec071e310ebfe9dff3650
---
Beginnings of visual conflict resolution


Former-commit-id: f8dfd63919aab30a6b99f6861e80a36b55f5af04
---


--- a/.gitmodules
+++ b/.gitmodules
@@ -4,4 +4,10 @@
 [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
 

--- a/admin/import.php
+++ b/admin/import.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'include/common.inc.php';
+require_once '../include/common.inc.php';
 try {
     $server->create_db('disclosr-agencies');
 } catch (SetteeRestClientException $e) {

--- /dev/null
+++ b/admin/resolveConflicts.php
@@ -1,1 +1,43 @@
+<?php
 
+include_once('../include/common.inc.php');
+include_header();
+// Include the diff class
+echo '<STYLE TYPE="text/css">
+<!--
+  @import url(../lib/php-diff/example/styles.css);
+-->
+</STYLE>
+    ';
+require_once dirname(__FILE__) . '/../lib/php-diff/lib/Diff.php';
+// Generate a side by side diff
+require_once dirname(__FILE__) . '/../lib/php-diff/lib/Diff/Renderer/Html/SideBySide.php';
+$renderer = new Diff_Renderer_Html_SideBySide;
+
+
+
+$db = $server->get_db('disclosr-agencies');
+$docs = Array();
+try {
+    $rows = $db->get_view("app", "getConflicts")->rows;
+    //print_r($rows);
+    foreach ($rows as $row) {
+        echo '<h2>' . $row->id . '</h2>';
+        echo "Comparing " . $row->value[0] . " and " . $row->value[1];
+        $docA = explode(",", json_encode($db->get($row->id . "?rev=" . $row->value[0])));
+        $docB = explode(",", json_encode($db->get($row->id . "?rev=" . $row->value[1])));
+        // Options for generating the diff
+        $options = array(
+                //'ignoreWhitespace' => true,
+                //'ignoreCase' => true,
+        );
+
+        // Initialize the diff class
+        $diff = new Diff($docA, $docB, $options);
+        echo $diff->Render($renderer);
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
+include_footer();
+?>

--- a/admin/verify.php
+++ b/admin/verify.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once('include/common.inc.php');
+include_once('../include/common.inc.php');
 include_header();
 
 $db = $server->get_db('disclosr-agencies');

--- /dev/null
+++ b/alaveteli/exportAgencies.csv.php
@@ -1,1 +1,75 @@
+<?php
 
+include_once("../include/common.inc.php");
+setlocale(LC_CTYPE, 'C');
+
+$headers = Array("#id", "name", "request_email", "short_name", "notes", "publication_scheme", "home_page", "tag_string");
+
+$db = $server->get_db('disclosr-agencies');
+
+$tag = Array();
+try {
+    $rows = $db->get_view("app", "byDeptStateName", null, true)->rows;
+    //print_r($rows);
+    foreach ($rows as $row) {
+        $tag[$row->value] = phrase_to_tag(dept_to_portfolio($row->key));
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
+
+$fp = fopen('php://output', 'w');
+if ($fp && $db) {
+    header('Content-Type: text/csv');
+    header('Content-Disposition: attachment; filename="export.' . date("c") . '.csv"');
+    header('Pragma: no-cache');
+    header('Expires: 0');
+    fputcsv($fp, $headers);
+    try {
+        $agencies = $db->get_view("app", "byCanonicalName", null, true)->rows;
+        //print_r($rows);
+        foreach ($agencies as $agency) {
+        //    print_r($agency);
+            $row = Array();
+            $row["#id"] = $agency->value->_id;
+            $row["name"] = $agency->value->name;
+            if (isset($agency->value->foi_email)) {
+            $row["request_email"] = $agency->value->foi_email;
+            } else {
+                $row["request_email"] = "foi@".GetDomain($agency->value->website);
+                // 
+            }
+            if (isset($agency->value->short_name)) {
+            $row["short_name"] = $agency->value->short_name;
+            } else {
+                $out = Array();
+                preg_match_all('/[A-Z]/', $agency->value->name, $out);
+                $row["short_name"] = implode("",$out[0]);
+            }
+            $row["notes"] = "";
+            $row["publication_scheme"] = $agency->value->infoPublicationSchemeURL;
+            $row["home_page"] = $agency->value->website;
+            if ($agency->value->orgType == "FMA-DepartmentOfState") {
+                $row["tag_string"] = $tag[$agency->value->_id];
+            } else {
+                $row["tag_string"] = $tag[$agency->value->parentOrg];;
+            }
+            
+            fputcsv($fp, array_values($row));
+            
+            if (isset($agency->value->foiBodies)) {
+                foreach ($agency->value->foiBodies as $foiBody) {
+                    $row['name'] = $foiBody;
+                    $row['short_name'] = "";
+                    fputcsv($fp, array_values($row));
+                }
+            }
+        }
+    } catch (SetteeRestClientException $e) {
+        setteErrorHandler($e);
+    }
+
+    die;
+}
+?>
+

--- /dev/null
+++ b/alaveteli/exportCategories.rb.php
@@ -1,1 +1,23 @@
+<?php
+include_once("../include/common.inc.php");
+setlocale(LC_CTYPE, 'C');
+ header('Content-Type: text/csv');
+    header('Content-Disposition: attachment; filename="public_body_categories_en.rb"');
+    header('Pragma: no-cache');
+    header('Expires: 0');
+echo 'PublicBodyCategories.add(:en, ['.PHP_EOL;
+echo '    "Portfolios",'.PHP_EOL;
+$db = $server->get_db('disclosr-agencies');
 
+try {
+    $rows = $db->get_view("app", "byDeptStateName", null, true)->rows;
+    //print_r($rows);
+    foreach ($rows as $row) {
+        echo '        [ "'.phrase_to_tag(dept_to_portfolio($row->key)).'","'. dept_to_portfolio($row->key).'","'.dept_to_portfolio($row->key).'" ],'.PHP_EOL;
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
+echo '])';
+?>
+

--- a/getAgency.php
+++ b/getAgency.php
@@ -4,6 +4,7 @@
 include_header();
 
 function displayValue($key, $value, $mode) {
+    global $db;
     if ($mode == "view") {
         if (is_array($value)) {
             echo "<tr><td>$key</td><td><ol>";
@@ -30,8 +31,16 @@
         } else {
             if (strpos($key, "_") === 0) {
                 echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
-            } if (strpos($key, "has") === 0) {
-                echo "<label for='$key'><input type='checkbox' id='$key' name='$key' checked='$value'> $key</label>";
+            } else if ($key == "parentOrg") {
+                echo "<label for='$key'>$key</label><select  id='$key' name='$key'>";
+                  $rows = $db->get_view("app", "byDeptStateName")->rows;
+    //print_r($rows);
+    foreach ($rows as $row) {
+        echo "<option value='{$row->value}'".(($row->value == $value) ? "SELECTED":"")." >".str_replace("Department of ","",$row->key)."</option>";
+    }
+    echo" </select>";
+            } else if (strpos($key, "has") === 0) {
+                echo "<label for='$key'><input type='checkbox' id='$key' name='$key' ".(($value=='true')?"checked='$value'":"")."> $key</label>";
             } else {
                 echo "<label>$key</label><input  class='input-text' type='text' id='$key' name='$key' value='$value'/>";
                 if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") {
@@ -47,10 +56,24 @@
 }
 
 function addDefaultFields($row) {
-    $defaultFields = Array("name","orgType","parentOrg");
+    global $schemas;
+    $defaultFields = array_keys($schemas['agency']['properties']);
     foreach ($defaultFields as $defaultField) {
-        if (!isset($row[$defaultField]))
+        if (!isset($row[$defaultField])) {
+            if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
+                if (strpos($defaultField, "has") === 0) {
+            $row[$defaultField] = "false";
+                
+                } else {
             $row[$defaultField] = "";
+                }
+            
+            }
+             if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
+                
+            $row[$defaultField] = Array("");
+            }
+        }
     }
     return $row;
 }

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

--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -1,4 +1,13 @@
 <?php
+
+date_default_timezone_set("Australia/Sydney");
+
+$basePath = "";
+if (strstr($_SERVER['PHP_SELF'], "alaveteli/")
+        || strstr($_SERVER['PHP_SELF'], "admin/")
+        || strstr($_SERVER['PHP_SELF'], "lib/")
+        || strstr($_SERVER['PHP_SELF'], "include/"))
+    $basePath = "../";
 
 include_once ('couchdb.inc.php');
 include_once ('template.inc.php');
@@ -33,6 +42,26 @@
     # Typecast to (object) will automatically convert array -> stdClass
     return (object) $array;
 }
+
+function dept_to_portfolio($deptName) {
+    return trim(str_replace("Department of", "", str_replace("Department of the", "Department of", $deptName)));
+} 
+function phrase_to_tag ($phrase) {
+    return str_replace(" ","_",str_replace(",","",strtolower($phrase)));
+}
+function GetDomain($url)
+{
+$nowww = ereg_replace('www\.','',$url);
+$domain = parse_url($nowww);
+if(!empty($domain["host"]))
+    {
+     return $domain["host"];
+     } else
+     {
+     return $domain["path"];
+     }
+}
+
 ?>
 
 

--- a/include/couchdb.inc.php
+++ b/include/couchdb.inc.php
@@ -1,6 +1,8 @@
 <?php
 
-include "schemas/schemas.inc.php";
+include $basePath."schemas/schemas.inc.php";
+
+require ($basePath.'couchdb/settee/src/settee.php');
 
 function createAgencyDesignDoc() {
     global $db;
@@ -9,6 +11,21 @@
     $obj->language = "javascript";
     $obj->views->all->map = "function(doc) {   emit(doc._id, doc); };";
     $obj->views->byABN->map = "function(doc) {   emit(doc.abn, doc); };";
+        $obj->views->byCanonicalName->map = "function(doc) {  
+            if (doc.parentOrg || doc.orgType == 'FMA-DepartmentOfState') {
+        emit(doc.name, doc._id); 
+        }
+};";
+        $obj->views->byDeptStateName->map = "function(doc) {  
+            if (doc.orgType == 'FMA-DepartmentOfState') {
+        emit(doc.name, doc._id); 
+        }
+};";
+        $obj->views->parentOrgs->map = "function(doc) {
+            if (doc.parentOrg) {
+        emit(doc._id, doc.parentOrg);
+        }
+};";
     $obj->views->byName->map = "function(doc) {  
         emit(doc.name, doc._id); 
  for (name in doc.otherNames) {
@@ -50,13 +67,19 @@
     return $db->save($obj, true);
 }
 
-require ('couchdb/settee/src/settee.php');
 
-$server = new SetteeServer('http://192.168.1.8:5984');
+if( php_uname('n') == "vanille") {
 
+$server = new SetteeServer('http://192.168.178.21:5984');
+} else 
+    if( php_uname('n') == "KYUUBEY") {
+
+$server = new SetteeServer('http://192.168.1.148:5984');
+} else {
+    $server = new SetteeServer('http://127.0.0.1:5984');
+}
 function setteErrorHandler($e) {
     echo $e->getMessage() . "<br>" . PHP_EOL;
 }
-
 ?>
 

--- a/include/template.inc.php
+++ b/include/template.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 function include_header() {
+    global $basePath;
     ?>
     <!DOCTYPE html>
 
@@ -18,11 +19,11 @@
             <title>Disclosr</title>
 
             <!-- Included CSS Files -->
-            <link rel="stylesheet" href="stylesheets/foundation.css">
-            <link rel="stylesheet" href="stylesheets/app.css">
+            <link rel="stylesheet" href="<?php echo $basePath?>stylesheets/foundation.css">
+            <link rel="stylesheet" href="<?php echo $basePath?>stylesheets/app.css">
 
             <!--[if lt IE 9]>
-                    <link rel="stylesheet" href="stylesheets/ie.css">
+                    <link rel="stylesheet" href="<?php echo $basePath?>stylesheets/ie.css">
             <![endif]-->
 
 
@@ -62,8 +63,8 @@
 
 
             <!-- Included JS Files -->
-            <script src="javascripts/foundation.js"></script>
-            <script src="javascripts/app.js"></script>
+            <script src="<?php echo $basePath?>javascripts/foundation.js"></script>
+            <script src="<?php echo $basePath?>javascripts/app.js"></script>
             <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
 
         </body>

--- /dev/null
+++ b/lib/php-diff

--- /dev/null
+++ b/lib/springy

--- a/robots.txt
+++ b/robots.txt
@@ -2,3 +2,4 @@
 # www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449
 
 User-agent: *
+Disallow: /admin/

--- a/schemas/agency.json.php
+++ b/schemas/agency.json.php
@@ -5,8 +5,30 @@
     "type" => "object",
     "properties" => Array(
         "name" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
-        "othernames" => Array("type" => "array", "required" => true, "x-title" => "Agency Past/Other Names", "description" => "Agency Names",
+        "short_name" => Array("type" => "string", "required" => false, "x-title"=> "Agency Short Name", "description" => "Agency Name shortened, usually to an acronym"),
+        "otherNames" => Array("type" => "array", "required" => true, "x-title" => "Agency Past/Other Names", "description" => "Agency Names",
             "items" => Array("type" => "string")),
+        "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous",
+            "items" => Array("type" => "string")),
+        "orgType"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "parentOrg"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "website"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+     "abn" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "contractListURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "grantsReportingURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "annualReportURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "consultanciesURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "legalExpenditureURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "recordsListURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "FOIDocumentsURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "infoPublicationSchemeURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "appointmentsURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+   "hasRSS"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+   "hasMailingList"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+   "hasTwitter"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+   "hasFacebook"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+        "hasYouTube"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"),
+   
     ),
     /*"org":{"type":"object",
 		"properties":{