Merge pull request #392 from hbz/OSU-172

start implementing usage of to.science.core

app/helper/AmbMappingHelper.java

@@ -0,0 +1,63 @@
+/**
+ * 
+ */
+package helper;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+
+import org.json.JSONObject;
+
+import actions.Read;
+import models.Node;
+import to.science.core.modelx.mapper.AmbMapperImpl;
+
+/**
+ * @author aquast
+ *
+ */
+public class AmbMappingHelper {
+
+	AmbMapperImpl ambMapper = new AmbMapperImpl();
+
+	/**
+	 * Get a to.science JSONObject from lrmiData within a specific node
+	 * 
+	 * @param node
+	 * @return
+	 */
+	public JSONObject getJSONObjectFromAmb(Node node) {
+		JSONObject tosModel = new JSONObject();
+
+		Read read = new Read();
+		String currentLrmiContent = read.readLrmiData(node);
+		StringReader ambReader = new StringReader(currentLrmiContent);
+		JSONObject ambObject = parseReader(ambReader);
+		tosModel = ambMapper.getTosJSONObject(ambObject);
+
+		return tosModel;
+	}
+
+	/**
+	 * @param ambReader
+	 * @return
+	 */
+	private JSONObject parseReader(StringReader ambReader) {
+		JSONObject ambJSONObj = new JSONObject();
+
+		try {
+			BufferedReader bReader = new BufferedReader(ambReader);
+			StringBuilder jsonStringBuilder = new StringBuilder();
+
+			String inputStr;
+			while ((inputStr = bReader.readLine()) != null)
+				jsonStringBuilder.append(inputStr);
+			ambJSONObj = new JSONObject(jsonStringBuilder.toString());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return ambJSONObj;
+	}
+
+}

app/helper/LRMIMapper.java

@@ -80,15 +80,19 @@ public String getLrmiAndLrmifyMetadata(Node n, RDFFormat format,
 			/**
 			 * - hole den LRMI-Datenstrom (s. GET /lrmiData)
 			 */
-			String oldContent = read.readLrmiData(node);
+			// get the current lrmiData as String
+			String currentLrmiContent = read.readLrmiData(node);
+			// String currentTosContent = read.
+
 			/**
 			 * - wandele ihn nach JsonObject (s. JsonMapper.getTosciencefyLrmi)
 			 */
 			// LRMI-Daten nach JSONObject wandeln
 			JSONObject lrmiJsonContent = new JSONObject();
-			if (oldContent != null) {
-				lrmiJsonContent = new JSONObject(oldContent);
+			if (currentLrmiContent != null) {
+				lrmiJsonContent = new JSONObject(currentLrmiContent);
 			}
+
 			JSONArray arr = null;
 			JSONObject obj = null;
 			JSONObject subObj = null;

build.sbt

@@ -45,7 +45,8 @@ libraryDependencies ++= Seq(
   "com.fasterxml.jackson.dataformat" %"jackson-dataformat-xml" %"2.6.3",
   "javax.mail" % "mail" % "1.4.2",
   "org.apache.lucene" % "lucene-core" % "4.7.2",  
-  "mysql" % "mysql-connector-java" % "8.0.23"
+  "mysql" % "mysql-connector-java" % "8.0.23",
+  "io.github.hbz" % "to.science.core" % "1.1.3"
 )
 
 val root = (project in file(".")).enablePlugins(PlayJava, PlayEbean)