diff --git a/.gitattributes b/.gitattributes
index 0335de5d9a4288b9f302aeb8acee74ced83f34f4..fe149fadadb8169ea92555cbf91fe19409cd2098 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -453,6 +453,7 @@ MAC/Config/Apc/d1.apc -text svneol=native#application/octet-stream
MAC/Config/Apc/e1.apc -text svneol=native#application/octet-stream
MAC/Deployment/data/OTDB/createPICfile -text
MAC/Deployment/data/OTDB/loadPICtree -text
+MAC/Deployment/data/PVSS/PVSSbase.dpdef -text
MAC/Deployment/data/PVSS/TBBCtrl.dpdef -text
MAC/Deployment/data/PVSS/TBBoard.dpdef -text
MAC/Deployment/data/PVSS/TempCtrl.dpdef -text
diff --git a/MAC/Deployment/data/PVSS/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
index d23ce0bf34b917e99040e0e017cbc3bccbe0c99a..4e1fd73288ce2b77c383eaa74bb4de53c6957dcf 100644
--- a/MAC/Deployment/data/PVSS/PVSSDataPoints.base
+++ b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
@@ -22,6 +22,12 @@ WAN - C P LOFAR_PIC_WAN
WANarea - C P LOFAR_PIC_WAN_@wan@
Switch - C P LOFAR_PIC_WAN_@wan@_@switch@
PermSW - C P LOFAR_PermSW
+Daemons - C P LOFAR_PermSW_Daemons
+LogProcessor - C P LOFAR_PermSW_Daemons_LogProcessor
+KVLogger - C P LOFAR_PermSW_Daemons_KVLogger
+ServiceBroker - C P LOFAR_PermSW_Daemons_ServiceBroker
+CTStartDaemon - C P LOFAR_PermSW_Daemons_CTStartDaemon
+SASGateway - C P LOFAR_PermSW_Daemons_SASGateway
MACScheduler MS C P LOFAR_PermSW_MACScheduler
Ring - C P LOFAR_PermSW_@ring@
Station - C P LOFAR_PermSW_@ring@_@station@
@@ -47,10 +53,20 @@ RCU RCU S P LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@_@rcu@
TBBoard TBB S P LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@
StationClock SCK S P LOFAR_PIC_StationClock
StnPermSW - S P LOFAR_PermSW
+Daemons - S P LOFAR_PermSW_Daemons
+LogProcessor LGP S P LOFAR_PermSW_Daemons_LogProcessor
+KVLogger KVL S P LOFAR_PermSW_Daemons_KVLogger
+ServiceBroker - S P LOFAR_PermSW_Daemons_ServiceBroker
+CTStartDaemon - S P LOFAR_PermSW_Daemons_CTStartDaemon
+SASGateway SGW S P LOFAR_PermSW_Daemons_SASGateway
DigBoardCtrl DBC S P LOFAR_PermSW_DigBoardCtrl
+RSPDriver - S P LOFAR_PermSW_RSPDriver
+TBBDriver - S P LOFAR_PermSW_TBBDriver
+AMCServer - S P LOFAR_PermSW_AMCServer
+BeamServer - S P LOFAR_PermSW_BeamServer
+CalServer - S P LOFAR_PermSW_CalServer
StationCtrl SC S P LOFAR_PermSW_StationCtrl
TempCtrl TC S P LOFAR_PermSW_TempCtrl
-LoggingProcessor LGP S P LOFAR_PermSW_LoggingProcessor
HardwareMonitor HWM S P LOFAR_PermSW_HardwareMonitor
SoftwareMonitor SWM S P LOFAR_PermSW_SoftwareMonitor
MACInfoServer MIS S P LOFAR_PermSW_MACInfoServer
diff --git a/MAC/Deployment/data/PVSS/PVSSbase.dpdef b/MAC/Deployment/data/PVSS/PVSSbase.dpdef
new file mode 100644
index 0000000000000000000000000000000000000000..dd18a62ef1384b01ecf36276cabbd5bf28970213
--- /dev/null
+++ b/MAC/Deployment/data/PVSS/PVSSbase.dpdef
@@ -0,0 +1,43 @@
+# Definition of some basic types
+TypeName
+Claim.Claim 1#1
+ ClaimDate 26#2
+
+TypeName
+AntennaArrays.AntennaArrays 1#1
+ centerOL 22#2
+ centerNB 22#3
+ centerH 22#4
+ antennaOffsetsOL 6#5
+ antennaOffsetsNB 6#6
+ antennaOffsetsH 6#7
+
+TypeName
+ObjectStatus.ObjectStatus 1#1
+ state 21#2
+ childState 21#3
+ message 25#4
+
+TypeName
+ProcessStatus.ProcessStatus 1#1
+ processID 21#2
+ startTime 25#3
+ stopTime 25#4
+ logMsg 25#5
+ error 25#6
+ currentAction 25#7
+
+# create mp for ProcessStatus end attach an archive
+DpName TypeName ID
+_mp_ProcessStatus ProcessStatus 0
+_dt_ProcessStatus _DynamicDatapoints 0
+
+ElementName TypeName _original.._value _original.._status
+_dt_ProcessStatus.Leaf _DynamicDatapoints "_mp_ProcessStatus.logMsg:_archive" 0x101
+_dt_ProcessStatus.DynamicAttribute _DynamicDatapoints "_da_none" 0x101
+
+StampSec StampMSec ElementName TypeName DetailNr _archive.._type _archive.._archive _archive.._class
+0 0 _mp_ProcessStatus.logMsg ProcessStatus 45 1
+0 0 _mp_ProcessStatus.logMsg ProcessStatus 1 15 _ValueArchive_2
+
+
diff --git a/MAC/Deployment/data/PVSS/create_db_files b/MAC/Deployment/data/PVSS/create_db_files
index 1ff9523a2148e1e54c8677f8db0fba3300af4b6a..acedd9f119f5dbe7f544b94b19278002b22ba9fb 100755
--- a/MAC/Deployment/data/PVSS/create_db_files
+++ b/MAC/Deployment/data/PVSS/create_db_files
@@ -476,6 +476,7 @@ create_dpt_file()
(
echo -n "# This file was generated by $(basename $0) ${VERSION} on " ; date
echo ""
+ cat PVSSbase.dpdef
) >${DESTDIR}/${DPT_FILE}
prevdpt="abc"
@@ -493,17 +494,15 @@ create_dpt_file()
# create PVSStypes
echo "TypeName"
echo "${dpt}.${dpt} 1#1"
- echo " state 21#2"
- echo " childState 21#3"
- let count=4
- if [ ${prefix} != "-" ]; then
+ echo " status 41#2:ObjectStatus"
+ let count=3
+ echo $dp | grep 'SW_' 2>&1 1>/dev/null
+ if [ $? = 0 ]; then
if [ ! -f ${dpt}.dpdef ]; then
echo "No definition file for ${dpt}" >> ${ERRORFILE}
fi
- echo " currentAction 25#4"
- echo " error 25#5"
- echo " logMsg 25#6"
- let count=7
+ echo " process 41#3:ProcessStatus"
+ let count=4
fi
if [ -f ${dpt}.dpdef ]; then
@@ -558,24 +557,6 @@ create_dpt_file()
fi
echo ""
- # Create MasterDataPoint
- echo "DpName TypeName ID"
- echo "_mp_${dpt} ${dpt} 0"
- echo ""
-
- # Create _DynamicDataPoints entry for each datapointType
- echo "DpName TypeName ID"
- echo "_dt_${dpt} _DynamicDatapoints 0"
- echo ""
-
- # if software then create an hourarchive for the logMsg in the MasterDataPoint
- if [ ${prefix} != "-" ]; then
- echo "StampSec StampMSec ElementName TypeName DetailNr _archive.._type _archive.._archive _archive.._class"
- echo "0 0 _mp_${dpt}.logMsg ${dpt} 45 1"
- echo "0 0 _mp_${dpt}.logMsg ${dpt} 1 15 _ValueArchive_2"
- echo ""
- fi
-
done >>${DESTDIR}/${DPT_FILE}
echo "created: ${DESTDIR}/${DPT_FILE}"
@@ -620,6 +601,40 @@ create_dp_file()
sort -k1,1 |\
number_dps >>${DESTDIR}/${DP_FILE}
+ # setup master point and archives
+ prevdpt="abc"
+ cleanlist $1 | sort | while read dpt prefix dbtype dptype dp
+ do
+ if [ "${dbtype}" != "$2" ]; then
+ continue
+ fi
+
+ if [ "${prevdpt}" == "${dpt}" ]; then
+ continue
+ fi
+ prevdpt=${dpt}
+
+ # Create MasterDataPoint
+ echo "DpName TypeName ID"
+ echo "_mp_${dpt} ${dpt} 0"
+ echo "_dt_${dpt} _DynamicDatapoints 0"
+ echo ""
+
+ # if software then create an hourarchive for the logMsg in the MasterDataPoint
+ echo $dp | grep 'SW_' 2>&1 1>/dev/null
+ if [ $? = 0 ]; then
+ echo "ElementName TypeName _original.._value _original.._status"
+ echo "_dt_${dpt}.Leaf _DynamicDatapoints "'"'_mp_${dpt}.logMsg:_archive'"'" 0x101"
+ echo "_dt_${dpt}.DynamicAttribute _DynamicDatapoints "'"'_da_none'"'" 0x101"
+ echo ""
+
+ echo "StampSec StampMSec ElementName TypeName DetailNr _archive.._type _archive.._archive _archive.._class"
+ echo "0 0 _mp_${dpt}.process.logMsg ${dpt} 45 1"
+ echo "0 0 _mp_${dpt}.process.logMsg ${dpt} 1 15 _ValueArchive_2"
+ echo ""
+ fi
+ done >>${DESTDIR}/${DP_FILE}
+
echo "created: ${DESTDIR}/${DP_FILE}"
}
@@ -719,7 +734,7 @@ RINGLIST=`concatfile $RINGFILE`
RINGSTATIONLIST=`create_ring_station_list`
WANLIST=`concatfile $WANFILE`
WANSWITCHLIST=`create_wan_switch_list`
-NRRSPBOARDS=`grep -s ${STNNAME} ${STATIONINFOFILE} | awk '{ print $7 }'`
+NRRSPBOARDS=`grep -s ${STNNAME}[[:space:]] ${STATIONINFOFILE} | awk '{ print $7 }'`
# create the desired files
create_dpt_file ${INPUTFILE} ${DBTYPE}