Skip to content

Commit 4d95988

Browse files
authored
Merge pull request #46 from matsn0w/matsn0w/issue44
feat: continue script on parse error
2 parents 7e710d0 + 8a74558 commit 4d95988

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

resource/server/init.lua

+14-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,20 @@ AddEventHandler('onResourceStart', function(name)
2020
end
2121

2222
for i = 1, #Config.ELSFiles do
23-
local data = LoadResourceFile(GetCurrentResourceName(), 'xmlFiles/' .. Config.ELSFiles[i])
24-
25-
if data then ParseObjSet(data, Config.ELSFiles[i])
26-
else print('VCF file not found: ' .. Config.ELSFiles[i]) end
23+
local file = Config.ELSFiles[i]
24+
local data = LoadResourceFile(GetCurrentResourceName(), 'xmlFiles/' .. file)
25+
26+
if data then
27+
if pcall(function() ParseObjSet(data, file) end) then
28+
-- no errors
29+
print('Parsed VCF for: ' .. file)
30+
else
31+
-- VCF is faulty, notify the user and continue
32+
print('VCF file ' .. file .. ' could not be parsed: is your XML valid?')
33+
end
34+
else
35+
print('VCF file ' .. file .. ' not found: does the file exist?')
36+
end
2737
end
2838

2939
-- send the ELS data to all clients

resource/server/parseVCF.lua

-2
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,4 @@ function ParseVCF(xml, fileName)
127127
end
128128

129129
kjxmlData[fileName] = vcf
130-
131-
print('ELS: Parsed VCF for ' .. fileName)
132130
end

0 commit comments

Comments
 (0)