Changeset 16914

Timestamp:

07/31/08 20:29:04 (5 years ago)

Author:

sasezaki

Message:

lang/php/Scraper: Strategy/Xpathのエラーハンドリングの仮コミットその２

Location:

lang/php/Scraper/library/Diggin/Scraper

Files:

• Process.php (modified) (1 diff)
• Strategy/Abstract.php (modified) (3 diffs)
• Strategy/Xpath.php (modified) (2 diffs)

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

@@ -24 +24 @@
     public function __toString()
     {
-        return "\"".$this->expression.' , '.$this->name.' => '.$this->type."\"";
+        return '\''.$this->expression.'\' , '.
+               $this->name.' => '.
+//               if(!($this->type instanceof scraper)) {$this->type} else ""
+               '"';
     }
     

lang/php/Scraper/library/Diggin/Scraper/Strategy/Abstract.php

@@ -53 +53 @@
     protected abstract function getValue($values, $process);
     
-    protected abstract static function extract($values, $process);
+    protected abstract function extract($values, $process);
 
     public function getValues($context, $process)
@@ -64 +64 @@
             $values = $context->scrape($process);
         } else {
-            $values = null;
-            $values = $this->extract($context, $process);
+            try {
+                $values = $this->extract($context, $process);
+            } catch (Diggin_Scraper_Strategy_Exception $e) {
+                echo "error";echo PHP_EOL; return false;
+            }
         }
         
@@ -71 +74 @@
             foreach ($values as $count => $val) {
                 foreach ($process->type->processes as $proc) {
-                    $returns[$count][$proc->name] = $this->getValues($val, $proc);
+                    //@todo 値がとれなかったとき、格納しないか空かどうかはconfigでやるべきかな
+                    if (false !== $getval =$this->getValues($val, $proc)) {
+                        $returns[$count][$proc->name] = $getval;
+                    }
                 }
                 

lang/php/Scraper/library/Diggin/Scraper/Strategy/Xpath.php

@@ -76 +76 @@
     }
     
-    public static function extract($values, $process)
+    public function extract($values, $process)
     {
         //↓このハンドリングはxpathの記述自体が間違ってたとき（いらないかな？）
         set_error_handler(
             create_function('$errno, $errstr',
-            'if($errno) require_once "Diggin/Scraper/Strategy/Xpath/Exception.php"; 
-                throw new Diggin_Scraper_Strategy_Xpath_Exception($errstr, $errno);'
+            'if($errno) require_once "Diggin/Scraper/Strategy/Exception.php"; 
+                throw new Diggin_Scraper_Strategy_Exception($errstr, $errno);'
             )
         );
@@ -88 +88 @@
         restore_error_handler();
 
-        //        if (count($results) === 0) {
-        //        //@todo notice error
-        //            require_once 'Diggin/Scraper/Strategy/Exception.php';
-        //            throw new Diggin_Scraper_Strategy_Exception("couldn't find By Xpath, Process : $process");            
-        //        }
-//        if ((isset($results[0])) && ($results[0] === false)) {//これはxpath記述自体が間違ってたとき
-//            require_once 'Diggin/Scraper/Strategy/Exception.php';
-//            throw new Diggin_Scraper_Strategy_Exception("Couldn't find By Xpath, Process : $process");
-//        }
+        if (count($results) === 0) {
+            require_once 'Diggin/Scraper/Strategy/Exception.php';
+            throw new Diggin_Scraper_Strategy_Exception("couldn't find By Xpath, Process : $process");            
+        }
         
         return $results;