MoreText added

src/exe/rt_emon/src/rt_emon.c

 /* 
- * Proview   $Id: rt_emon.c,v 1.12 2007-05-24 14:50:13 claes Exp $
+ * Proview   $Id: rt_emon.c,v 1.13 2008-01-24 09:56:58 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -141,6 +141,7 @@ struct s_Active {
   mh_uEventInfo		status;
   mh_eEvent		event;
   pwr_tAttrRef		eventSound;
+  pwr_tString256	eventMoreText;
   pwr_tBoolean		local;
   sEventTab		*detect_etp;
   sEventTab		*return_etp;
@@ -239,6 +240,7 @@ struct s_Sup {
   mh_eEventPrio   EventPriority;
   mh_mEventFlags  EventFlags;
   pwr_tAttrRef	  Sound;
+  pwr_tText256	  MoreText;
   /* Internal attributes */
   pwr_sAttrRef    Attribute;
   mh_uEventInfo   AlarmStatus;
@@ -910,6 +912,7 @@ applMessage (
   strncpy(aap->link.eventName, ip->EventName, sizeof(aap->link.eventName));
   aap->link.eventFlags = ip->EventFlags;
   aap->link.eventSound = ip->EventSound;
+  strncpy(aap->link.eventMoreText, ip->EventMoreText, sizeof(aap->link.eventMoreText));
   aap->link.event = ip->EventType;
 
   aap->message = *ip;
@@ -1498,6 +1501,7 @@ formatApplEvent (
     mp->SupInfo.SupType = aap->message.SupInfo.SupType;
     memcpy(&mp->SupInfo, &aap->message.SupInfo, sizeof(mh_uSupInfo));
     mp->EventSound = aap->link.eventSound;
+    strncpy(mp->EventMoreText, aap->message.EventMoreText, sizeof(mp->EventMoreText));
     *size = sizeof(mh_sMessage);
     break;
   case mh_eEvent_Ack:
@@ -1592,6 +1596,7 @@ formatSupEvent (
     }
 #endif
     mp->EventSound = sp->link.eventSound;
+    strncpy(mp->EventMoreText, sup->MoreText, sizeof(mp->EventMoreText));
     memcpy(&mp->SupInfo.mh_uSupInfo_u, sp->supInfoP, sp->supInfoSize);
     *size = sizeof(mh_sMessage);
     break;

src/lib/rt/src/rt_mh_appl.h

 /* 
- * Proview   $Id: rt_mh_appl.h,v 1.5 2005-11-14 16:29:25 claes Exp $
+ * Proview   $Id: rt_mh_appl.h,v 1.6 2008-01-24 09:58:41 claes Exp $
  * Copyright (C) 2005 SSAB Oxelösund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -112,6 +112,7 @@ struct mhs_ApplMessage {
   mh_uSupInfo	    SupInfo;      /**< Supplies the type of supervision data that should be associated 
 				     with the message: analog, digital or none. See mh_eSupType.*/ 
   pwr_sAttrRef	    EventSound;    /**< Reference to sound object. Determines the alarm sound. */
+  pwr_tString256    EventMoreText; /**< An arbitrary string supplying more information about the event */
 };
 
 /**@}*/

src/lib/rt/src/rt_mh_net.x

 #ifdef RPC_HDR
 %/* 
-% * Proview   $Id: rt_mh_net.x,v 1.4 2006-06-29 10:58:02 claes Exp $
+% * Proview   $Id: rt_mh_net.x,v 1.5 2008-01-24 09:58:41 claes Exp $
 % * Copyright (C) 2005 SSAB Oxelsund AB.
 % *
 % * This program is free software; you can redistribute it and/or 
@@ -365,6 +365,7 @@ struct mh_sMessage {
   mh_mEventStatus	Status;
   mh_uSupInfo		SupInfo;
   pwr_sAttrRef		EventSound;
+  pwr_tString256	EventMoreText;
 };
 
 struct mh_sReturn {

src/wbl/pwrb/src/pwrb_c_asup.wb_load

 ! 
-!  Proview   $Id: pwrb_c_asup.wb_load,v 1.11 2005-11-15 07:44:26 claes Exp $
+!  Proview   $Id: pwrb_c_asup.wb_load,v 1.12 2008-01-24 09:58:41 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelösund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -313,6 +313,16 @@ SObject pwrb:Class
         EndBody
       EndObject
       !/**
+      !  Optional text supplying more information about the event.
+      !  The more text can for example contain actions to be made when an alarm is detected.
+      !*/
+      Object MoreText $Attribute 40
+        Body SysBody
+          Attr PgmName = "MoreText"
+          Attr TypeRef = "pwrs:Type-$Text256"
+        EndBody
+      EndObject
+      !/**
       !  Specifies the complete name of supervised parameter.
       !  Attribute is filled in by the user if the input named
       !  IN is left open. If the input is connected the names

src/wbl/pwrb/src/pwrb_c_cyclesup.wb_load

 ! 
-!  Proview   $Id: pwrb_c_cyclesup.wb_load,v 1.8 2005-11-15 07:44:26 claes Exp $
+!  Proview   $Id: pwrb_c_cyclesup.wb_load,v 1.9 2008-01-24 09:58:41 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -352,6 +352,16 @@ SObject pwrb:Class
         EndBody
       EndObject
       !/**
+      !  Optional text supplying more information about the event.
+      !  The more text can for example contain actions to be made when an alarm is detected.
+      !*/
+      Object MoreText $Attribute 47
+        Body SysBody
+          Attr PgmName = "MoreText"
+          Attr TypeRef = "pwrs:Type-$Text256"
+        EndBody
+      EndObject
+      !/**
       !  Attribute is filled in by the user if the input named
       !  IN is left open. If the input is connected the names
       !  are filled in by the PROVIEW/R system at compilation.

src/wbl/pwrb/src/pwrb_c_dsup.wb_load

 ! 
-!  Proview   $Id: pwrb_c_dsup.wb_load,v 1.11 2005-11-15 07:44:26 claes Exp $
+!  Proview   $Id: pwrb_c_dsup.wb_load,v 1.12 2008-01-24 09:58:41 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelösund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -315,6 +315,16 @@ SObject pwrb:Class
         EndBody
       EndObject
       !/**
+      !  Optional text supplying more information about the event.
+      !  The more text can for example contain actions to be made when an alarm is detected.
+      !*/
+      Object MoreText $Attribute 37
+        Body SysBody
+          Attr PgmName = "MoreText"
+          Attr TypeRef = "pwrs:Type-$Text256"
+        EndBody
+      EndObject
+      !/**
       !  Attribute is filled in by the user if the input named
       !  IN is left open. If the input is connected the names
       !  are filled in by the PROVIEW/R system at compilation.