Changeset 882

Timestamp:

12/28/07 19:52:43 (4 years ago)

Author:

bogdanpasoi@…

Message:

Misc diff fixes.

Location:

trunk

Files:

• common/diff.php (modified) (2 diffs)
• www/views/textblock_diff.php (modified) (1 diff)

trunk/common/diff.php

@@ -118 +118 @@
 function split_string($string, $substring, $op_name) {
     // sentinel character
-    $string .= "#";
-    $substring .= "#";
+    $string .= "\n";
+    $substring .= "\n";
     $N = strlen($string);
     $M = strlen($substring);
@@ -126 +126 @@
     for ($i = 0, $j = -1; $i < $M; ++$i) {
         for ($prev = $j++; $j < $N && $string[$j] != $substring[$i]; ++$j);
-        log_assert($j < $N);
-        if ($i == $M-1) {
-            --$j;
-        }
+        log_assert($j < $N && $string[$j] == $substring[$i]);
         if ($j-$prev-1 > 0) {
             $result[] = array('type' => $op_name, 'string' => substr($string, $prev+1, $j-$prev-1));
         }
-        $result[] = array('type' => 'normal', 'string' => $string[$j]);
+        if ($i < $M-1) {
+            $result[] = array('type' => 'normal', 'string' => $string[$j]);
+        }
     }
 

trunk/www/views/textblock_diff.php

@@ -36 +36 @@
                 $output = str_replace("\n", '', $output);
                 $output = str_replace("\r", '', $output);
+                if ($output == "") {
+                    $output = " ";
+                }
                 echo $output."\n";
             }