X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plekit%2Fphp%2FupdateColumn.php;h=153b655b078a016811e3e742973cbb21bc57762b;hb=d694eb9fdfe0a7bcb9d8fc7b571751475f4227be;hp=e4b1a86787d712af5d1143bee4b33649a1eccb66;hpb=06b76b8ab86072acd993445665d2e7f7ab9a4445;p=plewww.git

diff --git a/plekit/php/updateColumn.php b/plekit/php/updateColumn.php
index e4b1a86..153b655 100644
--- a/plekit/php/updateColumn.php
+++ b/plekit/php/updateColumn.php
@@ -14,27 +14,91 @@ require_once 'plc_drupal.php';
 // Common functions
 require_once 'plc_functions.php';
 
+require_once 'columns.php';
+
+
 $slice_id=$_GET["slice_id"];
 $tagN=$_GET["tagName"];
+$data_source=$_GET["data_source"];
+$data_type=$_GET["data_type"];
 
-
+//print "getting column data for ".$slice_id." with ".$tagN." - ".$data_source." - ".$data_type;
 $nodetags = array('node_id');
 $extratags = explode("|", $tagN);
 
+
 if ($slice_id == "nodes") {
 
-echo "---attached---";
-$nodes=$api->GetNodes(NULL, array_merge($nodetags, $extratags));
-//echo $nodes;
+if ($data_source == "comon") {
+
+	$comontags = $extratags;
+	$extratags = array ('hostname');
+	$nodes=$api->GetNodes(NULL, array_merge($nodetags, $extratags));
+	$ColumnsConfigure = new PlekitColumns(NULL, NULL, NULL);
+	$comon_data = $ColumnsConfigure->comon_query_nodes(",".$tagN);
+
+	//print ("comon tags = ".$comontags);
+	
+	if ($comon_data != "")
+	{
+	echo "---attached---";
+	if ($nodes) foreach ($nodes as $node) {
+		echo "|".$node['node_id'];
+		foreach ($comontags as $t)
+			echo ":".$ColumnsConfigure->convert_data($comon_data[$node['hostname']][$t], $data_type);
+	}
+	}
+}
+else if ($data_source == "tophat") {
+
+	$ColumnsConfigure = new PlekitColumns(NULL, NULL, NULL);
+
+	$extratags = array ('hostname');
+	$nodes=$api->GetNodes(NULL, array_merge($nodetags, $extratags));
+
+	$dd = array();
+	if ($nodes) foreach ($nodes as $n)
+		$dd[] = $n['hostname'];
+
+	if ($tagN == "hopcount") 
+	{
+		$ref_node=$_GET["ref_node"];
+		//print("getting hop count with ref node = ".$ref_node);
+		$tophat_data = $ColumnsConfigure->getPairwise($ref_node, $dd, "traceroute", "hop_count");
+	}
+	else
+		$tophat_data = $ColumnsConfigure->getTopHatData($tagN, $dd);
+
+	//print_r($tophat_data);
+
+	if ($tophat_data != "") {
+	echo "---attached---";
+	if ($nodes) foreach ($nodes as $node) {
+		echo "|".$node['node_id'];
+		echo ":".$ColumnsConfigure->convert_data($tophat_data[$node['hostname']][$tagN], $data_type);
+	}
+	}
+}
+else //MyPLC API
+{
+
+	$nodes=$api->GetNodes(NULL, array_merge($nodetags, $extratags));
 
-if ($nodes) foreach ($nodes as $node) {
-	echo "|".$node['node_id'];
-	foreach ($extratags as $t)
-		echo ":".$node[$t];
+	if ($nodes) {
+	echo "---attached---";
+
+	foreach ($nodes as $node) {
+		echo "|".$node['node_id'];
+		foreach ($extratags as $t)
+			echo ":".$node[$t];
+	}
+	}
 }
 
- }
 
+
+}
+// in slices view
 else
 {
 
@@ -45,20 +109,93 @@ if (empty($slices)) {
 
 $slice=$slices[0];
 
-$nodes=$api->GetNodes(array('node_id'=>$slice['node_ids']),array_merge($nodetags, $extratags));
-$potential_nodes=$api->GetNodes(array('~node_id'=>$slice['node_ids']),array_merge($nodetags, $extratags));
-
-echo "---attached---";
-if ($nodes) foreach ($nodes as $node) {
-	echo "|".$node['node_id'];
-	foreach ($extratags as $t)
-		echo ":".$node[$t];
+if ($data_source == "comon") {
+
+	$comontags = $extratags;
+	$extratags = array ('hostname');
+
+	$nodes=$api->GetNodes(array('node_id'=>$slice['node_ids']),array_merge($nodetags, $extratags));
+	$potential_nodes=$api->GetNodes(array('~node_id'=>$slice['node_ids']),array_merge($nodetags, $extratags));
+
+	$ColumnsConfigure = new PlekitColumns(NULL, NULL, NULL);
+	$comon_data = $ColumnsConfigure->comon_query_nodes(",".$tagN);
+
+	//print ("comon tags = ".$comontags);
+
+	if ($comon_data != "") {
+	echo "---attached---";
+	if ($nodes) foreach ($nodes as $node) {
+		echo "|".$node['node_id'];
+		foreach ($comontags as $t)
+			echo ":".$ColumnsConfigure->convert_data($comon_data[$node['hostname']][$t], $data_type);
+	}
+	echo "|---potential---";
+	if ($potential_nodes) foreach ($potential_nodes as $potential_node) {
+		echo "|".$potential_node['node_id'];
+		foreach ($comontags as $t)
+			echo ":".$ColumnsConfigure->convert_data($comon_data[$potential_node['hostname']][$t], $data_type);
+	}
+	}
 }
-echo "|---potential---";
-if ($potential_nodes) foreach ($potential_nodes as $potential_node) {
-	echo "|".$potential_node['node_id'];
-	foreach ($extratags as $t)
-		echo ":".$potential_node[$t];
+else if ($data_source == "tophat") {
+
+	$ColumnsConfigure = new PlekitColumns(NULL, NULL, NULL);
+
+	$extratags = array ('hostname');
+	$nodes=$api->GetNodes(array('node_id'=>$slice['node_ids']),array_merge($nodetags, $extratags));
+	$potential_nodes=$api->GetNodes(array('~node_id'=>$slice['node_ids']),array_merge($nodetags, $extratags));
+	
+	$dd = array();
+	if ($nodes) foreach ($nodes as $n)
+		$dd[] = $n['hostname'];
+	if ($potential_nodes) foreach ($potential_nodes as $n)
+		$dd[] = $n['hostname'];
+	
+	if ($tagN == "hopcount") 
+	{
+		$ref_node=$_GET["ref_node"];
+		print("getting hop count with ref node = ".$ref_node);
+		$tophat_data = $ColumnsConfigure->getPairwise($ref_node, $dd, "hop_count");
+	}
+	else
+		$tophat_data = $ColumnsConfigure->getTopHatData($tagN, $dd);
+
+	if ($tophat_data != "") {
+	echo "---attached---";
+	if ($nodes) foreach ($nodes as $node) {
+		echo "|".$node['node_id'];
+		echo ":".$ColumnsConfigure->convert_data($tophat_data[$node['hostname']][$tagN], $data_type);
+	}
+
+	echo "|---potential---";
+	if ($potential_nodes) foreach ($potential_nodes as $potential_node) {
+		echo "|".$potential_node['node_id'];
+		echo ":".$ColumnsConfigure->convert_data($tophat_data[$potential_node['hostname']][$tagN], $data_type);
+	}
+	}
+}
+else //MyPLC API
+{
+
+	$nodes=$api->GetNodes(array('node_id'=>$slice['node_ids']),array_merge($nodetags, $extratags));
+	$potential_nodes=$api->GetNodes(array('~node_id'=>$slice['node_ids']),array_merge($nodetags, $extratags));
+	
+	if ($nodes) {
+	echo "---attached---";
+	foreach ($nodes as $node) {
+		echo "|".$node['node_id'];
+		foreach ($extratags as $t)
+			echo ":".$node[$t];
+	}
+	}
+	if ($potential_nodes) {
+	echo "|---potential---";
+	foreach ($potential_nodes as $potential_node) {
+		echo "|".$potential_node['node_id'];
+		foreach ($extratags as $t)
+			echo ":".$potential_node[$t];
+	}
+	}
 }
 }
 ?>