Changeset 237

Timestamp:

Jun 29, 2010, 10:51:15 AM (14 years ago)

Author:

shunfa

Message:

管理介面新增選項 - "回主選單"

Location:

nutchez-0.2/src/shell

Files:

• lang/lang_en_US (modified) (1 diff)
• lang/lang_zh_TW (modified) (2 diffs)
• nutchez (modified) (11 diffs)

nutchez-0.2/src/shell/lang/lang_en_US

@@ -308 +308 @@
 dia_back='= [NutchEz Management Interface] ~by NCHC ='
 dia_choose="Please choose what you want to do: "
+dia_backto_main="Back to Main Menu"
 dia_exit="Exit"
 

nutchez-0.2/src/shell/lang/lang_zh_TW

@@ -310 +310 @@
 dia_back='= [NutchEz 管理介面] ~by NCHC ='
 dia_choose="請選擇: "
+dia_backto_main="回主選單"
 dia_exit="結束"
 
@@ -333 +334 @@
 ## [Lang for cluster_status()] ##
 cluster_status_echo_1="[IP] \t\t [Hostname] \t [Network] \t [Dtatnode & Tasktracker]"
-cluster_status_echo_2="開始檢查 Cluster..."
+cluster_status_echo_2="開始檢查 Cluster...請稍候（node數越多,等待時間越長） "
 cluster_status_read_1="請輸入任何鍵繼續..."
 dia_cluster_status_title_1="[Cluster 狀態]"

nutchez-0.2/src/shell/nutchez

@@ -37 +37 @@
 
 # if lang=zh then source lang_zh_TW_nutchez
-echo $lang | grep 'zh' && source $Work_Path/lang/lang_zh_TW_nutchez
+echo $lang | grep 'zh' && source $Work_Path/lang/lang_zh_TW
 }
 
@@ -157 +157 @@
     "stop" "$dia_server_menu_1_2" \
     "restart" "$dia_server_menu_1_3" \
-    "exit" "$dia_exit" 2>$serverSetup
+    "main" "$dia_backto_main" 2>$serverSetup
 
 if [ "$(cat $serverSetup)" == "start" ]; then
     $NutchEZ_Install_PATH/nutch/bin/start-dfs.sh
     $NutchEZ_Install_PATH/nutch/bin/start-mapred.sh
+    # Back to main menu                                                                                    
+    main_menu
+    menu_choose
 elif [ "$(cat $serverSetup)" == "stop" ]; then
     $NutchEZ_Install_PATH/nutch/bin/stop-dfs.sh
     $NutchEZ_Install_PATH/nutch/bin/stop-mapred.sh
+    # Back to main menu                                                                                    
+    main_menu
+    menu_choose
 elif [ "$(cat $serverSetup)" == "restart" ]; then
     $NutchEZ_Install_PATH/nutch/bin/stop-dfs.sh
@@ -170 +176 @@
     $NutchEZ_Install_PATH/nutch/bin/start-dfs.sh
     $NutchEZ_Install_PATH/nutch/bin/start-mapred.sh
-else
-    exit
-fi
-
     # Back to main menu                                                                                    
-    main_menu       
-    menu_choose
+    main_menu
+    menu_choose
+elif [ "$(cat $serverSetup)" == "main" ]; then
+    main_menu
+    menu_choose
+else
+    exit
+fi
+
 }
 
@@ -195 +204 @@
     "All" "$dia_cluster_setup_menu_1_1" \
     "Part" "$dia_cluster_setup_menu_1_2" \
-    "Exit" "$dia_exit" 2>$allpart
+    "Main" "$dia_backto_main" 2>$allpart
 
 # 判斷是否選 all　和 part，若是 all　直接到服務選單，若是 part 則先到機器選單
@@ -204 +213 @@
     --checklist "$dia_cluster_setup_check_1" 15 55 7 $(cat $NutchEZ_HOME/system/nutch_nodes | \
     grep -v '^$' | grep -v '#'  | awk '{print $1 "\t" $2 "\t" "$LIST_status" }') 2>$runNodes
+elif [ "$(cat $allpart)" == "Main" ]; then
+    main_menu
+    menu_choose
 else
     exit
@@ -219 +231 @@
     "stop" "$dia_cluster_setup_menu_2_2" \
     "restart" "$dia_cluster_setup_menu_2_3" \
-    "exit" "$dia_exit" 2>$clusterSetup
+    "main" "$dia_backto_maibackto_main" >$clusterSetup
 
 if [ "$(cat $clusterSetup)" == "start" ]; then
@@ -229 +241 @@
         [ $? == "0" ] || echo "$cluster_setup_echo_error $node !!!"
     done
+    main_menu
+    menu_choose
 elif [ "$(cat $clusterSetup)" == "stop" ]; then
     echo -e "\n$cluster_setup_echo_3"
@@ -237 +251 @@
         [ $? == "0" ] || echo "$cluster_setup_echo_error $node !!!"
     done
+    main_menu
+    menu_choose
 elif [ "$(cat $clusterSetup)" == "restart"  ]; then
     echo -e "\n$cluster_setup_echo_5"
@@ -247 +263 @@
         [ $? == "0" ] || echo "$cluster_setup_echo_error $node !!!"
     done
-else
-    exit
-fi
-
-    # Back to main menu                                                                                    
-    main_menu       
-    menu_choose
+    main_menu
+    menu_choose
+else    
+    exit
+fi
+
+   # Back to main menu                                                                                    
+#    main_menu       
+#    menu_choose
 }
 
@@ -272 +290 @@
         "stop" "$dia_tomcat_switch_menu_1_2" \
         "restart" "$dia_tomcat_switch_menu_1_3" \
-        "exit" "$dia_exit" 2>$tomcatSwitch
+        "main" "$dia_backto_main" 2>$tomcatSwitch
 
 if [ "$(cat $tomcatSwitch)" == "exit" ]; then
     exit 0
+
+elif [ "$(cat $tomcatSwitch)" == "main" ]; then
+    main_menu
+    menu_choose
 fi
 
@@ -358 +380 @@
     "en_US" "$dia_lang_menu_1_1" \
     "zh_TW" "$dia_lang_menu_1_2" \
-    "Exit" "$dia_exit" 2>$langSwitch
+    "main" "$dia_backto_main" 2>$langSwitch
 #
 if [ "$(cat $langSwitch)" == "Exit" ]; then