Changeset 877

Timestamp:

12/26/07 04:28:00 (4 years ago)

Author:

bogdanpasoi@…

Message:

New diff.

Location:

trunk/www

Files:

• controllers/textblock.php (modified) (3 diffs)
• static/css/screen.css (modified) (1 diff)
• views/textblock_diff.php (modified) (1 diff)

trunk/www/controllers/textblock.php

@@ -4 +4 @@
 require_once(IA_ROOT_DIR . "common/db/textblock.php");
 require_once(IA_ROOT_DIR . "common/textblock.php");
+require_once(IA_ROOT_DIR . "common/diff.php");
 
-// smart ass diff
-function string_diff($string1, $string2) {
-    $name1 = tempnam(IA_ROOT_DIR.'attach/', "ia");
-    $name2 = tempnam(IA_ROOT_DIR.'attach/', "ia");
-    $fp1 = fopen($name1, "w");
-    if (!$fp1) {
-        flash_error("Eroare la comparare!");
-        request(url_home());
-    }
-    $string1 .= "\n";
-    fputs($fp1, $string1);
-    fclose($fp1);
-
-    $fp2 = fopen($name2, "w");
-    if (!$fp2) {
-        flash_error("Eroare la comparare!");
-        request(url_home());
-    }
-    $string2 .= "\n";
-    fputs($fp2, $string2);
-    fclose($fp2);
-
-    ob_start();
-    system("diff -au ".$name1." ".$name2);
-    $ret = ob_get_contents();
-    ob_end_clean();
-    if (!unlink($name1)) {
-        flash_error("Eroare la comparare!");
-        request(url_home());
-    }
-    if (!unlink($name2)) {
-        flash_error("Eroare la comparare!");
-        request(url_home());
-    }
-    return $ret;
-}
 
 // View a plain textblock.
@@ -126 +91 @@
     log_assert_valid(textblock_validate($revto));
 
-    $diff_title = string_diff($revfrom['title'], $revto['title']);
-    $diff_content = string_diff($revfrom['text'], $revto['text']);
+    $diff_title = string_diff(array($revfrom['title'], $revto['title']));
+    $diff_content = string_diff(array($revfrom['text'], $revto['text']));
 
     $view = array();
@@ -134 +99 @@
     $view['revfrom_id'] = $revfrom_id;
     $view['revto_id'] = $revto_id;
-    $view['diff_title'] = explode("\n", $diff_title);
-    $view['diff_content'] = explode("\n", $diff_content);
+    $view['diff_title'] = $diff_title;
+    $view['diff_content'] = $diff_content;
     execute_view_die('views/textblock_diff.php', $view);
 }

trunk/www/static/css/screen.css

@@ -683 +683 @@
 .diff {
     font-family: monospace;
+    border: #999988 solid 1px;  
+    margin-bottom: 1em;
 }
 
 .diff .deleted {
-    display: block;
-    background-color: #F66;
+    background-color: #FFDDDD;
+    border: #CC0000 solid 1px;
+    display: block;
 }
 
 .diff .added {
-    display: block;
-    background-color: #6F6;
+    background-color: #DDFFDD;
+    border: #00AA00 solid 1px;
+    display: block;
 }
 
 .diff span {
-    margin: .5em 0 .5em 0;
-    display: block;
+    margin: .2em .2em;
 }
 

trunk/www/views/textblock_diff.php

@@ -12 +12 @@
 <?php
 
-function diff_print_color_line($s)
-{
-    if (preg_match("/^(---|\+\+\+)/", $s)) {
-        return;
+function print_diff($diff) {
+    foreach ($diff as $block) {
+        echo '<div class="diff">';
+        foreach ($block as $op) {
+            echo '<span class="'.$op['type'].'">';
+            foreach ($op['lines'] as $line) {
+                echo str_replace('  ', '&nbsp;&nbsp;', htmlentities($line));
+                echo '<br/>';
+            }
+            echo '</span>';
+        }
+        echo '</div>';
     }
-    if (preg_match("/^(@@)/", $s)) {
-        echo "<hr />";
-        return;
-    }
-    if (strlen($s) > 0 && $s[0] == '+') {
-        $class = "added";
-    } else if (strlen($s) > 0 && $s[0] == '-') {
-        $class = "deleted";
-    } else {
-        $class = "normal";
-    }
-    echo "<span class=\"$class\">".htmlentities(substr($s, 1))."</span>";
 }
 
-if (count($view['diff_title']) <= 1) {
+if (empty($view['diff_title'])) {
     echo "<h3>Nu exista diferente intre titluri.</h3>";
 }
 else {
     echo "<h3>Diferente intre titluri:</h3>";
-    echo "<div class=\"diff\">";
-    for ($i = 0; $i+1 < count($view['diff_title']); $i++) {
-        $s = $view['diff_title'][$i];
-        $class = diff_print_color_line($s);
-    }
-    echo "</div>";
+    print_diff($view['diff_title']);
 }
 ?>
 
 <?php
-if (count($view['diff_content']) <= 1) {
+if (empty($view['diff_content'])) {
     echo "<h3>Nu exista diferente intre continut.</h3>";
 }
 else {
     echo "<h3>Diferente intre continut:</h3>";
-    echo '<div class="diff">';
-    for ($i = 0; $i+1 < count($view['diff_content']); $i++) {
-        $s = $view['diff_content'][$i];
-        $class = diff_print_color_line($s);
-    }
-    echo "</div>";
+    print_diff($view['diff_content']);
 }
 ?>