From: root Date: Sat, 14 Jul 2012 12:53:26 +0000 Subject: apples.* fixes X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=122fb55689a5f458ae4e8d30a624a02e7e8466e0 --- apples.* fixes Former-commit-id: b167947a39fb1f09f7573db22f525d6fdb943ec4 --- --- /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(); +?> + --- a/bubbletree.php +++ b/bubbletree.php @@ -1,23 +1,23 @@ - - - Minimal BubbleTree Demo - - - - - - - - - - - + + + + + + + + + + - - -
-
-
- + + + +
+
+
+ --- a/getAgency.php +++ b/getAgency.php @@ -137,7 +137,7 @@ } } - $mode = "edit"; + $mode = "view"; $rowArray = object_to_array($obj); ksort($rowArray); if ($mode == "edit") { --- /dev/null +++ b/index.php @@ -1,1 +1,9 @@ +