From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 21 Mar 2011 21:53:45 +0000 (+0100)
Subject: rename initscript_body into initscript_code
X-Git-Tag: plewww-4.3-62~1
X-Git-Url: http://git.onelab.eu/?p=plewww.git;a=commitdiff_plain;h=824042b05cbc6000a370452133db1faa1146b916

rename initscript_body into initscript_code
---

diff --git a/planetlab/common/actions.php b/planetlab/common/actions.php
index b0466bd..9950d5b 100644
--- a/planetlab/common/actions.php
+++ b/planetlab/common/actions.php
@@ -88,8 +88,8 @@ $known_actions []= 'remove-nodes-from-slice';
 $known_actions []= 'add-nodes-in-slice';
 //	expects:	slice_id & node_ids
 $known_actions []= 'update-initscripts';
-//	expects:	slice_id & name & previous-initscript & previous-initscript-body 
-//			& initscript & initscript-body
+//	expects:	slice_id & name & previous-initscript & previous-initscript-code 
+//			& initscript & initscript-code
 $known_actions []= 'delete-slice-tags';
 //      expects:        slice_tag_id
 $known_actions []= 'add-slice-tag';
@@ -709,13 +709,13 @@ Our support team will be glad to answer any question that you might have.
  }
 
  case 'update-initscripts': {
-//	expects:	slice_id & name & previous-initscript & previous-initscript-body 
-//			& initscript & initscript-body
+//	expects:	slice_id & name & previous-initscript & previous-initscript-code 
+//			& initscript & initscript-code
    $slice_id = intval ($_POST['slice_id']); 	
    $previous_initscript=$_POST['previous-initscript'];
    $initscript=$_POST['initscript'];
-   $previous_initscript_body=$_POST['previous-initscript-body'];
-   $initscript_body=$_POST['initscript-body'];
+   $previous_initscript_code=$_POST['previous-initscript-code'];
+   $initscript_code=$_POST['initscript-code'];
 
    $changes=FALSE;
    if (strcmp($initscript,$previous_initscript) != 0) {
@@ -727,22 +727,22 @@ Our support team will be glad to answer any question that you might have.
    }
 
    // somehow some \r chars make it here; just ignore them
-   $previous_initscript_body=str_replace("\r","",$previous_initscript_body);
-   //   plc_debug_txt('previous initscript_body after cr',$previous_initscript_body);
+   $previous_initscript_code=str_replace("\r","",$previous_initscript_code);
+   //   plc_debug_txt('previous initscript_code after cr',$previous_initscript_code);
 
-   $initscript_body=str_replace("\r","",$initscript_body);
+   $initscript_code=str_replace("\r","",$initscript_code);
    // make sure the script ends with a single \n 
-   $initscript_body=trim($initscript_body);
-   if (!empty($initscript_body) && $initscript_body[strlen($initscript_body)-1] != "\n")
-     $initscript_body.="\n";
-   // plc_debug_txt('initscript_body after cr & nl/eof',$initscript_body);
+   $initscript_code=trim($initscript_code);
+   if (!empty($initscript_code) && $initscript_code[strlen($initscript_code)-1] != "\n")
+     $initscript_code.="\n";
+   // plc_debug_txt('initscript_code after cr & nl/eof',$initscript_code);
 
-   if (strcmp($initscript_body,$previous_initscript_body) != 0) {
-     $newvalue=$api->SetSliceInitscriptBody($slice_id,$initscript_body);
+   if (strcmp($initscript_code,$previous_initscript_code) != 0) {
+     $newvalue=$api->SetSliceInitscriptCode($slice_id,$initscript_code);
      // plc_debug_txt('newvalue',$newvalue);
-     $status=(strcmp($newvalue,$initscript_body)==0) ? "OK" : "failed";
-     if (! $initscript_body)	drupal_set_message("Removed initscript body " . $status);
-     else			drupal_set_message("Installed new initscript body " . $status);
+     $status=(strcmp($newvalue,$initscript_code)==0) ? "OK" : "failed";
+     if (! $initscript_code)	drupal_set_message("Removed initscript code " . $status);
+     else			drupal_set_message("Installed new initscript code " . $status);
      $changes=TRUE;
    }
    if (!$changes) drupal_set_message("No changes required in initscript");
diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php
index eaf926e..2c87bca 100644
--- a/planetlab/slices/slice.php
+++ b/planetlab/slices/slice.php
@@ -866,7 +866,7 @@ $tags=$api->GetSliceTags (array('slice_id'=>$slice_id));
 //////////////////////////////////////////////////////////// tab:initscripts
 // xxx fixme
 // * add a message on how to use this:
-// * explain the 2 mechanisms (initscript_body, initscript)
+// * explain the 2 mechanisms (initscript_code, initscript)
 // * explain the interface : initscript start|stop|restart slicename
 // xxx fixme
 
@@ -903,21 +903,21 @@ if ($profiling) plc_debug_prof('6 initscripts',count($initscripts));
 // xxx expose this even on foreign slices for now
 if ($local_peer) {
   $initscript='';
-  $initscript_body='';
+  $initscript_code='';
   if ($tags) foreach ($tags as $tag) {
       if ($tag['tagname']=='initscript') {
 	if ($initscript!='') drupal_set_error("multiple occurrences of 'initscript' tag");
 	$initscript=$tag['value'];
       }
-      if ($tag['tagname']=='initscript_body') {
-	if ($initscript_body!='') drupal_set_error("multiple occurrences of 'initscript_body' tag");
-	$initscript_body=$tag['value'];
-	// plc_debug_txt('retrieved body',$initscript_body);
+      if ($tag['tagname']=='initscript_code') {
+	if ($initscript_code!='') drupal_set_error("multiple occurrences of 'initscript_code' tag");
+	$initscript_code=$tag['value'];
+	// plc_debug_txt('retrieved body',$initscript_code);
       }
     }
   $label="No initscript";
-  $trimmed=trim($initscript_body);
-  if (!empty($trimmed)) $label="Initscript : slice-specific (" . substr($initscript_body,0,20) . " ...)";
+  $trimmed=trim($initscript_code);
+  if (!empty($trimmed)) $label="Initscript : slice-specific (" . substr($initscript_code,0,20) . " ...)";
   else if (!empty($initscript)) $label="Initscript: shared " . $initscript;
 
   $toggle = new PlekitToggle('slice-initscripts',$label,
@@ -934,7 +934,7 @@ if ($local_peer) {
 					 'slice_id'=>$slice_id,
 					 'name'=>$name,
 					 'previous-initscript'=>$initscript,
-					 'previous-initscript-body'=>$initscript_body));
+					 'previous-initscript-code'=>$initscript_code));
   $details->start();
   // comppute a pulldown with available names
   $selectors=array();
@@ -960,13 +960,13 @@ if ($local_peer) {
   ////////// by contents
   $script_height=8;
   $script_width=60;
-  if ($initscript_body) {
-    $text=explode("\n",$initscript_body);
+  if ($initscript_code) {
+    $text=explode("\n",$initscript_code);
     $script_height=count($text);
     $script_width=10;
     foreach ($text as $line) $script_width=max($script_width,strlen($line));
   }
-  $details->th_td('slice initscript',$initscript_body,'initscript-body',
+  $details->th_td('slice initscript',$initscript_code,'initscript-code',
 		  array('input_type'=>'textarea', 'width'=>$script_width,'height'=>$script_height));
   $details->tr_submit('unused','Update initscripts');
   $details->form_end();