Changeset 14814 for lang/php/Scraper/library/Diggin/Scraper.php

Timestamp:

06/29/08 02:46:29 (5 years ago)

Author:

sasezaki

Message:

lang/php/Scraper: オートフィルタ機能いちおう追加

Files:

• lang/php/Scraper/library/Diggin/Scraper.php (modified) (5 diffs)

lang/php/Scraper/library/Diggin/Scraper.php

@@ -227 +227 @@
      * @param string (xpath etc)
      * @params mixed args1, args2, args3,,,
-     * @param string $autofilter
      * @return Diggin_Scraper Provides a fluent interface
      */
-    public function process($expression, $args, $autofilter = false)
+    public function process($expression, $args)
     {
         $namestypes = array_slice(func_get_args(), 1);
-        $lastarg = array_slice(func_get_args(), -1);
-        
-        if (substr($lastarg[0], 0, 1) === "*" || substr($lastarg[0], 0, 1) === "!") {
-            $autofilter = substr($lastarg[0], 1);
-            array_pop($namestypes);
-        }
         
         require_once 'Diggin/Scraper/Process.php';
@@ -245 +238 @@
                 if (strpos($nametype, '=>') !== false) list($name, $types) = explode('=>', $nametype);
                 if (!isset($types)) {
-                    self::$_processes[] = new Diggin_Scraper_Process($expression, trim($nametype), null, false, $autofilter);
+                    self::$_processes[] = new Diggin_Scraper_Process($expression, trim($nametype));
                 } else {
                     $types = trim($types, " '\"");
@@ -251 +244 @@
                     if (count($types) === 1) {
                         self::$_processes[] = 
-                        new Diggin_Scraper_Process($expression, trim($name), $types, false, $autofilter);
+                        new Diggin_Scraper_Process($expression, trim($name), $types);
                     } else {
                         foreach ($types as $count => $type) {
@@ -258 +251 @@
                         self::$_processes[] = 
                         new Diggin_Scraper_Process($expression, trim($name),
-                                                   trim($types[0], " []'\""), $filters, $autofilter);
+                                                   trim($types[0], " []'\""), $filters);
                     }
                 }
             } elseif (is_array($nametype)) {
-                self::$_processes[] = new Diggin_Scraper_Process($expression, $nametype[0], $nametype[1], $nametype[2], $autofilter);
+                self::$_processes[] = new Diggin_Scraper_Process($expression, $nametype[0], $nametype[1], $nametype[2]);
             } elseif ($nametype instanceof scraper) {
                 foreach ($nametype->processes as $process) {
@@ -304 +297 @@
             $values = self::$_strategy->getValue($context, $process);
 
-            if ($process->filter) {
+            if ($process->filters) {
                 require_once 'Diggin/Scraper/Filter.php';
-                $values = Diggin_Scraper_Filter::run($values, $process->filter);
+                $values = Diggin_Scraper_Filter::run($values, $process->filters);
             }