diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 2c68b127c..1b6a61e76 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -2073,8 +2073,6 @@ function ATIS:onafterBroadcast( From, Event, To ) -- Cloud preset (DCS 2.7) local cloudspreset = clouds.preset or "Nothing" - env.info("FF cloud preset "..cloudspreset) - -- Precepitation: 0=None, 1=Rain, 2=Thunderstorm, 3=Snow, 4=Snowstorm. local precepitation = 0 @@ -2102,7 +2100,6 @@ function ATIS:onafterBroadcast( From, Event, To ) else precepitation = 3 -- snow end - env.info("Fprecipt "..precepitation) elseif cloudspreset:find( "RainyPreset" ) then -- Overcast + Rain clouddens = 9 diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index 2f975920a..842c94df9 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -3998,23 +3998,20 @@ end -- @return #table The table filled with data from the csv file. function UTILS.ReadCSV(filename) - if not UTILS.FileExists(filename) then - + if not UTILS.FileExists(filename) then env.error("File does not exist") - return nil - + return nil end --- Function that load data from a file. local function _loadfile( filename ) local f = io.open( filename, "rb" ) if f then - -- self:I(self.lid..string.format("Loading player results from file %s", tostring(filename))) local data = f:read( "*all" ) f:close() return data else - BASE:E( self.lid .. string.format( "WARNING: Could not load player results from file %s. File might not exist just yet.", tostring( filename ) ) ) + BASE:E(string.format( "WARNING: Could read data from file %s!", tostring( filename ) ) ) return nil end end @@ -4032,9 +4029,7 @@ function UTILS.ReadCSV(filename) local sep=";" local columns=UTILS.Split(lines[1], sep) - - BASE:I(columns) - + -- Remove header line. table.remove(lines, 1) @@ -4046,16 +4041,9 @@ function UTILS.ReadCSV(filename) for j, value in pairs(UTILS.Split(line, sep)) do local key=string.gsub(columns[j], "[\n\r]","") - - - --env.info(string.format("i=%d, j=%d key=%s value=%s", i,j, key, value)) - - row[key]=value - + row[key]=value end table.insert(csvdata, row) - BASE:E(row) - end