Merge branch 'master' of pwrcvs:/data1/git/pwr

src/exe/rt_rtt/src/rt_rtt.c

@@ -26,9 +26,9 @@ RTT_HELP_SUBJ("PWR_RTT")
 RTT_HELP_INFO("      Select subject with the arrow keys and press RETURN")
 RTT_HELP_TEXT( "\
 	rt_rtt show info about the realtime database.\n\r\n\r\
-OBJECT HIERARCHY	Show the Plant and Node hierarchy.\n\r\
+DATABASE		Show the Plant and Node hierarchy.\n\r\
 ALARM LIST		Show the alarm list.\n\r\
-EVENTLIST		Show the event list.\n\r\
+EVENT LIST		Show the event list.\n\r\
 EXIT			Terminate.")
 
 RTT_HELP_SUBJ("RTT ALARM LIST")
@@ -90,7 +90,7 @@ RTT_MENU_SYSEDIT_NEW( "LOGGING", 0, &RTTSYS_LOGGING)
 RTT_MENU_END( dtt_menu_m6)
 
 RTT_MAINMENU_START( "PWR_RTT/RTT-'RTT_NODE'-'RTT_SYS'")
-RTT_MENUITEM_OBJECTS( "OBJECT HIERARCHY")
+RTT_MENUITEM_OBJECTS( "DATABASE")
 RTT_MENUITEM_COMMAND( "ALARM LIST", "ALARM SHOW")
 RTT_MENUITEM_COMMAND( "EVENT LIST", "ALARM LIST")
 RTT_MENU_NEW( "SYSTEM", dtt_menu_m6)

src/exp/com/src/os_linux/wb_rtt_appl.sh

@@ -77,7 +77,7 @@ then
      $pwrp_lib/${arname_pict} $pwrp_lib/${arname} \
      $ld_opt \
      -lpwr_dtt\
-     -lpwr_rt -lpwr_co -lpwr_msg_dummy -lrpcsvc -lpthread -lm -lposix1b -lrt 
+     -lpwr_rt -lpwr_co -lpwr_flow -lpwr_msg_dummy -lrpcsvc -lpthread -lm -lrt -lcrypt
   fi
 
   if [ $action = "2" ]

src/lib/rt/src/rt_rtt_menu.c

@@ -6993,7 +6993,7 @@ int	rtt_hierarchy(
 	int		sts;
 	pwr_tOName     	objname;
 	pwr_tOName     	hiername;
-	char		title[] = "OBJECT HIERARCHY";
+	char		title[] = "DATABASE";
 	pwr_tObjid	objid;
 	rtt_t_menu	*menulist = 0;
 	int		i, j;
@@ -9778,6 +9778,9 @@ int	rtt_scan(
 {
 	int	sts;
 
+	if ( !rtt_gdh_started)
+	  return RTT__SUCCESS;
+  
         /* Check if rt_ini left us a message */
         get.data = NULL;
         qcom_Get(&sts, &my_q, &get, 0);