Merge pull request #79 from Simon-Initiative/dataset-ld

ldmodel import and dataset creation fix

Author: eliknebel

service.example.envs

@@ -33,4 +33,4 @@ dataset_db=jdbc:mysql://example.edu:3306?user=xxxxxxx&password=xxxxxxxx
 slack_alert_hook=none
 
 # Java runtime options
-JAVA_OPTS=-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Dxml.catalog.ignoreMissing=true -Dxml.catalog.files=/oli/dtd/catalog.xml -Dxml.catalog.verbosity=1 -Dxml.catalog.prefer=public  -Dxml.catalog.staticCatalog=yes -Dxml.catalog.allowPI=yes -Dxml.catalog.className=com.sun.org.apache.xml.internal.resolver.Resolver
+JAVA_OPTS="-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Dxml.catalog.ignoreMissing=true -Dxml.catalog.files=/oli/dtd/catalog.xml -Dxml.catalog.verbosity=1 -Dxml.catalog.prefer=public  -Dxml.catalog.staticCatalog=yes -Dxml.catalog.allowPI=yes -Dxml.catalog.className=com.sun.org.apache.xml.internal.resolver.Resolver"

src/main/java/edu/cmu/oli/content/analytics/DatasetBuilder.java

@@ -37,6 +37,7 @@
 import edu.cmu.oli.content.models.persistance.entities.DatasetStatus;
 import edu.cmu.oli.content.reportingdb.DbConnector;
 
+import org.jboss.ejb3.annotation.TransactionTimeout;
 import org.slf4j.Logger;
 
 import javax.ejb.Stateless;
@@ -53,6 +54,7 @@
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -92,6 +94,7 @@ public class DatasetBuilder {
     /**
      * Handle the request to create a dataset from the frontend API call
      */
+    @TransactionTimeout(unit = TimeUnit.MINUTES, value = 60L)
     public void build(final String datasetGuid) {
         Dataset dataset = findDataset(datasetGuid);
         ContentPackage contentPackage = dataset.getContentPackage();

src/main/java/edu/cmu/oli/content/controllers/LDModelControllerImpl.java

@@ -514,8 +514,37 @@ protected List<String> importLOsSkillsMap(ContentPackage pkg, String fileName, S
             parameters.addProperty("high_mastery", highMastery);
             lo.add("parameters", parameters);
 
+            log.debug("resssee " + new Gson().toJson(resourceById.json));
+
             JsonObject resourceJson = resourceById.json.getAsJsonObject("objectives");
+            if(resourceJson == null && resourceById.json.has("workbook_page")){
+                JsonArray ar = resourceById.json.getAsJsonObject("workbook_page").getAsJsonArray("#array");
+                label: for (JsonElement e : ar) {
+                    JsonObject e1 = (JsonObject) e;
+                    if(e1.has("head")){
+                        JsonArray headArray = e1.getAsJsonObject("head").getAsJsonArray("#array");
+                        for(JsonElement h :headArray){
+                            JsonObject h1 = (JsonObject) h;
+                            if(h1.has("objectives")){
+                                resourceJson = h1.getAsJsonObject("objectives");
+                                break label;
+                            }
+                        }
+                    }
+                }
+            }
+
             JsonArray objectivesAndMappingList = resourceJson.getAsJsonArray("#array");
+            if(objectivesAndMappingList == null){
+                objectivesAndMappingList = new JsonArray();
+                if(resourceJson.has("objective")) {
+                    JsonObject ob = new JsonObject();
+                    ob.add("objective", resourceJson.getAsJsonObject("objective"));
+                    resourceJson.remove("objective");
+                    objectivesAndMappingList.add(ob);
+                    resourceJson.add("#array", objectivesAndMappingList);
+                }
+            }
             JsonObject objSkillsList = null;
             for (JsonElement e : objectivesAndMappingList) {
                 JsonObject e1 = (JsonObject) e;