git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java
index c94baa3ba0ee1e39cc0698d4baef4157c2ccae5e..ab01b3e22b09aa45e8a14ae96f336d72e13f6146 100644 (file)
--- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java
@@ -21,14 +21,28 @@ public class OctopusTests {
                String pwd = SystemConfiguration.getInstance().value("services.octopus.api.password");\r
 \r
                sut = new OctopusDataMiner(address, user, pwd);\r
-               List<BasicDBObject> rundowns = NoSQLUtils.asList(sut.queryRundowns());\r
-               rundowns.forEach(r -> processRundown(r));\r
+\r
+               List<BasicDBObject> folders = NoSQLUtils.asList(sut.queryStoryFolders());\r
+               folders.forEach(f -> processFolders(f));\r
+\r
+//             List<BasicDBObject> rundowns = NoSQLUtils.asList(sut.queryRundowns());\r
+//             rundowns.forEach(r -> processRundown(r));\r
+       }\r
+\r
+       private void processFolders(BasicDBObject f) {\r
+               String folderId = f.getString(IOctopusAPI.ID);\r
+               String folderName = f.getString(IOctopusAPI.NAME);\r
+               System.out.println(folderId + " - " + folderName);\r
+\r
+               BasicDBObject folderStories = sut.queryStoryFolder(f, OctopusDataMiner.FIELDS_STORYFOLDER_STORYIDS);\r
+               List<BasicDBObject> stories = NoSQLUtils.asList(folderStories, IOctopusAPI.STORIES);\r
+               stories.forEach(s -> processStory(s.getLong(IOctopusAPI.ID)));\r
+\r
        }\r
 \r
        private void processRundown(BasicDBObject r) {\r
-               // NoSQLUtils.asString(r, null))\r
                String rundownId = r.getString(IOctopusAPI.ID);\r
-               Object rundownName = r.get(IOctopusAPI.NAME);\r
+               String rundownName = r.getString(IOctopusAPI.NAME);\r
                System.out.println(rundownId + " - " + rundownName);\r
 \r
                List<BasicDBObject> slugs = NoSQLUtils.asList(sut.queryRundown(r, OctopusDataMiner.FIELDS_RUNDOWN_STORYIDS),\r
@@ -39,11 +53,20 @@ public class OctopusTests {
 \r
        private void processSlug(BasicDBObject s) {\r
                long storyId = s.getLong(IOctopusAPI.STORYID);\r
+               processStory(storyId);\r
+       }\r
+\r
+       private void processStory(long storyId) {\r
                BasicDBObject story = sut.queryStory(storyId);\r
                sut.normalizeStory(story);\r
                String location = story.getString(IOctopusAPI.LOCATION);\r
                if (location != null)\r
                        System.out.println(story.toPrettyString(""));\r
+\r
+               String desc = story.getString(IOctopusAPI.DESCRIPTIONS);\r
+               if (desc != null)\r
+                       System.out.println(story.toPrettyString(""));\r
+\r
        }\r
 \r
 }\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 32f61ec89019553fb891456654b7ac93ae5f300a..6d2b375436f0392485b5a474e9b640d8f34dc268 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
@@ -51,7 +51,7 @@ public class OctopusDataMiner {
        public static final String FIELDS_RUNDOWN_STORYIDS = "id,slugs,Slug.storyId,Slug.position";\r
        public static final String SLUGS = "slugs";\r
        private static final String FIELDS_STORYFOLDER = "id,name,modified";\r
-       private static final String FIELDS_STORYFOLDER_STORYIDS = "id,stories,Story.id";\r
+       public static final String FIELDS_STORYFOLDER_STORYIDS = "id,stories,Story.id";\r
        private static final String RUNDOWN = "Rundown";\r
        private static final String FIELDS = "fields";\r
        private static final String EXIT = "Exit";\r
@@ -530,7 +530,7 @@ public class OctopusDataMiner {
                return result;\r
        }\r
 \r
-       private BasicDBObject queryStoryFolder(BasicDBObject storyFolder, String fields) {\r
+       public BasicDBObject queryStoryFolder(BasicDBObject storyFolder, String fields) {\r
                logger.trace(ENTER);\r
                BasicDBObject result = null;\r
                long id = NoSQLUtils.asLong(storyFolder, IOctopusAPI.ID);\r
@@ -545,7 +545,7 @@ public class OctopusDataMiner {
                return result;\r
        }\r
 \r
-       private BasicDBList queryStoryFolders() {\r
+       public BasicDBList queryStoryFolders() {\r
                logger.trace(ENTER);\r
                BasicDBList result = null;\r
                Response response = query(STORY_FOLDER, FIELDS_STORYFOLDER).get();\r
@@ -668,11 +668,9 @@ public class OctopusDataMiner {
                        story.put(IOctopusAPI.MOS_OBJECTS, modifiedMOS);\r
 \r
                BasicDBObject customColumns = getCustomColumns(story);\r
-               logger.info(customColumns.toPrettyString(""));\r
+               // logger.info(customColumns.toPrettyString(""));\r
                String parentStoryId = NoSQLUtils.asString(customColumns, IOctopusAPI.PARENT_STORY_ID);\r
                if (parentStoryId == null) {\r
-                       // logger.warn("Missing {} in story", IOctopusAPI.PARENT_STORY_ID,\r
-                       // story.toPrettyString(null));\r
                        parentStoryId = story.getString(IOctopusAPI.ID);\r
                }\r
                story.append(IOctopusAPI.PARENT_STORY_ID, parentStoryId);\r