TAsk #6518: Adapt swlevel to use WCCILpmon for WinCC 3.14

MAC/APL/APLCommon/src/swlevel

@@ -241,7 +241,7 @@ start_prog()
 	if [ $? -ne 0 ]; then
 		curdate=`date +%Y%m%dT%H%M%S`
 		# PVSS needs special treatment
-		if [ "$prog" = "PVSS00pmon" ]; then 
+		if [ "$prog" = "PVSS00pmon" -o "$prog" = "WCCILpmon" ]; then 
     		   echo Starting $prog
 		   start_pvss2 1>/dev/null 2>&1 &
 		   sleep 3
@@ -320,7 +320,7 @@ stop_prog()
 	fi
 
 	# PVSS needs special treatment
-	if [ "$prog" = "PVSS00pmon" ]; then
+	if [ "$prog" = "PVSS00pmon" -o "$prog" = "WCCILpmon" ]; then
 		echo "Stopping PVSS database"
 		start_pvss2 -stopWait
 		return
@@ -434,13 +434,6 @@ status_prog()
 			highest_level_running=$levelnr
 		else
  			pid="DOWN"
-                        if [ "$prog" == "PVSS00pmon" ]; then
-                           # Check for WCCILpmon (3.14 equivalent)
-                           /sbin/pidof -x WCCILpmon 1>/dev/null 2>&1
-                           if [ $? -eq 0 ]; then
-                             pid=( `/sbin/pidof -x WCCILpmon` )
-		           fi
-                        fi
                 fi
 
 		if [ "$pid" != "DOWN" ] && [ ${#obsid[0]} != 0 ]; then 
@@ -712,7 +705,7 @@ handle_args()
 # On non-PVSS system LoggingProcessor.
 
 logProgToSkip=LoggingProcessor
-if [ -f ${BINDIR}/PVSS00pmon ]; then
+if [ -f ${BINDIR}/PVSS00pmon -o -f ${BINDIR}/WCCILpmon ]; then
 	logProgToSkip=LoggingClient
 fi