Updated List Diffing.

Author: adamCaxy

demo/demo_text.php

@@ -2,42 +2,25 @@
 
 $demos = array(
     array(
-        'old' => '<p>Return air openings for heating, ventilation and air-conditioning systems shall comply with all of the following:</p>
-<ol>
-<li>Openings shall not be located less than 10 feet (3048 mm) measured in any direction from an open combustion chamber or draft hood of another appliance located in the same room or space.</li>
-<li>Return air shall not be taken from a hazardous or insanitary location or a refrigeration room as defined in this code.</li>
-<li>The amount of return air taken from any room or space shall be not greater than the flow rate of supply air delivered to such room or space.</li>
-<li>Return and transfer openings shall be sized in accordance with the appliance or equipment manufacturer\'s installation instructions, ACCA Manual D or the design of the registered design professional.</li>
-<ol><li>This is me previously.</li></ol>
-<li>Return air taken from one dwelling unit shall not be discharged into another dwelling unit.</li>
-<li>Taking return air from a crawl space shall not be accomplished through a direct connection to the return side of a forced air furnace. Transfer openings in the crawl space enclosure shall not be prohibited.</li>
-<li>Return air shall not be taken from a closet, bathroom, toilet room, kitchen, garage, boiler room, furnace room or unconditioned attic.</li>
-</ol>
-<ul class="exception">
-<li><strong>Exceptions:</strong>
-<ol>
-<li>Taking return air from a kitchen is not prohibited where such return air openings serve the kitchen and are located not less than 10 feet (3048 mm) from the cooking appliances.</li>
-<li>Dedicated forced air systems serving only the garage shall not be prohibited from obtaining return air from the garage.</li>
-</ol></li>
-</ul>',
+        'old' => '<p>The required capacity of each door opening shall be sufficient for the <em>occupant load</em> thereof and shall provide a minimum clear width of 32 inches (813 mm). Clear openings of doorways with swinging doors shall be measured between the face of the door and the stop, with the door open 90 degrees (1.57 rad). Where this section requires a minimum clear width of 32 inches (813 mm) and a door opening includes two door leaves without a mullion, one leaf shall provide a clear opening width of 32 inches (813 mm). The maximum width of a swinging door leaf shall be 48 inches (1219 mm) nominal. <em>Means of egress</em> doors in a Group I-2 occupancy used for the movement of beds shall provide a clear width not less than 41<sup>1</sup>/ <sub><sub>2 </sub></sub> inches (1054 mm). The height of door openings shall be not less than 80 inches (2032 mm).</p><ul class="exception"><li><strong>Exceptions:</strong><ol><li>The minimum and maximum width shall not apply to door openings that are not part of the required <em>means of egress </em>in Group R-2 and R-3 occupancies.</li><li>Door openings to resident <em>sleeping units</em> in Group I-3 occupancies shall have a clear width of not less than 28 inches (711 mm).</li><li>Door openings to storage closets less than 10 square feet (0.93 m<sup>2</sup>) in area shall not be limited by the minimum width.</li><li>Width of door leaves in revolving doors that comply with Section 1010.1.4.1 shall not be limited.</li><li>Door openings within a <em>dwelling unit</em> or <em>sleeping unit</em> shall be not less than 78 inches (1981 mm) in height.</li><li>Exterior door openings in <em>dwelling units</em> and <em>sleeping units</em>, other than the required <em>exit </em>door, shall be not less than 76 inches (1930 mm) in height.</li><li>In other than Group R-1 occupancies, the minimum widths shall not apply to interior egress doors within a <em>dwelling unit</em> or <em>sleeping unit</em> that is not required to be an <em>Accessible unit</em>, <em>Type A unit </em>or <em>Type B unit</em>.</li><li>Door openings required to be <em>accessible</em> within <em>Type B units</em> shall have a minimum clear width of 31.75 inches (806 mm).</li><li>Doors to walk-in freezers and coolers less than 1,000 square feet (93 m<sup>2</sup>) in area shall have a maximum width of 60 inches (1524 mm).</li><li>In Group R-1 <em>dwelling units</em> or <em>sleeping units</em> not required to be <em>Accessible units</em>, the minimum width shall not apply to doors for showers or saunas.</li></ol></li></ul>',
 
-        'new' => '<p>Return air openings for heating, ventilation and air-conditioning systems shall comply with all of the following:</p>
-<ol>
-<li>Openings shall not be located less than 10 feet (3048 mm) measured in any direction from an open combustion chamber or draft hood of another appliance located in the same room or space.</li>
-<li>Return air shall not be taken from a hazardous or insanitary location or a refrigeration room as defined in this code.</li>
-<ol><li>This is me after the fact.</li></ol>
-<li>The amount of return air taken from any room or space shall be not greater than the flow rate of supply air delivered to such room or space.</li>
-<li>Return and transfer openings shall be sized in accordance with the appliance or equipment manufacturer\'s installation instructions, ACCA Manual D or the design of the registered design professional.</li>
-<li>Return air taken from one dwelling unit shall not be discharged into another dwelling unit.</li>
-<li>Taking return air from a crawl space shall not be accomplished through a direct connection to the return side of a forced air furnace. Transfer openings in the crawl space enclosure shall not be prohibited.</li>
-<li>Return air shall not be taken from a closet, bathroom, toilet room, kitchen, garage, boiler room, furnace room or unconditioned attic.</li>
-</ol>
+        'new' => '<p>The required capacity of each door opening shall be sufficient for the <span class="content_italics">occupant load</span> thereof and shall provide a minimum clear&nbsp;opening&nbsp;width of 32 inches (813 mm). The clear opening width&nbsp;of doorways with swinging doors shall be measured between the face of the door and the stop, with the door open 90 degrees (1.57 rad). Where this section requires a minimum clear opening width of 32 inches (813 mm) and a door opening includes two door leaves without a mullion, one leaf shall provide a minimum clear opening width of 32 inches (813 mm). In Group I-2, doors serving as &nbsp;<em>m</em><span class="content_italics">eans of egress</span> doors where&nbsp;used for the movement of beds shall provide a minimum clear opening width of&nbsp;41<sup>1</sup>/ <sub>2 </sub> inches (1054 mm). The maximum width of a swinging door leaf shall be 48 inches (1219 mm) nominal. The minimum clear opening height of doors shall be 80 inches (2032 mm).</p>
 <ul class="exception">
-<li><strong>Exceptions:</strong>
+<li><span class="content_bold">Exceptions:</span>
 <ol>
-<li>Taking return air from a kitchen is not prohibited where such return air openings serve the kitchen and are located not less than 10 feet (3048 mm) from the cooking appliances.</li>
-<li>Dedicated forced air systems serving only the garage shall not be prohibited from obtaining return air from the garage.</li>
-</ol></li>
+<li>In Group R-2 and R-3 dwelling and sleeping units that are not required to be an Accessible unit, Type A unit or Type B unit, the minimum and maximum width shall not apply to door openings that are not part of the required <span class="content_italics">means of egress</span>.</li>
+<li>In Group I-3, door openings to resident <span class="content_italics">sleeping units</span>&nbsp;that are not required to be an Accessible unit shall have a minimum clear opening width of 28 inches (711 mm).</li>
+<li>Door openings to storage closets less than 10 square feet (0.93 m<sup>2</sup>) in area shall not be limited by the minimum clear opening width.</li>
+<li>The width of door leaves in revolving doors that comply with Section 1010.1.4.1 shall not be limited.</li>
+<li>Door openings within a <span class="content_italics">dwelling unit</span> or <span class="content_italics">sleeping unit</span> shall have a minimum clear opening height&nbsp;than 78 inches (1981 mm) in height.</li>
+<li>In dwelling and sleeping units that are not required to be Accessible, Type A or Type B units, exterior door openings, other than the required <span class="content_italics">exit </span>door, shall have a minimum clear opening height of&nbsp;76 inches (1930 mm) in height.</li>
+<li>Groups I-1, R-2, R-3 and R-4&nbsp;occupancies, in dwelling and sleeping units that are not required to be Accessible, Type A or Type B units, the minimum clear opening widths shall not apply to interior egress doors.</li>
+<li>Door openings within <span class="content_italics">Type B units</span>&nbsp;intended for user passage shall have a minimum clear opening width of 31.75 inches (806 mm).</li>
+<li>Doors to walk-in freezers and coolers less than 1,000 square feet (93 m<sup>2</sup>) in area shall have a maximum width of 60 inches (1524 mm) nominal.</li>
+<li>The minimum clear opening width shall not apply to doors for non-accessible shower or sauna compartments.</li>
+<li>The minimum clear opening width shall not apply to the doors for non-accessible toilet stalls.</li>
+</ol>
+</li>
 </ul>'
     )
 );

