Merge branch 'master' of 192.168.3.251:connector-php

1 files changed, 43 insertions, 5 deletions

diff --git a/codebase/data_connector.php b/codebase/data_connector.php
index e4e5e08..e6786b9 100644
--- a/codebase/data_connector.php
+++ b/codebase/data_connector.php
@@ -145,14 +145,11 @@ class DataConnector extends Connector{
 			$this->request->set_limit($_GET["start"],$_GET["count"]);
 
 	}
-	
+
 	/*! renders self as  xml, starting part
 	*/
 	protected function xml_start(){
-		$start = "<data";
-		foreach($this->attributes as $k=>$v)
-			$start .= " ".$k."='".$v."'";
-		$start.= ">";
+		$start = parent::xml_start();
 
 		foreach($this->sections as $k=>$v)
 			$start .= "<".$k.">".$v."</".$k.">\n";
@@ -418,6 +415,11 @@ class JSONTreeDataConnector extends TreeDataConnector{
 		$data = array();
 		$data["parent"] = $this->request->get_relation();
 		$data["data"] = $result;
+
+        $this->fill_collections();
+        if (!empty($this->options))
+            $data["collections"] = $this->options;
+
 		$data = json_encode($data);
 
 		// return as string
@@ -430,6 +432,42 @@ class JSONTreeDataConnector extends TreeDataConnector{
 		$out->output("", true, $this->encoding);
 	}
 
+    /*! assign options collection to the column
+
+		@param name
+			name of the column
+		@param options
+			array or connector object
+	*/
+    public function set_options($name,$options){
+        if (is_array($options)){
+            $str=array();
+            foreach($options as $k => $v)
+                $str[]=Array("id"=>$this->xmlentities($k), "value"=>$this->xmlentities($v));//'{"id":"'.$this->xmlentities($k).'", "value":"'.$this->xmlentities($v).'"}';
+            $options=$str;
+        }
+        $this->options[$name]=$options;
+    }
+
+    /*! generates xml description for options collections
+
+        @param list
+            comma separated list of column names, for which options need to be generated
+    */
+    protected function fill_collections($list=""){
+        $options = array();
+        foreach ($this->options as $k=>$v) {
+            $name = $k;
+            if (!is_array($this->options[$name]))
+                $option=$this->options[$name]->render();
+            else
+                $option=$this->options[$name];
+            $options[$name] = $option;
+        }
+        $this->options = $options;
+        $this->extra_output .= "'collections':".json_encode($options);
+    }
+
 }