Generic HTML Table also working with thead, tbody structure.

mielvds · Sep 18, 2011 · dac46f4 · dac46f4
1 parent 944d1d2
commit dac46f4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/model/resources/strategies/HTMLTable.class.php b/model/resources/strategies/HTMLTable.class.php
@@ -77,6 +77,10 @@ public function onCall($package,$resource){
 
             $domxpath = new DOMXPath( $html ); 
             $tablerows = $domxpath->query($xpath . "/tr" ); 
+            if ($tablerows->length == 0) {
+                //table has thead and tbody
+                $tablerows = $domxpath->query($xpath . "/*/tr" );
+            }
 
             $rowIndex = 1;
             foreach ($tablerows as $tr) {
@@ -86,6 +90,10 @@ public function onCall($package,$resource){
                 $domxpath = new DOMXPath( $newDom ); 
                 if ($rowIndex == 1) {
                     $tablecols = $domxpath->query("td");
+                    if ($tablecols->length == 0) {
+                        //thead row has th instead of td
+                        $tablecols = $domxpath->query("th" );
+                    }
                     $columnIndex = 1;
                     foreach($tablecols as $td) {
                         $fieldhash[ $td->nodeValue ] = $columnIndex;						

diff --git a/unittests/temp/person.html b/unittests/temp/person.html
@@ -1,8 +1,12 @@
 <html>
     <table>
-        <tr><td>name<td>age</td><td>city</td></tr>
-        <tr><td>Jan<td>22</td><td>Veridian City</td></tr>
-        <tr><td>Pieter</td><td>22</td><td>Pallet Town</td></tr>
-        <tr><td>Ash</td><td>21</td><td>Pallet Town</td></tr>
+        <thead>
+            <tr><th>name<th>age</th><th>city</th></tr>
+        </thead>
+        <tbody>
+            <tr><td>Jan<td>22</td><td>Veridian City</td></tr>
+            <tr><td>Pieter</td><td>22</td><td>Pallet Town</td></tr>
+            <tr><td>Ash</td><td>21</td><td>Pallet Town</td></tr>
+        </tbody>
     </table>
 </html>
diff --git a/unittests/tests/APITestGenericHTMLTable.class.php b/unittests/tests/APITestGenericHTMLTable.class.php
@@ -16,7 +16,7 @@ class APITestGenericHTMLTable extends TDTUnitTest{
 
     //private $location = "http://www.nieuws.be/";
     //private $xpath = "//table[@id='htmlGrid_a119d7e2-e979-436a-8cad-765d37fc0fdd']";
-    private $location = "/unittests/temp/person.html";
+    private $location = "unittests/temp/person.html";
     private $xpath = "//table";
     private $install_as = "htmltablepackage/person/";
     private $generic_type = "HTMLTable";
@@ -56,7 +56,6 @@ function testGetHTMLTable() {
         if($request->http_code != 200 && $request->result)
             $this->debug($request->result);
     }
-
     function testDeleteHTMLTable() {
         $url = Config::$HOSTNAME . Config::$SUBDIR . $this->install_as;
         $request = new REST($url, array(), "DELETE");