vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SQL query fix
Some checks are pending
URL Path Check / check-url-paths (push) Waiting to run
Details
docker / docker_dev (push) Waiting to run
Details
Deploy MkDocs / deploy (push) Waiting to run
Details

Browse Source
This commit is contained in:
jokob-sk
2025-03-29 12:55:24 +11:00
parent e25c471626
commit f2e218230e
1 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server/scan/device_handling.py
View File

@@ -330,38 +330,21 @@ def update_devices_data_from_scan (db):
mylog('debug', '[Update Devices] - (if not empty) cur_NetworkNodeMAC -> devParentMAC') mylog('debug', '[Update Devices] - (if not empty) cur_NetworkNodeMAC -> devParentMAC')
sql.execute("""UPDATE Devices sql.execute("""UPDATE Devices
SET devParentMAC = ( SET devParentMAC = (
SELECT cur_NetworkNodeMAC SELECT cur_NetworkNodeMAC
FROM CurrentScan
WHERE Devices.devMac = CurrentScan.cur_MAC
)
<<<<<<< HEAD
<<<<<<<< HEAD:server/scan/device_handling.py
WHERE
========
WHERE
>>>>>>>> main:server/device.py
=======
WHERE
>>>>>>> main
(devParentMAC IS NULL OR devParentMAC IN ("", "null", "(unknown)", "(Unknown)"))
AND
EXISTS (
SELECT 1
FROM CurrentScan FROM CurrentScan
WHERE Devices.devMac = CurrentScan.cur_MAC WHERE Devices.devMac = CurrentScan.cur_MAC
<<<<<<< HEAD
<<<<<<<< HEAD:server/scan/device_handling.py
AND CurrentScan.cur_NetworkNodeMAC IS NOT NULL AND CurrentScan.cur_NetworkNodeMAC NOT IN ("", "null")
========
AND CurrentScan.cur_NetworkNodeMAC IS NOT NULL AND CurrentScan.cur_NetworkNodeMAC NOT IN ("", "null")
>>>>>>>> main:server/device.py
)""")
=======
AND CurrentScan.cur_NetworkNodeMAC IS NOT NULL AND CurrentScan.cur_NetworkNodeMAC NOT IN ("", "null")
) )
WHERE
(devParentMAC IS NULL OR devParentMAC IN ("", "null", "(unknown)", "(Unknown)"))
AND
EXISTS (
SELECT 1
FROM CurrentScan
WHERE Devices.devMac = CurrentScan.cur_MAC
AND CurrentScan.cur_NetworkNodeMAC IS NOT NULL AND CurrentScan.cur_NetworkNodeMAC NOT IN ("", "null")
)
""") """)
>>>>>>> main
# Update only devices with empty or NULL devSite # Update only devices with empty or NULL devSite
mylog('debug', '[Update Devices] - (if not empty) cur_NetworkSite -> (if empty) devSite') mylog('debug', '[Update Devices] - (if not empty) cur_NetworkSite -> (if empty) devSite')