Merge pull request #12 from Peardian/throttle

Added: throttle stopper setting & raw report return

Author: carl689

includes/classes/AmazonCore.php

@@ -80,6 +80,7 @@ abstract class AmazonCore{
     protected $throttleTime;
     protected $throttleSafe;
     protected $throttleGroup;
+    protected $throttleStop = false;
     protected $storeName;
     protected $options;
     protected $config;
@@ -403,6 +404,17 @@ public function setStore($s){
         }
     }
 
+    /**
+     * Enables or disables the throttle stop.
+     * 
+     * When the throttle stop is enabled, throttled requests will not  be repeated.
+     * This setting is off by default.
+     * @param boolean $b <p>Defaults to <b>TRUE</b>.</p>
+     */
+    public function setThrottleStop($b=true) {
+        $this->throttleStop=!empty($b);
+    }
+    
     /**
      * Writes a message to the log.
      * 
@@ -550,7 +562,7 @@ protected function sendRequest($url,$param){
         $this->log("Making request to Amazon: ".$this->options['Action']);
         $response = $this->fetchURL($url,$param);
 
-        while ($response['code'] == '503'){
+        while ($response['code'] == '503' && $this->throttleStop==false){
             $this->sleep();
             $response = $this->fetchURL($url,$param);
         }

includes/classes/AmazonFeedResult.php

@@ -4,8 +4,8 @@
  * 
  * This Amazon Feeds Core object can retrieve the results of a
  * processed feed from Amazon, which can then be saved to a file
- * specified by the user. In order to fetch feed results, the
- * feed's ID must be given.
+ * specified by the user or retrieved as a single string.
+ * In order to fetch feed results, the feed's ID must be given.
  */
 class AmazonFeedResult extends AmazonFeedsCore{
     private $rawFeed;
@@ -114,5 +114,18 @@ public function saveFeed($path){
         }
     }
 
+    /**
+     * Returns the entire raw report data.
+     * 
+     * This is useful for handling the report with an external file management system.
+     * @return string|boolean The raw report data as a string, or <b>FALSE</b> if there is no data
+     */
+    public function getRawFeed() {
+        if (!isset($this->rawFeed)){
+            return false;
+        }
+        return $this->rawFeed;
+    }
+    
 }
 ?>