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