diff --git a/tctable/Tools.java b/tctable/Tools.java index db48d39..b2fc07a 100644 --- a/tctable/Tools.java +++ b/tctable/Tools.java @@ -2,6 +2,11 @@ package tctable; //import android.util.Log; +//import org.ccalm.dbms.AcceptJSON; +import org.json.JSONException; +import org.json.JSONObject; + + import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -12,14 +17,32 @@ import java.net.InetAddress; import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.io.UnsupportedEncodingException; import java.util.Calendar; import java.util.TimeZone; +import logging.Logger; + public class Tools { + private static final Logger logger = Logger.getLogger(Tools.class); + + public static JSONObject createJSONError(int code, String message, String setting, String marker) { + JSONObject json = new JSONObject(); + try { + json.put("error_code", code); + json.put("error_message", Arrays.asList(message)); + json.put("error_setting", Arrays.asList(setting)); + json.put("error_marker", marker); + } catch (JSONException e) { + logger.error(e.getMessage()); + } + return json; + } + public static String readStringFromInputStream(InputStream inputStream) { ByteArrayOutputStream result = new ByteArrayOutputStream(); byte[] buffer = new byte[1024]; @@ -399,7 +422,7 @@ public class Tools { //Из руского DOC в юникод public static String fromDOStoASCII(byte[] str) { - StringBuilder rez = new StringBuilder(); + StringBuilder rez = new StringBuilder(1024); for(int i=0; i