X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tools%2Fejabberdsql2prosody.lua;h=930d5a6b787dd4204ea0de476199525d4d9fb8ff;hb=c05bf279c97accb6fc719d7490e5519f073d08d9;hp=c64faee0a502a02c508f28915eef76a5d6a6afd4;hpb=3b635da220bdbe28712f7007be430eb6e1283912;p=prosody.git

diff --git a/tools/ejabberdsql2prosody.lua b/tools/ejabberdsql2prosody.lua
index c64faee0..930d5a6b 100644
--- a/tools/ejabberdsql2prosody.lua
+++ b/tools/ejabberdsql2prosody.lua
@@ -2,7 +2,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -10,8 +10,17 @@
 prosody = {};
 
 package.path = package.path ..";../?.lua";
+
+local my_name = arg[0];
+if my_name:match("[/\\]") then
+	package.path = package.path..";"..my_name:gsub("[^/\\]+$", "../?.lua");
+	package.cpath = package.cpath..";"..my_name:gsub("[^/\\]+$", "../?.so");
+end
+
+
 local serialize = require "util.serialization".serialize;
 local st = require "util.stanza";
+local parse_xml = require "util.xml".parse;
 package.loaded["util.logger"] = {init = function() return function() end; end}
 local dm = require "util.datamanager"
 dm.set_data_path("data");
@@ -167,58 +176,6 @@ return readFile(filename);
 ------
 end
 
--- XML parser
-local parse_xml = (function()
-	local entity_map = setmetatable({
-		["amp"] = "&";
-		["gt"] = ">";
-		["lt"] = "<";
-		["apos"] = "'";
-		["quot"] = "\"";
-	}, {__index = function(_, s)
-			if s:sub(1,1) == "#" then
-				if s:sub(2,2) == "x" then
-					return string.char(tonumber(s:sub(3), 16));
-				else
-					return string.char(tonumber(s:sub(2)));
-				end
-			end
-		end
-	});
-	local function xml_unescape(str)
-		return (str:gsub("&(.-);", entity_map));
-	end
-	local function parse_tag(s)
-		local name,sattr=(s):gmatch("([^%s]+)(.*)")();
-		local attr = {};
-		for a,b in (sattr):gmatch("([^=%s]+)=['\"]([^'\"]*)['\"]") do attr[a] = xml_unescape(b); end
-		return name, attr;
-	end
-	return function(xml)
-		local stanza = st.stanza("root");
-		local regexp = "<([^>]*)>([^<]*)";
-		for elem, text in xml:gmatch(regexp) do
-			if elem:sub(1,1) == "!" or elem:sub(1,1) == "?" then -- neglect comments and processing-instructions
-			elseif elem:sub(1,1) == "/" then -- end tag
-				elem = elem:sub(2);
-				stanza:up(); -- TODO check for start-end tag name match
-			elseif elem:sub(-1,-1) == "/" then -- empty tag
-				elem = elem:sub(1,-2);
-				local name,attr = parse_tag(elem);
-				stanza:tag(name, attr):up();
-			else -- start tag
-				local name,attr = parse_tag(elem);
-				stanza:tag(name, attr);
-			end
-			if #text ~= 0 then -- text
-				stanza:text(xml_unescape(text));
-			end
-		end
-		return stanza.tags[1];
-	end
-end)();
--- end of XML parser
-
 local arg, host = ...;
 local help = "/? -? ? /h -h /help -help --help";
 if not(arg and host) or help:find(arg, 1, true) then