Update and rename webscraper.php to webparser.php

Author: felipe1234-dev

webscraper.php webparser.phpwebscraper.php renamed to webparser.php

@@ -42,6 +42,8 @@ private function convertToXPath($query)
 
         $xpath = preg_replace(
              [
+		"/\n{1,}/",
+		"/\s{2,}/",
                 "/([^,])\s/", 
                 "/\/>\//",
 
@@ -75,6 +77,8 @@ private function convertToXPath($query)
                 "/^\[/",
             ],
             [
+		"",
+		" ",
                 "$1/",
                 "/",
 
@@ -141,6 +145,20 @@ public function removeAttribute($attr)
         $this->obj = null;
     }
 
+    
+    public function hasAttribute($attr, $val)
+    {
+	    
+        foreach($this->obj as $item)
+	{
+            $attrs = $item->getAttribute("$attr");
+        }
+	    
+        $bool = (preg_match("/".preg_quote($val)."/", $attrs)) ? true : false;
+        
+	return $bool;
+    }
+	
     public function href($url)
     {
 
@@ -199,19 +217,6 @@ public function hasClass($class)
         return $bool;
     }
 
-    public function hasAttr($attr, $val)
-    {
-	    
-        foreach($this->obj as $item)
-	{
-            $attrs = $item->getAttribute("$attr");
-        }
-	    
-        $bool = (preg_match("/".preg_quote($val)."/", $attrs)) ? true : false;
-        
-	return $bool;
-    }
-
     public function html($html = null){
 
         if (!isset($html))