demo/index.php

@@ -3,14 +3,14 @@
 use Caxy\HtmlDiff\HtmlDiff;
 
 ini_set('display_errors', 1);
-error_reporting(E_ALL);
+error_reporting(E_ERROR);
 
 $classes = array(
     'Caxy/HtmlDiff/AbstractDiff',
     'Caxy/HtmlDiff/HtmlDiff',
     'Caxy/HtmlDiff/Match',
     'Caxy/HtmlDiff/Operation',
-    'Caxy/HtmlDiff/ListDiff'
+    'Caxy/HtmlDiff/ListDiff',
 );
 
 foreach ($classes as $class) {
@@ -21,11 +21,11 @@
 
 if ($input) {
     $data = json_decode($input, true);
-    $diff = new HtmlDiff($_POST['oldText'], $_POST['newText'], 'UTF-8', array());
-    echo $diff->build();
+    $diff = new HtmlDiff($data['oldText'], $data['newText'], 'UTF-8', array());
+    $diff->build();
 
-    //header('Content-Type: application/json');
-    //echo json_encode(array('diff' => $diff->getDifference()));
+    header('Content-Type: application/json');
+    echo json_encode(array('diff' => $diff->getDifference()));
 } else {
     header('Content-Type: text/html');
     echo file_get_contents('demo.html');

lib/Caxy/HtmlDiff/ListDiff.php

@@ -102,9 +102,8 @@ protected function diffListContent()
         $this->formatThisListContent();
 
         /* Build an index of content outside of list tags.
-         * Create an array of matches to be used when diffing.
          */
-        $this->matchAndCompareContent();
+        $this->indexContent();
 
         /* In cases where we're dealing with nested lists,
          * make sure we use placeholders to replace the nested lists
@@ -123,19 +122,10 @@ protected function diffListContent()
         $this->diff();
     }
 
-    protected function matchAndCompareContent()
-    {
-        $this->indexContent();
-        
-        $this->matchContent();
-    }
-    
     protected function indexContent()
     {
         $this->contentIndex = array();
         $this->diffOrderIndex = array();
-        $type = 'new';
-        $list = $this->list['new'];
         foreach ($this->list as $type => $list) {
 
             $this->contentIndex[$type] = array();
@@ -187,31 +177,6 @@ protected function indexContent()
             }
         }
     }
-    
-    protected function matchContent()
-    {
-        $this->createNewOldMatches($this->contentIndex, $this->contentMatches);
-    }
-
-
-    protected function dump($asset, $string = '')
-    {
-        ini_set('xdebug.var_display_max_depth', 5);
-        ini_set('xdebug.var_display_max_children', 2000);
-        ini_set('xdebug.var_display_max_data', 1024);
-        
-        if ($string) {
-            $trueString = "======================= " . $string;
-            var_dump(strtoupper($trueString));
-        }
-        
-        var_dump($asset);
-        
-        if (isset($trueString)) {
-            $trueString .= " ========= END END END";
-            var_dump(strtoupper($trueString));
-        }
-    }
 
     /*
      * This function is used to remove the wrapped ul, ol, or dl characters from this list
@@ -440,44 +405,70 @@ protected function buildChildLists()
      * Build the content of the class.
      */
     protected function diff()
-    {
+    {        
         // Add the opening parent node from listType. So if ol, <ol>, etc.
         $this->content = $this->addListTypeWrapper();
 
-        // GOAL: Build the content and the lists.
-        // HOW?
-        // Cherry-pick the content between list nodes.
-        
-        foreach ($this->diffOrderIndex['new'] as $index) {
-            if ($index['type'] == 'list') {
-                $match = $this->textMatches[$index['position']];
+        $oldIndexCount = 0;
+        foreach ($this->diffOrderIndex['new'] as $key => $index) {
+            
+            if ($index['type'] == "list") {
+                $match = $this->getArrayByColumnValue($this->textMatches, 'new', $index['position']);
                 $newList = $this->childLists['new'][$match['new']];
                 $oldList = $this->childLists['old'][$match['old']];
-                $this->content .= "<li>";
-                $this->content .= $this->processPlaceholders(
+                
+                $content = "<li>";
+                $content .= $this->processPlaceholders(
                     $this->diffElements(
                         $this->convertListContentArrayToString($oldList),
                         $this->convertListContentArrayToString($newList),
                         false
                     ),
                     $match
                 );
-                $this->content .= "</li>"; //die;
-            } else {
-                $match = $this->contentMatches[$index['position']];
-                $newContent = $this->contentIndex['new'][$match['new']];
-                $oldContent = array_key_exists($match['old'], $this->contentIndex)
-                    ? $this->contentIndex['old'][$match['old']]
+                $content .= "</li>";
+                $this->content .= $content;
+            }
+            
+            if ($index['type'] == 'content') {
+                $newContent = $this->contentIndex['new'][$index['position']];
+                
+                $oldDiffOrderIndexMatch = array_key_exists($oldIndexCount, $this->diffOrderIndex['old'])
+                    ? $this->diffOrderIndex['old'][$oldIndexCount]
+                    : false;
+                
+                $oldContent = $oldDiffOrderIndexMatch && array_key_exists($oldDiffOrderIndexMatch['position'], $this->contentIndex['old'])
+                    ? $this->contentIndex['old'][$oldDiffOrderIndexMatch['position']]
                     : '';
-                $htmlDiff = new HtmlDiff($oldContent, $newContent);
-                $this->content .= $htmlDiff->build();
+                
+                $diffObject = new HtmlDiff($oldContent, $newContent);
+                $content = $diffObject->build();
+                $this->content .= $content;
             }
+            
+            $oldIndexCount++;
         }
 
         // Add the closing parent node from listType. So if ol, </ol>, etc.
         $this->content .= $this->addListTypeWrapper(false);
     }
 
+    protected function getArrayByColumnValue($parentArray, $column, $value, $allMatches = false)
+    {
+        $returnArray = array();
+        foreach ($parentArray as $array) {
+            if (array_key_exists($column, $array) && $array[$column] == $value) {
+                if ($allMatches) {
+                    $returnArray[] = $array;
+                } else {
+                    return $array;
+                }
+            }
+        }
+        
+        return $allMatches ? $returnArray : false;
+    }
+    
     protected function diffThisList($word, $key)
     {
         $listIndexValue = $this->getListIndexValue($key);