query client for querying data at pda

Author: Chris Sachs

lib/Productsup/Http/Request.php

@@ -84,7 +84,15 @@ public function getHeaders() {
         return $headers;
     }
 
+    public function getUrl() {
+        $url = $this->url;
+        if($this->queryParams) {
+            $url .= '?'.http_build_query($this->queryParams);
+        }
+        return $url;
+    }
+
     public function verboseOutput() {
-        echo "Request:\n\n".$this->method.": ".$this->url." \nHeaders:".join("\n",$this->getHeaders())."\nBody:".$this->getBody();
+        echo "Request:\n\n".$this->method.": ".$this->getUrl()." \nHeaders:".join("\n",$this->getHeaders())."\nBody:".$this->getBody();
     }
 }

lib/Productsup/IO/Curl.php

@@ -28,10 +28,7 @@ private function prepareRequest(Request $request) {
             $request->queryParams['debug'] = '1';
         }
 
-        if(!empty($request->queryParams)) {
-            $request->url .= '?'.http_build_query($request->queryParams);
-        }
-        curl_setopt($this->curl, CURLOPT_URL, $request->url);
+        curl_setopt($this->curl, CURLOPT_URL, $request->getUrl());
         curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $request->method);
         curl_setopt($this->curl, CURLOPT_USERAGENT, $request->getUserAgent());
     }

lib/Productsup/Query.php

@@ -0,0 +1,17 @@
+<?php
+namespace Productsup;
+
+
+class Query {
+    /** @var string query conditions */
+    public $filter = '';
+    /** @var int limit for returned entries */
+    public $limit = 5000;
+    /** @var int offset for returned entries */
+    public $offset = 0;
+    /** @var array fields returned, if empty all fields are returned */
+    public $fields = array();
+    /** @var int should also hidden fields be included? */
+    public $hidden = 0;
+
+}

lib/Productsup/Service/ProductData.php

@@ -41,6 +41,13 @@ class ProductData extends Service {
     protected $serviceName = 'products';
 
 
+
+    /** names for the different stages for querying */
+    const STAGE_IMPORT = 'import';
+    const STAGE_INTERMEDIATE = 'intermediate';
+    const STAGE_EXPORT = 'export';
+    const STAGE_CHANNEL = 'channel';
+
     /**
      * @param Client $Client
      * @param bool $useShutdownHandler set to false to disable shutdown handler
@@ -290,8 +297,7 @@ private function getPdaRequest($stage,$id) {
         $request = $this->getRequest();
         $request->method = Request::METHOD_GET;
         $request->url = $this->scheme.'://'.$this->host.'/product/'.$this->version.'/site/'.$this->_parentIdentifier;
-        $request->url .= '/stage/intermediate/properties/';
-        $request->url .= '/'.$stage;
+        $request->url .= '/stage/'.$stage;
         if($id) {
             $request->url .= '/'.$id;
         }
@@ -305,24 +311,29 @@ private function getPdaRequest($stage,$id) {
      * @param array $params
      * @return array
      */
-    public function get($stage, $id,array $params) {
-        $this->verbose =1;
-        $this->debug = 1;
+    public function get($stage, $id,$params) {
         $request = $this->getPdaRequest($stage,$id);
 
         $request->url .= '/';
-        $request->queryParams = $params;
-        return $this->executeRequest($request);
+        $request->queryParams = (array)$params;
+        $data = $this->executeRequest($request);
+        return isset($data['products']) ? $data['products'] : array();
     }
 
     /**
      * @param string $stage source|intermediate|channel
      * @param int|null $id id of the stage (or null for source)
      * @return array
      */
-    public function getProperties($stage,$id) {
+    public function getProperties($stage,$id, $params = null) {
         $request = $this->getPdaRequest($stage,$id);
+        if(!$id) {
+            $request->url .= '/0';
+        }
         $request->url .= '/properties/';
+        if($params) {
+            $request->queryParams = (array)$params;
+        }
         return $this->executeRequest($request);
     }
 }