Changeset 18901 for lang/php

Timestamp:

09/05/08 22:55:58 (3 months ago)

Author:

sasezaki

Message:

lang/php/ びちょうせい（Http/Client/Adapter/TestPlus.phpとかの

Location:

lang/php

Files:

• Scraper/demos/Diggin/twitterfollow2wassr.php (modified) (1 diff)
• ZendFramework_ext/library/Diggin/Http/Client/Adapter/TestPlus.php (modified) (2 diffs)
• ZendFramework_ext/library/Diggin/Http/CookieJar/Loader/Firefox3.php (modified) (3 diffs)

lang/php/Scraper/demos/Diggin/twitterfollow2wassr.php

@@ -50 +50 @@
               $client->setUri('http://wassr.jp/friend/add');
               $client->request('POST');
-          } catch (Diggin_Scraper_Exception $e){
+          } catch (Diggin_Scraper_Strategy_Exception $e){
               echo $list .' is not join wassr or you had KOUDOKU';
               

lang/php/ZendFramework_ext/library/Diggin/Http/Client/Adapter/TestPlus.php

@@ -139 +139 @@
      */
     public function connect($host, $port = 80, $secure = false)
-    { }
+    { 
+        //require_once 'Zend/Http/Client/Adapter/Exception.php';
+        //throw new Zend_Http_Client_Adapter_Exception('Unable to set the connection timeout');
+    }
 
     /**
@@ -197 +200 @@
             }            
             
-            $randkey = mt_rand(0, count($keys)-1);
-            $code = $keys[$randkey];
+            shuffle($keys);
+            $code = current($keys);
             
             $headers = Zend_Http_Response::extractHeaders($response_str);

lang/php/ZendFramework_ext/library/Diggin/Http/CookieJar/Loader/Firefox3.php

@@ -34 +34 @@
      * @param string $use_topppp_domain //@todo
      * @return Zend_Http_CookieJar
+     * @throws Diggin_Http_CookieJar_Loader_Exception
      */
     public static function load($path, $ref_uri = true, $use_topppp_domain = false)
@@ -59 +60 @@
         }
         
-        require_once 'Zend/Db.php';        
-        $db = Zend_Db::factory('Pdo_Sqlite', array('dbname' => $path) );
-        $db->setFetchMode(Zend_Db::FETCH_OBJ);
-        $select = $db->select()->from(self::TABLENAME);
-        if ($ref_uri !== false) {
-            $select = $select->where('host = ?', $host)->orWhere('host = ?', '.'.$host);
+        require_once 'Zend/Db.php';
+        try {
+            $db = Zend_Db::factory('Pdo_Sqlite', array('dbname' => $path) );
+            $db->setFetchMode(Zend_Db::FETCH_OBJ);
+            $select = $db->select()->from(self::TABLENAME);
+            if ($ref_uri !== false) {
+                $select = $select->where('host = ?', $host)->orWhere('host = ?', '.'.$host);
+            
+                if (is_string($use_topppp_domain)) {
+                    $select = $select->orWhere('host = ?', $use_topppp_domain);
+                }
+            }
+    
+            $fetch = $db->fetchAll($select);
+        } catch (Zend_Db_Exception $e) {
+            require_once 'Diggin/Http/CookieJar/Loader/Exception.php';
+            throw new Diggin_Http_CookieJar_Loader_Exception($e);
         }
-
-        $fetch = $db->fetchAll($select);
 
         if (count($fetch) === 0) {
@@ -76 +86 @@
         require_once 'Zend/Http/CookieJar.php';
         $cookieJar = new Zend_Http_CookieJar();
-        foreach ($fetch as $result) {  
-            $cookie = new Zend_Http_Cookie($result->name,  //cookie->name
-                                           $result->value, //cookie->value
-                                           $result->host,   //cookie->domain
-                                           $result->expiry, // exipry / cookie->expires
-                                           $result->path,   //cookie->path = null, 
-                                           (boolean)$result->isSecure);
-            $cookieJar->addCookie($cookie);
+        foreach ($fetch as $result) {
+            if ($result->name and $result->value and $result->host) {  
+                $cookie = new Zend_Http_Cookie($result->name,  //cookie->name
+                                               $result->value, //cookie->value
+                                               $result->host,   //cookie->domain
+                                               $result->expiry, // exipry / cookie->expires
+                                               $result->path,   //cookie->path = null, 
+                                               (boolean)$result->isSecure);
+                $cookieJar->addCookie($cookie);
+            }
         }