Kisbetu, nagybetu eliras javitva parentstoryid kezelesben

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java
index dae22abf0ffc90b74d0183d1938959d40849c320..7a34a4dfe09de4c8d5a22f63b86ebfff67cd7609 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java
@@ -150,15 +150,12 @@ public class ImportStatisticsStep extends JobStep {
                        try {\r
                                rundownID = NoSQLUtils.asLong(rundown, IOctopusAPI.ID);\r
                                String name = NoSQLUtils.asString(NoSQLUtils.asDBObject(rundown, IOctopusAPI.RUNDOWN_TYPE), IOctopusAPI.NAME);\r
-                               logger.info(marker, "stage1 {}", name);\r
                                String channel = NoSQLUtils.asString(NoSQLUtils.asDBObject(rundown, IOctopusAPI.CHANNEL), IOctopusAPI.NAME);\r
                                Date scheduledStart = rundown.getDate(IOctopusAPI.SCHEDULED_START);\r
                                String start = CalendarUtils.toString(CalendarUtils.createCalendar(scheduledStart), SCHEDULED_FORMAT);\r
-                               logger.info(marker, "stage2");\r
                                // String rundownName = NoSQLUtils.asString(rundown, IOctopusAPI.NAME);\r
                                rundownName = String.format("%s %s %s", start, name, channel);\r
                                List<DBObject> stories = octopusAPI.getRundownStories(rundownID, createFieldsObject());\r
-                               logger.info(marker, "stage3");\r
                                if (stories != null)\r
                                        result.putAll(processStories(stories, null));\r
                        } catch (Exception e) {\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java
index 0a5e40de4f3691c7532985171c5c9788f410c27d..e01b46136c2b17aa330c616c59ecde2ba6b0c01c 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java
@@ -118,8 +118,7 @@ public class OctopusDataMiner {
                                        references = new BasicDBList();\r
                                        result.put(storyId, references);\r
                                }\r
-                               references\r
-                                               .add(new BasicDBObject(IOctopusAPI.ID, storyFolderId).append(IOctopusAPI.POSITION, position++));\r
+                               references.add(new BasicDBObject(IOctopusAPI.ID, storyFolderId).append(IOctopusAPI.POSITION, position++));\r
                        }\r
                }\r
                return result;\r
@@ -263,7 +262,7 @@ public class OctopusDataMiner {
 \r
        /***\r
         * Get all custom columns label/non-null-value pair as map\r
-        * \r
+        *\r
         * @param story\r
         * @return\r
         */\r
@@ -319,8 +318,7 @@ public class OctopusDataMiner {
                        // logger.info("MOS ID: {}", objId);\r
 \r
                        MetadataType metadataType = MetadataTypeDetector.GuessMetadataType(objId);\r
-                       if (!MetadataType.OctopusPlaceholder.equals(metadataType)\r
-                                       && !MetadataType.OctopusStory.equals(metadataType))\r
+                       if (!MetadataType.OctopusPlaceholder.equals(metadataType) && !MetadataType.OctopusStory.equals(metadataType))\r
                                continue;\r
                        if (result == null)\r
                                result = new BasicDBList();\r
@@ -503,8 +501,7 @@ public class OctopusDataMiner {
                Builder query = query(RUNDOWN, FIELDS_RUNDOWN);\r
                Response response = null;\r
                if (includeArchived) {\r
-                       response = query.post(Entity.entity(new BasicDBObject(FILTER, new BasicDBObject(ARCHIVED, true)).toString(),\r
-                                       MediaType.APPLICATION_JSON));\r
+                       response = query.post(Entity.entity(new BasicDBObject(FILTER, new BasicDBObject(ARCHIVED, true)).toString(), MediaType.APPLICATION_JSON));\r
                } else\r
                        response = query.get();\r
 \r
@@ -669,7 +666,7 @@ public class OctopusDataMiner {
 \r
                BasicDBObject customColumns = getCustomColumns(story);\r
                // logger.info(customColumns.toPrettyString(""));\r
-               String parentStoryId = NoSQLUtils.asString(customColumns, IOctopusAPI.PARENT_STORY_ID);\r
+               String parentStoryId = NoSQLUtils.asString(customColumns, "ParentStoryID");\r
                if (parentStoryId == null) {\r
                        parentStoryId = story.getString(IOctopusAPI.ID);\r
                }\r