From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Tue, 29 Jun 2010 14:42:52 +0000 (-0400)
Subject: Revert "update slice tag whenever appropriate"
X-Git-Tag: plewww-4.3-47~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=70a7f37b9a013b33f743a752dc5cb7c00c519d0f;p=plewww.git

Revert "update slice tag whenever appropriate"

This reverts commit 903b19f98250e3d55639eaaa7831b8c1c7e0cdc2.
---

diff --git a/planetlab/common/actions.php b/planetlab/common/actions.php
index 52d5173..ffb6bc1 100644
--- a/planetlab/common/actions.php
+++ b/planetlab/common/actions.php
@@ -701,45 +701,19 @@ Our support team will be glad to answer any question that you might have.
    $value = $_POST['value'];
    $node_id = intval($_POST['node_id']);
    $nodegroup_id = intval($_POST['nodegroup_id']);
-
+  
    $result = null;
-
-   $tag_types=$api->GetTagTypes(array($tag_type_id));
-   if (count ($tag_types) != 1) {
-       drupal_set_error ("Could not locate tag_type_id $tag_type_id </br> Tag not set.");
+   if ($node_id) {
+     $result = $api->AddSliceTag($slice_id, $tag_type_id, $value, $node_id);
+   } elseif ($nodegroup_id) {
+     $result = $api->AddSliceTag($slice_id, $tag_type_id, $value, null, $nodegroup_id);
    } else {
-       if ($node_id) {
-           $tags = $api->GetSliceTags(array('slice_id'=>$slice_id, 'tag_type_id'=> $tag_type_id, 'node_id' => $node_id));
-       } elseif ($nodegroup_id) {
-           $tags = $api->GetSliceTags(array('slice_id'=>$slice_id, 'tag_type_id'=> $tag_type_id, 'nodegroup_id' => $nodegroup_id));
-       } else {
-           $tags = $api->GetSliceTags(array('slice_id'=>$slice_id, 'tag_type_id'=> $tag_type_id, 'node_id' => NULL, 'nodegroup_id' => NULL));
-       }
- 
-       if ( count ($tags) == 1) {
-           $tag=$tags[0];
-           $tag_id=$tag['slice_tag_id'];
-           $result=$api->UpdateSliceTag($tag_id,$value);
-           if ($result)
-              drupal_set_message ("Updated slice tag.");
-           else 
-              drupal_set_error("Could not update slice tag");
-       } else {
-         if ($node_id) {
-             $result = $api->AddSliceTag($slice_id, $tag_type_id, $value, $node_id);
-         } elseif ($nodegroup_id) {
-             $result = $api->AddSliceTag($slice_id, $tag_type_id, $value, null, $nodegroup_id);
-         } else {
-             $result = $api->AddSliceTag($slice_id, $tag_type_id, $value);
-         }
-
-         if ($result)
-             drupal_set_message ("Added slice tag.");
-         else 
-             drupal_set_error("Could not add slice tag");
-      }
+     $result = $api->AddSliceTag($slice_id, $tag_type_id, $value);
    }
-
+   if ($result)
+     drupal_set_message ("Added slice tag.");
+   else 
+       drupal_set_error("Could not add slice tag");
    if ($_POST['sliver_action'])
        plc_redirect(l_sliver($node_id,$slice_id));
    else