author | hurons@caf4f556-3d62-0410-8435-a86758001935 |
Tue, 02 Feb 2010 15:44:16 +0000 | |
branch | wordpress |
changeset 132 | 4d4862461b8d |
parent 109 | 03b0d1493584 |
permissions | -rw-r--r-- |
132
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
1 |
<?php |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
2 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
3 |
* WordPress Diff bastard child of old MediaWiki Diff Formatter. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
4 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
5 |
* Basically all that remains is the table structure and some method names. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
6 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
7 |
* @package WordPress |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
8 |
* @subpackage Diff |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
9 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
10 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
11 |
if ( !class_exists( 'Text_Diff' ) ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
12 |
/** Text_Diff class */ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
13 |
require( dirname(__FILE__).'/Text/Diff.php' ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
14 |
/** Text_Diff_Renderer class */ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
15 |
require( dirname(__FILE__).'/Text/Diff/Renderer.php' ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
16 |
/** Text_Diff_Renderer_inline class */ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
17 |
require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
18 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
19 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
20 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
21 |
* Table renderer to display the diff lines. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
22 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
23 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
24 |
* @uses Text_Diff_Renderer Extends |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
25 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
26 |
class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
27 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
28 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
29 |
* @see Text_Diff_Renderer::_leading_context_lines |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
30 |
* @var int |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
31 |
* @access protected |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
32 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
33 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
34 |
var $_leading_context_lines = 10000; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
35 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
36 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
37 |
* @see Text_Diff_Renderer::_trailing_context_lines |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
38 |
* @var int |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
39 |
* @access protected |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
40 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
41 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
42 |
var $_trailing_context_lines = 10000; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
43 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
44 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
45 |
* {@internal Missing Description}} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
46 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
47 |
* @var float |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
48 |
* @access protected |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
49 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
50 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
51 |
var $_diff_threshold = 0.6; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
52 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
53 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
54 |
* Inline display helper object name. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
55 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
56 |
* @var string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
57 |
* @access protected |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
58 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
59 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
60 |
var $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline'; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
61 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
62 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
63 |
* PHP4 Constructor - Call parent constructor with params array. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
64 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
65 |
* This will set class properties based on the key value pairs in the array. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
66 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
67 |
* @since unknown |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
68 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
69 |
* @param array $params |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
70 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
71 |
function Text_Diff_Renderer_Table( $params = array() ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
72 |
$parent = get_parent_class($this); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
73 |
$this->$parent( $params ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
74 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
75 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
76 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
77 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
78 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
79 |
* @param string $header |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
80 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
81 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
82 |
function _startBlock( $header ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
83 |
return ''; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
84 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
85 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
86 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
87 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
88 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
89 |
* @param array $lines |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
90 |
* @param string $prefix |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
91 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
92 |
function _lines( $lines, $prefix=' ' ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
93 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
94 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
95 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
96 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
97 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
98 |
* @param string $line HTML-escape the value. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
99 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
100 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
101 |
function addedLine( $line ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
102 |
return "<td>+</td><td class='diff-addedline'>{$line}</td>"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
103 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
104 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
105 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
106 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
107 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
108 |
* @param string $line HTML-escape the value. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
109 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
110 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
111 |
function deletedLine( $line ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
112 |
return "<td>-</td><td class='diff-deletedline'>{$line}</td>"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
113 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
114 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
115 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
116 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
117 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
118 |
* @param string $line HTML-escape the value. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
119 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
120 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
121 |
function contextLine( $line ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
122 |
return "<td> </td><td class='diff-context'>{$line}</td>"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
123 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
124 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
125 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
126 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
127 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
128 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
129 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
130 |
function emptyLine() { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
131 |
return '<td colspan="2"> </td>'; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
132 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
133 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
134 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
135 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
136 |
* @access private |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
137 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
138 |
* @param array $lines |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
139 |
* @param bool $encode |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
140 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
141 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
142 |
function _added( $lines, $encode = true ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
143 |
$r = ''; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
144 |
foreach ($lines as $line) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
145 |
if ( $encode ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
146 |
$line = htmlspecialchars( $line ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
147 |
$r .= '<tr>' . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
148 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
149 |
return $r; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
150 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
151 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
152 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
153 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
154 |
* @access private |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
155 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
156 |
* @param array $lines |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
157 |
* @param bool $encode |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
158 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
159 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
160 |
function _deleted( $lines, $encode = true ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
161 |
$r = ''; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
162 |
foreach ($lines as $line) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
163 |
if ( $encode ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
164 |
$line = htmlspecialchars( $line ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
165 |
$r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . "</tr>\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
166 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
167 |
return $r; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
168 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
169 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
170 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
171 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
172 |
* @access private |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
173 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
174 |
* @param array $lines |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
175 |
* @param bool $encode |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
176 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
177 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
178 |
function _context( $lines, $encode = true ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
179 |
$r = ''; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
180 |
foreach ($lines as $line) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
181 |
if ( $encode ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
182 |
$line = htmlspecialchars( $line ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
183 |
$r .= '<tr>' . |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
184 |
$this->contextLine( $line ) . $this->contextLine( $line ) . "</tr>\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
185 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
186 |
return $r; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
187 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
188 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
189 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
190 |
* Process changed lines to do word-by-word diffs for extra highlighting. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
191 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
192 |
* (TRAC style) sometimes these lines can actually be deleted or added rows. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
193 |
* We do additional processing to figure that out |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
194 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
195 |
* @access private |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
196 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
197 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
198 |
* @param array $orig |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
199 |
* @param array $final |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
200 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
201 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
202 |
function _changed( $orig, $final ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
203 |
$r = ''; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
204 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
205 |
// Does the aforementioned additional processing |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
206 |
// *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
207 |
// match is numeric: an index in other column |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
208 |
// match is 'X': no match. It is a new row |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
209 |
// *_rows are column vectors for the orig column and the final column. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
210 |
// row >= 0: an indix of the $orig or $final array |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
211 |
// row < 0: a blank row for that column |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
212 |
list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
213 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
214 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
215 |
// These will hold the word changes as determined by an inline diff |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
216 |
$orig_diffs = array(); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
217 |
$final_diffs = array(); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
218 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
219 |
// Compute word diffs for each matched pair using the inline diff |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
220 |
foreach ( $orig_matches as $o => $f ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
221 |
if ( is_numeric($o) && is_numeric($f) ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
222 |
$text_diff = new Text_Diff( 'auto', array( array($orig[$o]), array($final[$f]) ) ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
223 |
$renderer = new $this->inline_diff_renderer; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
224 |
$diff = $renderer->render( $text_diff ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
225 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
226 |
// If they're too different, don't include any <ins> or <dels> |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
227 |
if ( $diff_count = preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
228 |
// length of all text between <ins> or <del> |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
229 |
$stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) )); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
230 |
// since we count lengith of text between <ins> or <del> (instead of picking just one), |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
231 |
// we double the length of chars not in those tags. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
232 |
$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
233 |
$diff_ratio = $stripped_matches / $stripped_diff; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
234 |
if ( $diff_ratio > $this->_diff_threshold ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
235 |
continue; // Too different. Don't save diffs. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
236 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
237 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
238 |
// Un-inline the diffs by removing del or ins |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
239 |
$orig_diffs[$o] = preg_replace( '|<ins>.*?</ins>|', '', $diff ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
240 |
$final_diffs[$f] = preg_replace( '|<del>.*?</del>|', '', $diff ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
241 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
242 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
243 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
244 |
foreach ( array_keys($orig_rows) as $row ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
245 |
// Both columns have blanks. Ignore them. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
246 |
if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
247 |
continue; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
248 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
249 |
// If we have a word based diff, use it. Otherwise, use the normal line. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
250 |
$orig_line = isset($orig_diffs[$orig_rows[$row]]) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
251 |
? $orig_diffs[$orig_rows[$row]] |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
252 |
: htmlspecialchars($orig[$orig_rows[$row]]); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
253 |
$final_line = isset($final_diffs[$final_rows[$row]]) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
254 |
? $final_diffs[$final_rows[$row]] |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
255 |
: htmlspecialchars($final[$final_rows[$row]]); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
256 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
257 |
if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
258 |
$r .= $this->_added( array($final_line), false ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
259 |
} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
260 |
$r .= $this->_deleted( array($orig_line), false ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
261 |
} else { // A true changed row. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
262 |
$r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "</tr>\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
263 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
264 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
265 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
266 |
return $r; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
267 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
268 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
269 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
270 |
* Takes changed blocks and matches which rows in orig turned into which rows in final. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
271 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
272 |
* Returns |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
273 |
* *_matches ( which rows match with which ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
274 |
* *_rows ( order of rows in each column interleaved with blank rows as |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
275 |
* necessary ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
276 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
277 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
278 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
279 |
* @param unknown_type $orig |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
280 |
* @param unknown_type $final |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
281 |
* @return unknown |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
282 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
283 |
function interleave_changed_lines( $orig, $final ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
284 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
285 |
// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
286 |
$matches = array(); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
287 |
foreach ( array_keys($orig) as $o ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
288 |
foreach ( array_keys($final) as $f ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
289 |
$matches["$o,$f"] = $this->compute_string_distance( $orig[$o], $final[$f] ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
290 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
291 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
292 |
asort($matches); // Order by string distance. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
293 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
294 |
$orig_matches = array(); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
295 |
$final_matches = array(); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
296 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
297 |
foreach ( $matches as $keys => $difference ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
298 |
list($o, $f) = explode(',', $keys); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
299 |
$o = (int) $o; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
300 |
$f = (int) $f; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
301 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
302 |
// Already have better matches for these guys |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
303 |
if ( isset($orig_matches[$o]) && isset($final_matches[$f]) ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
304 |
continue; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
305 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
306 |
// First match for these guys. Must be best match |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
307 |
if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
308 |
$orig_matches[$o] = $f; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
309 |
$final_matches[$f] = $o; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
310 |
continue; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
311 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
312 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
313 |
// Best match of this final is already taken? Must mean this final is a new row. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
314 |
if ( isset($orig_matches[$o]) ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
315 |
$final_matches[$f] = 'x'; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
316 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
317 |
// Best match of this orig is already taken? Must mean this orig is a deleted row. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
318 |
elseif ( isset($final_matches[$f]) ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
319 |
$orig_matches[$o] = 'x'; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
320 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
321 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
322 |
// We read the text in this order |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
323 |
ksort($orig_matches); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
324 |
ksort($final_matches); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
325 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
326 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
327 |
// Stores rows and blanks for each column. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
328 |
$orig_rows = $orig_rows_copy = array_keys($orig_matches); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
329 |
$final_rows = array_keys($final_matches); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
330 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
331 |
// Interleaves rows with blanks to keep matches aligned. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
332 |
// We may end up with some extraneous blank rows, but we'll just ignore them later. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
333 |
foreach ( $orig_rows_copy as $orig_row ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
334 |
$final_pos = array_search($orig_matches[$orig_row], $final_rows, true); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
335 |
$orig_pos = (int) array_search($orig_row, $orig_rows, true); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
336 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
337 |
if ( false === $final_pos ) { // This orig is paired with a blank final. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
338 |
array_splice( $final_rows, $orig_pos, 0, -1 ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
339 |
} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
340 |
$diff_pos = $final_pos - $orig_pos; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
341 |
while ( $diff_pos < 0 ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
342 |
array_splice( $final_rows, $orig_pos, 0, $diff_pos++ ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
343 |
} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
344 |
$diff_pos = $orig_pos - $final_pos; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
345 |
while ( $diff_pos < 0 ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
346 |
array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
347 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
348 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
349 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
350 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
351 |
// Pad the ends with blank rows if the columns aren't the same length |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
352 |
$diff_count = count($orig_rows) - count($final_rows); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
353 |
if ( $diff_count < 0 ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
354 |
while ( $diff_count < 0 ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
355 |
array_push($orig_rows, $diff_count++); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
356 |
} elseif ( $diff_count > 0 ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
357 |
$diff_count = -1 * $diff_count; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
358 |
while ( $diff_count < 0 ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
359 |
array_push($final_rows, $diff_count++); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
360 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
361 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
362 |
return array($orig_matches, $final_matches, $orig_rows, $final_rows); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
363 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
364 |
/* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
365 |
// Debug |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
366 |
echo "\n\n\n\n\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
367 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
368 |
echo "-- DEBUG Matches: Orig -> Final --"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
369 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
370 |
foreach ( $orig_matches as $o => $f ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
371 |
echo "\n\n\n\n\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
372 |
echo "ORIG: $o, FINAL: $f\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
373 |
var_dump($orig[$o],$final[$f]); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
374 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
375 |
echo "\n\n\n\n\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
376 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
377 |
echo "-- DEBUG Matches: Final -> Orig --"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
378 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
379 |
foreach ( $final_matches as $f => $o ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
380 |
echo "\n\n\n\n\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
381 |
echo "FINAL: $f, ORIG: $o\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
382 |
var_dump($final[$f],$orig[$o]); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
383 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
384 |
echo "\n\n\n\n\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
385 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
386 |
echo "-- DEBUG Rows: Orig -- Final --"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
387 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
388 |
echo "\n\n\n\n\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
389 |
foreach ( $orig_rows as $row => $o ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
390 |
if ( $o < 0 ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
391 |
$o = 'X'; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
392 |
$f = $final_rows[$row]; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
393 |
if ( $f < 0 ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
394 |
$f = 'X'; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
395 |
echo "$o -- $f\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
396 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
397 |
echo "\n\n\n\n\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
398 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
399 |
echo "-- END DEBUG --"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
400 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
401 |
echo "\n\n\n\n\n"; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
402 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
403 |
return array($orig_matches, $final_matches, $orig_rows, $final_rows); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
404 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
405 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
406 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
407 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
408 |
* Computes a number that is intended to reflect the "distance" between two strings. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
409 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
410 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
411 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
412 |
* @param string $string1 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
413 |
* @param string $string2 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
414 |
* @return int |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
415 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
416 |
function compute_string_distance( $string1, $string2 ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
417 |
// Vectors containing character frequency for all chars in each string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
418 |
$chars1 = count_chars($string1); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
419 |
$chars2 = count_chars($string2); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
420 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
421 |
// L1-norm of difference vector. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
422 |
$difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
423 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
424 |
// $string1 has zero length? Odd. Give huge penalty by not dividing. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
425 |
if ( !$string1 ) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
426 |
return $difference; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
427 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
428 |
// Return distance per charcter (of string1) |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
429 |
return $difference / strlen($string1); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
430 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
431 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
432 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
433 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
434 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
435 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
436 |
* @param int $a |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
437 |
* @param int $b |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
438 |
* @return int |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
439 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
440 |
function difference( $a, $b ) { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
441 |
return abs( $a - $b ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
442 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
443 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
444 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
445 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
446 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
447 |
* Better word splitting than the PEAR package provides. |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
448 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
449 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
450 |
* @uses Text_Diff_Renderer_inline Extends |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
451 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
452 |
class WP_Text_Diff_Renderer_inline extends Text_Diff_Renderer_inline { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
453 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
454 |
/** |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
455 |
* @ignore |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
456 |
* @since 2.6.0 |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
457 |
* |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
458 |
* @param string $string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
459 |
* @param string $newlineEscape |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
460 |
* @return string |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
461 |
*/ |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
462 |
function _splitOnWords($string, $newlineEscape = "\n") { |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
463 |
$string = str_replace("\0", '', $string); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
464 |
$words = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
465 |
$words = str_replace( "\n", $newlineEscape, $words ); |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
466 |
return $words; |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
467 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
468 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
469 |
} |
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
470 |
|
4d4862461b8d
Update Wordpress 2.9.1
hurons@caf4f556-3d62-0410-8435-a86758001935
parents:
109
diff
changeset
|
471 |
?> |