From 19a10334cb108a6caed2e4a236545f7a0090773f Mon Sep 17 00:00:00 2001
From: dr-dolomite <russel.yasol@wvsu.edu.ph>
Date: Mon, 18 Mar 2024 08:44:44 +0800
Subject: [PATCH] added conditions when querying SCC bands

---
 simpleadmin/scripts/modemstatus_parse.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/simpleadmin/scripts/modemstatus_parse.sh b/simpleadmin/scripts/modemstatus_parse.sh
index e323006..0bacb2c 100644
--- a/simpleadmin/scripts/modemstatus_parse.sh
+++ b/simpleadmin/scripts/modemstatus_parse.sh
@@ -37,12 +37,14 @@ nr_bw() {
 }
 
 # Function to get the secondary LTE & NR5G bands
+# Now conditionally calls the functions to get the secondary bands
+# Only apply  | sed '1d' to NR_BAND when network mode is SA
 get_secondary_bands() {
 	# Extract LTE BANDs from SCC lines
 	SCC_BANDS=$(echo "$OX" | grep '+QCAINFO: "SCC"' | grep -o '"LTE BAND [0-9]\+"' | tr -d '"' | sed '1d')
 	
 	# Extract NR5G BANDs from SCC lines
-	NR_BAND=$(echo "$OX" | grep '+QCAINFO: "SCC"' | grep -o '"NR5G BAND [0-9]\+"' | tr -d '"' | sed '1d')
+	NR_BAND=$(echo "$OX" | grep '+QCAINFO: "SCC"' | grep -o '"NR5G BAND [0-9]\+"' | tr -d '"')
 	
 	# Check if both SCC and NR bands are non-empty
 	if [ -n "$SCC_BANDS" ] && [ -n "$NR_BAND" ]; then
@@ -112,8 +114,7 @@ else
 	CSQ_PER="-"
 	CSQ_RSSI="-"
 fi
-get_secondary_bands
-# End of QCAINFO 
+
 NR_NSA=$(echo $OX | grep -o "+QENG:[ ]\?\"NR5G-NSA\",")
 NR_SA=$(echo $OX | grep -o "+QENG: \"SERVINGCELL\",[^,]\+,\"NR5G-SA\",\"[DFT]\{3\}\",")
 if [ -n "$NR_NSA" ]; then
@@ -170,6 +171,7 @@ case $RAT in
 		else
 			MODE="$RAT"
 		fi
+		get_secondary_bands
 		PCI=$(echo $QENG | cut -d, -f9)
 		CHANNEL=$(echo $QENG | cut -d, -f10)
 		LBAND=$(echo $QENG | cut -d, -f11 | grep -o "[0-9]\{1,3\}")
@@ -215,11 +217,13 @@ case $RAT in
 			fi
 		fi
 		if [ -n "$NR_NSA" ]; then
-			MODE="LTE/NR EN-DC"
+			# Changed network mode to NR5G NSA for easy identification 
+			MODE="NR5G NSA"
 			echo "0" > /tmp/modnetwork
 			if [ -n "$QENG5" ]; then
 				QENG5=$QENG5",,"
 				# Append the initial PCI value rather than overwriting it
+				get_secondary_bands
 				PCI="$PCI, "$(echo $QENG5 | cut -d, -f4)
 				SCHV=$(echo $QENG5 | cut -d, -f8)
 				SLBV=$(echo $QENG5 | cut -d, -f9) # Now correctly captures the NR band
@@ -302,6 +306,9 @@ case $RAT in
 		if [ -n "$QENG5" ]; then
 			MODE="$RAT $(echo $QENG5 | cut -d, -f4)"
 			PCI=$(echo $QENG5 | cut -d, -f8)
+			get_secondary_bands
+			# Apply  | sed '1d' to NR_BAND
+			NR_BAND=$(echo $NR_BAND | sed '1d')
 			CHANNEL=$(echo $QENG5 | cut -d, -f10)
 			LBAND=$(echo $QENG5 | cut -d, -f11)
 			PC_BAND="NR5G BAND "$LBAND