Revize c670fa2f

re #7963 DB communication repaired, tested.
html structures removed

.gitignore

@@ -6 +6 @@
 project/json.txt
 project/app.config
 project/Deserializer/.classpath
+project/jdeserialize_out.txt
+project/jdeserialize_err.txt

project/Deserializer/src/CLI.java

@@ -170 +170 @@
 	}
 
 	@Override
-	public void completed(String html, String json, String loaded) {
+	public void completed(String json, String loaded) {
 		if (json != null) {
 			System.out.println("Deserialization completed.");
 			saveJson(json);

project/Deserializer/src/Converter.java

@@ -90 +90 @@
 				continue;
 			}
 			
-			StringBuilder html = new StringBuilder();
 			StringBuilder json = new StringBuilder();
 			
 			boolean error = false;
@@ -99 +98 @@
 				System.setOut(FileWorker.createRedirectStream(false));
 				System.setErr(FileWorker.createRedirectStream(true));
 				System.out.println("--- jdeserialize begins ---".toUpperCase());
-				convert(array, html, json);
+				convert(array, json);
 			} catch (Exception e) {
 				e.printStackTrace();
 				error = true;
@@ -110 +109 @@
 				System.setErr(new PrintStream(new FileOutputStream(FileDescriptor.err)));
 				System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
 			}
-
-			//test file output
-			try {
-				BufferedWriter writer = new BufferedWriter(new FileWriter("html.txt"));
-				writer.write(html.toString().replace("<br/>", "\n")); // TODO pridan replace pro odsazovani - lepsi orientace v souboru.
-				writer.close();
-
-				BufferedWriter writer2 = new BufferedWriter(new FileWriter("json.txt"));
-				writer2.write(json.toString());
-				writer2.close();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			//test file output
 			
-			ui.completed(error ? null : html.toString(), error ? null : json.toString(), array == null ? null : new String(array));
+			ui.completed(error ? null : json.toString(), array == null ? null : new String(array));
 		}
 	}
 
@@ -141 +125 @@
 		return array;
 	}
 	
-	private void convert(byte[] buffer, StringBuilder html, StringBuilder json) throws Exception {
+	private void convert(byte[] buffer, StringBuilder json) throws Exception {
 		jdeserialize deserializer = new jdeserialize(buffer);
 
 		// gets the "contents" into an array - returnes the deserialization of all
@@ -151 +135 @@
 		for (content cnt : cntnts) {
 			if (cnt != null) {
 				json.append(cnt.toJson("", null, false)).append("\n");
-				html.append(cnt.toJson("", null, false));
 			}
 		}
 	}

project/Deserializer/src/Editor.java

@@ -75 +75 @@
 		return json;
 	}
 	
-	public void setContent(String html, String json) {
+	public void setContent(String json) {
 		this.json = json;
 		editor.call("setValue", "");
 		editor.call("insert", json);

project/Deserializer/src/IConversionResults.java

@@ -2 +2 @@
 public interface IConversionResults {
 
 	public void loadingInputFileError();
-	public void completed(String html, String json, String loaded);
+	public void completed(String json, String loaded);
 	
 }

project/Deserializer/src/Window.java

@@ -406 +406 @@
 	}
 
 	@Override
-	public void completed(String html, String json, String loaded) {
+	public void completed(String json, String loaded) {
 		Platform.runLater(() -> {
-			String _html = html; String _json = json;
+			String _json = json;
 			
-			boolean showData = html != null && json != null;
+			boolean showData = json != null;
 			
 			if (!showData && loaded != null &&
 					Report.confirm("Výsledek deserializace", null, "Při deserializaci došlo k chybě. "
 							+ "Je ale možné, že nejde o serializovaná data. Chcete zobrazit, co bylo načteno?")) {
-				_html = loaded.trim();
-				_json = _html;
+
+				_json = loaded.trim();
 				showData = true;
 			}
 			
 			if (showData) {
-				editor.setContent(_html, _json);
+				editor.setContent(_json);
 				setOutputLayoutDisabled(false);
 			}
         });

project/Deserializer/src/io/Database.java

@@ -23 +23 @@
 
 		public DB_Messenger(String driver, String url, String user, String password, String table, String condition, String column) {
 			this.driver = driver;
-			this.url = url;
+			//The timezone statement added due to MySQL DB. Is it OK with MsSQL and Oracle?
+			this.url = url + "?useTimezone=true&serverTimezone=UTC";
 			this.user = user;
 			this.password = password;
-			this.sql = "SELECT " + column + " FROM " + table + " WHERE " + condition + ";";
+
+			this.sql = "SELECT " + column + " FROM " + table;
+			if(condition.length() > 0)
+			{
+				this.sql += " WHERE " + condition;
+			}
+			this.sql += ";";
+
 			this.column = column;
 		}
 		
@@ -49 +57 @@
 			//DriverManager.registerDriver(new com.microsoft.sqlserver.jdbc.SQLServerDriver());
 
 			System.out.println("--- Connecting to the database ---".toUpperCase());
+
 			conn = DriverManager.getConnection(crate.url, crate.user, crate.password);
 
 			System.out.println("--- Executing the query ---".toUpperCase());