Revize a5557143

re #7967

Napraveny chyby až na komunikaci s DB - to je v jiném úkolu.

project/Deserializer/src/Converter.java

@@ -5 +5 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -83 +82 @@
 				continue;
 			}
 
-			byte array[] = inputFile.get() != null ? getBytes(inputFile.get()) : getBytes(query.get());
+			byte array[] = getBytes(inputFile.get(), query.get());
 			StringBuilder html = new StringBuilder();
 			StringBuilder json = new StringBuilder();
 			
@@ -117 +116 @@
 		}
 	}
 
-	private byte[] getBytes(File input) {
+	private byte[] getBytes(File file, DB_Messenger query) {
 		byte array[];
 		try {
-			array = FileWorker.loadByteArray(input);
+			if (file != null) {
+				array = FileWorker.loadFileContent(file);
+			} else {
+				array = Database.getBlobBytes(query);
+			}
+			array = FileWorker.unzipFile(array);
 		} catch (IOException e) {
+			e.printStackTrace();
 			ui.loadingInputFileError();
 			return null;
 		}
 		return array;
 	}
 	
-	private byte[] getBytes(DB_Messenger query) {
-		return Database.getBlobBytes(query);
-	}
-
 	private void convert(byte[] buffer, StringBuilder html, StringBuilder json) throws Exception {
 		jdeserialize deserializer = new jdeserialize(buffer);