diff --git a/NiHao/doc/META-INF/query - nihao.ctx b/NiHao/doc/META-INF/query - nihao.ctx index 393e674..c3af4c7 100644 --- a/NiHao/doc/META-INF/query - nihao.ctx +++ b/NiHao/doc/META-INF/query - nihao.ctx @@ -74,19 +74,19 @@ insert into nhao_rel_usergroups (userid,groupid) values (1,2); } -query nhaologn_getUserByNickPwd engine any type nihao.login.beans.DBUser{ - SELECT id,nick,display FROM nhao_users WHERE nick=#nick# AND pwd=#pwd# AND active=1 +query nhao_getUserByNickPwd engine any type nihao.login.beans.DBUser{ + SELECT id,nick,name FROM nhao_users WHERE nick=#nick# AND pwd=#pwd# AND active=1 } -query nhaologn_getUserByNick engine any type nihao.login.beans.DBUser{ - SELECT id,nick,display FROM nhao_users WHERE nick=#nick# AND active=1 +query nhao_getUserByNick engine any type nihao.login.beans.DBUser{ + SELECT id,nick,name FROM nhao_users WHERE nick=#nick# AND active=1 } -query nhaologn_getGroupsForUser engine any type nihao.login.Group{ +query nhao_getGroupsForUser engine any type nihao.login.Group{ SELECT id,name FROM nhao_groups WHERE id IN (SELECT groupid FROM nhao_rel_usergroups WHERE userid=#id#) AND active=1 } -query nhaologn_getGroupByName engine any type nihao.login.Group{ +query nhao_getGroupByName engine any type nihao.login.Group{ SELECT id,name FROM nhao_groups WHERE name=## } diff --git a/NiHao/release/NiHao-0.8c.jar b/NiHao/release/NiHao-0.8c.jar index ecf0d63..4695e35 100644 --- a/NiHao/release/NiHao-0.8c.jar +++ b/NiHao/release/NiHao-0.8c.jar Binary files differ diff --git a/NiHao/src/nihao/context/Context.java b/NiHao/src/nihao/context/Context.java index d2b0bd6..1c24f7f 100644 --- a/NiHao/src/nihao/context/Context.java +++ b/NiHao/src/nihao/context/Context.java @@ -564,7 +564,7 @@ name = name.toLowerCase(); HashMap engines = queries.get(name); if (engines == null) - new NiHaoException("Query '" + name + "' not found"); + throw new NiHaoException("Query '" + name + "' not found"); Query result = engines.get(engine); if (result == null && engine != null) result = engines.get(null); diff --git a/NiHao/src/nihao/log/LogProvider.java b/NiHao/src/nihao/log/LogProvider.java index 50c5037..8a6bc36 100644 --- a/NiHao/src/nihao/log/LogProvider.java +++ b/NiHao/src/nihao/log/LogProvider.java @@ -5,7 +5,7 @@ import nihao.ProviderInfo; public abstract class LogProvider extends Provider { - private static ProviderInfo info = ProviderInfo.get(LogProvider.class,NilLogProvider.class); + private static ProviderInfo info = ProviderInfo.get(LogProvider.class, NilLogProvider.class); private static LogProvider prov; public static LogProvider getProvider() { @@ -49,7 +49,12 @@ if (sb.length() > 0) sb.append(' '); if (o instanceof Throwable) { - + Throwable t = (Throwable) o; + sb.append('\n'); + sb.append(t.getClass().getName()); + sb.append(": "); + sb.append(t.getMessage()); + sb.append('\n'); } else sb.append(o); } diff --git a/NiHao/src/nihao/login/LoginDataManager.java b/NiHao/src/nihao/login/LoginDataManager.java index c21155a..1326831 100644 --- a/NiHao/src/nihao/login/LoginDataManager.java +++ b/NiHao/src/nihao/login/LoginDataManager.java @@ -27,7 +27,7 @@ HashMap map = new HashMap(); map.put("nick", nick); map.put("pwd", Conversor.bytesToHex(Hasher.SHA1(Conversor.utf8ToBytes(pwd)))); - DBUser[] users = selectAs("login_getUserByNickPwd", map, DBUser[].class); + DBUser[] users = selectAs("nhao_getUserByNickPwd", map, DBUser[].class); if (users.length == 0) return null; if (users.length > 1) @@ -38,7 +38,7 @@ public User getUserByNick(String nick) { HashMap map = new HashMap(); map.put("nick", nick); - DBUser[] users = selectAs("login_getUserByNick", map, DBUser[].class); + DBUser[] users = selectAs("nhao_getUserByNick", map, DBUser[].class); if (users.length == 0) return null; if (users.length > 1) @@ -47,11 +47,11 @@ } public Group[] getUserGroups(User user) { - Group[] result = selectAs("login_getGroupsForUser", user, Group[].class); + Group[] result = selectAs("nhao_getGroupsForUser", user, Group[].class); return result; } public Group getGroupByName(String name) { - return selectAs("login_getGroupByName", name,Group.class); + return selectAs("nhao_getGroupByName", name,Group.class); } } diff --git a/NiHao/src/nihao/util/Conversor.java b/NiHao/src/nihao/util/Conversor.java index 5ad178d..b11c5ce 100644 --- a/NiHao/src/nihao/util/Conversor.java +++ b/NiHao/src/nihao/util/Conversor.java @@ -8,6 +8,7 @@ import java.io.InputStreamReader; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.PrintWriter; import java.io.Reader; import java.io.StringWriter; import java.io.UnsupportedEncodingException; @@ -240,6 +241,20 @@ } /** + * Return a string with all the output of an exception (call stack included) + * + * @param t + * Throwable + * @return String + */ + public static String fullExceptionToString(Throwable t) { + Writer writer = new StringWriter(); + PrintWriter printWriter = new PrintWriter(writer); + t.printStackTrace(printWriter); + return writer.toString(); + } + + /** * Controla la excepcion del econding * * @param data