For the cat.

MCvarial · MCvarial · commit 25128b52a4ac · 2011-07-04T10:09:55.000Z
diff --git a/resources/irc/logs.html b/resources/irc/logs.html
@@ -4,29 +4,9 @@
 	</head>
 	<body>
 		<* 
-		-- Compatibility: Lua-5.1
-		function Split(str, pat)
-		   local t = {}  -- NOTE: use {n = 0} in Lua-5.0
-		   local fpat = "(.-)" .. pat
-		   local last_end = 1
-		   local s, e, cap = str:find(fpat, 1)
-		   while s do
-			  if s ~= 1 or cap ~= "" then
-			 table.insert(t,cap)
-			  end
-			  last_end = e+1
-			  s, e, cap = str:find(fpat, last_end)
-		   end
-		   if last_end <= #str then
-			  cap = str:sub(last_end)
-			  table.insert(t, cap)
-		   end
-		   return t
-		end
-		
 		local file = fileOpen(":irc/irc.log",true) 
 		
-		for i,line in pairs (Split(tostring(fileRead(file,fileGetSize(file))),"\n")) do
+		for i,line in pairs (split(tostring(fileRead(file,fileGetSize(file))),10)) do
 			httpWrite(tostring(line)..'<br>')
 		end
 		
diff --git a/resources/irc/scripts/core.lua b/resources/irc/scripts/core.lua
@@ -118,7 +118,7 @@ addEventHandler("onSockData",root,
 	function (socket,data)
 		for server,info in pairs (servers) do
 			if info[1] == socket then
-				for i,line in ipairs (Split(data,"\n")) do
+				for i,line in ipairs (split(data,10)) do
 					if line ~= "" then
 						triggerEvent("onIRCRaw",server,line)
 					end
diff --git a/resources/irc/scripts/handling.lua b/resources/irc/scripts/handling.lua
@@ -29,7 +29,7 @@ addEventHandler("onSockData",root,
 	function (socket,data)
 		for server,info in pairs (servers) do
 			if info[1] == socket then
-				for i,line in ipairs (Split(data,"\n")) do
+				for i,line in ipairs (split(data,10)) do
 					if line ~= "" then
 						triggerEvent("onIRCRaw",server,line)
 					end
diff --git a/resources/irc/scripts/utility.lua b/resources/irc/scripts/utility.lua
@@ -9,31 +9,6 @@
 ------------------------------------
 -- Utility
 ------------------------------------
--- function copied from: http://lua-users.org/wiki/StringRecipes
-function Split(str, delim, maxNb)
-    -- Eliminate bad cases...
-    if string.find(str, delim) == nil then
-        return { str }
-    end
-    if maxNb == nil or maxNb < 1 then
-        maxNb = 0    -- No limit
-    end
-    local result = {}
-    local pat = "(.-)" .. delim .. "()"
-    local nb = 0
-    local lastPos
-    for part, pos in string.gfind(str, pat) do
-        nb = nb + 1
-        result[nb] = part
-        lastPos = pos
-        if nb == maxNb then break end
-    end
-    -- Handle the last field
-    if nb ~= maxNb then
-        result[nb + 1] = string.sub(str, lastPos)
-    end
-    return result
-end
 
 function getAdminMessage (time,author)
 	outputServerLog("Time: "..time..", Author: "..author)
