Updated AnswerImporter and fixed bug in ConfigDefaults

Author: fquirin

src/main/java/net/b07z/sepia/server/core/data/Language.java

@@ -30,6 +30,10 @@ public enum Language {
 	TR("Turkish", null, "tur"),
 	ZH("Chinese", null, "cmn");
 
+	/**
+	 * Get enum value from language code string (or throw error).
+	 * @param languageCode - e.g. "en" or "DE" (case independent)
+	 */
 	public static Language from(String languageCode) {
 		return Language.valueOf(languageCode.toUpperCase());
 	}

src/main/java/net/b07z/sepia/server/core/database/AnswerImporter.java

@@ -8,19 +8,62 @@
 import net.b07z.sepia.server.core.data.Answer;
 import net.b07z.sepia.server.core.data.Language;
 import net.b07z.sepia.server.core.database.DatabaseInterface;
+import net.b07z.sepia.server.core.tools.Debugger;
+import net.b07z.sepia.server.core.tools.FilesAndStreams;
 
 /**
- * Import answers stored in a file to Elasticsearch.
+ * Import answers stored in a file to database (usually Elasticsearch).
  */
 public class AnswerImporter {
+	
+	//Database
+	DatabaseInterface database;
+	
+	/**
+	 * Construct importer by linking database implementation.
+	 * @param database - {@link DatabaseInterface}
+	 */
+	public AnswerImporter(DatabaseInterface database){
+		this.database = database;
+	}
 
-	public static void run(File file, Language language, DatabaseInterface es, boolean isMachineTranslated) throws IOException {
+	/**
+	 * Run importer for one file. Imports answer for the default system user (usually assistant userId). 
+	 * @param file - file containing answers for one language
+	 * @param language - language of the file
+	 * @param isMachineTranslated - when you are using files that have been translated by a machine
+	 * @throws IOException
+	 */
+	public void run(File file, Language language, boolean isMachineTranslated) throws IOException {
 		List<String> lines = Files.readAllLines(file.toPath());
+		int n = 0;
 		for (String line : lines) {
 			Answer answer = Answer.importAnswerString(line, language, isMachineTranslated);
-			System.out.println(answer);
-			es.setAnyItemData(Answer.ANSWERS_INDEX, Answer.ANSWERS_TYPE, answer.toJson());		
+			//System.out.println(answer);
+			database.setAnyItemData(Answer.ANSWERS_INDEX, Answer.ANSWERS_TYPE, answer.toJson());		
 			//System.out.println(answer.toJsonString());
+			n++;
+		}
+		Debugger.println("Imported answers: " + n, 3);
+	}
+	
+	/**
+	 * Import all files in a folder that follow the format "answers_xy" for the default user (usually assistant userId). 
+	 * where "xy" is a valid language code (e.g. "en" or "de").
+	 * @param pathToFolder - folder with answers
+	 * @param isMachineTranslated - are these answers translated by a machine?
+	 * @throws IOException 
+	 */
+	public void loadFolder(String pathToFolder, boolean isMachineTranslated) throws IOException{
+		List<File> files = FilesAndStreams.directoryToFileList(pathToFolder, null, false);
+		for (File f : files){
+			String fileName = f.getName();
+			if (fileName.matches("answers_\\w\\w(\\..*|$)")){
+				String languageCode = fileName.replaceFirst("answers_(\\w\\w).*", "$1");
+				Language lang = Language.from(languageCode); 	//makes sure that the value is valid
+				Debugger.println("Importing answers from file '" + fileName + "' for language: " + lang.toValue(), 3);
+				run(f, lang, isMachineTranslated);
+			}
 		}
 	}
 

src/main/java/net/b07z/sepia/server/core/server/ConfigDefaults.java

@@ -93,6 +93,11 @@ public static JSONObject getAssistantClusterData(){
 			Debugger.println("Could not reach AssistAPI at " + defaultAssistAPI, 1);
 			return null;
 		}
+		String resultState = JSON.getString(res, "result");
+		if (resultState == null || !resultState.equals("success")){
+			Debugger.println("AssistAPI answered with error: " + JSON.getString(res, "error"), 1);
+			return null;
+		}
 		return res;
 	}
 }

src/main/java/net/b07z/sepia/server/core/server/SparkJavaFw.java

@@ -59,7 +59,7 @@ public static void handleError(){
 			JSON.add(result, "result", "fail");
 			JSON.add(result, "error", "500 internal error");
 			JSON.add(result, "info", ex.getMessage());
-			response.body(returnResult(request, response, result.toJSONString(), 200)); 	//code 500 always creates client timeout :/
+			response.body(returnResult(request, response, result.toJSONString(), 200)); 	//code 500 always creates client timeout :/ TODO: check again
 		});
 	}
 
@@ -131,7 +131,7 @@ public static String returnNoAccess(Request request, Response response){
 		return "401 Unauthorized";
 		*/
 		String msg = "{\"result\":\"fail\",\"error\":\"401 not authorized\"}";
-		return returnResult(request, response, msg, 200);
+		return returnResult(request, response, msg, 200); 		//TODO: we should change this code to 401 as well
 	}
 
 	/**
@@ -142,7 +142,7 @@ public static String returnNoAccess(Request request, Response response, int erro
 			return returnNoAccess(request, response);
 		}else{
 			String msg = "{\"result\":\"fail\",\"error\":\"400 or 500 bad request or communication error\",\"code\":\"" + errorCode + "\"}";
-			return returnResult(request, response, msg, 200);
+			return returnResult(request, response, msg, 200); 		//TODO: we should change this code to 400/500 as well
 		}
 	}
 

src/main/java/net/b07z/sepia/server/core/tools/FilesAndStreams.java

@@ -44,7 +44,7 @@ public static String getStringFromStream(InputStream stream) {
 	/**
 	 * Get an ArrayList of "File"s from a directory path.
 	 * @param directoryName - path to directory
-	 * @param files - ArrayList of files to populate
+	 * @param files - ArrayList of files to populate (or null -> creates ArrayList)
 	 * @param doSubfolders - include sub-folders?
 	 * @return list or null
 	 */