git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Sun, 5 Nov 2017 20:24:00 +0000 (20:24 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Sun, 5 Nov 2017 20:24:00 +0000 (20:24 +0000)
13 files changed:
client/Maestro/Configuration/configuration-nexio-ingest.json
client/Maestro/MaestroForm.Designer.cs
client/Maestro/MaestroForm.Metadata.cs
client/Maestro/Program.cs
client/Maestro/Properties/AssemblyInfo.cs
client/Maestro/Resources/installforge-installer-project.ifp
client/Maestro/Targets/FXPTargetProcessor.cs
client/OctopusClient/OctopusAPI.cs
client/OctopusClient/OctopusIDSelector.cs
client/PlanAIRClient/TrafficIDSelector.cs
client/PlanAIRClient/Workers/MaterialWorker.cs
server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java

index 596cbe60d3e6f39cb25563b5af1e9f32d845c81a..b3bd70bfa81cd87f50fb7e9834fda247b6d080aa 100644 (file)
@@ -1,6 +1,6 @@
 {\r
   "title": "NEXIO betöltő",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "player": {\r
index 546aa09db607ee987950731d4f98a33d8cf336af..0e5d6e6b9e8f4655e1669bf946937d3ebb1d3247 100644 (file)
@@ -84,12 +84,10 @@ namespace Maestro {
             this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components);\r
             this.tabPage2 = new System.Windows.Forms.TabPage();\r
             this.dataGridMessages = new System.Windows.Forms.DataGridView();\r
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.timeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.messageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.groupSource.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.dataGridSource)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();\r
@@ -732,9 +730,7 @@ namespace Maestro {
             this.dataGridMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dataGridMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.dataGridViewTextBoxColumn1,\r
-            this.dataGridViewTextBoxColumn2,\r
-            this.timeDataGridViewTextBoxColumn,\r
-            this.messageDataGridViewTextBoxColumn});\r
+            this.dataGridViewTextBoxColumn2});\r
             this.dataGridMessages.DataSource = this.systemMessageBindingSource;\r
             dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
             dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window;\r
@@ -768,6 +764,14 @@ namespace Maestro {
             this.dataGridMessages.Size = new System.Drawing.Size(988, 92);\r
             this.dataGridMessages.TabIndex = 1;\r
             // \r
+            // systemMessageBindingSource\r
+            // \r
+            this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage);\r
+            // \r
+            // metadataInfoBindingSource\r
+            // \r
+            this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo);\r
+            // \r
             // dataGridViewTextBoxColumn1\r
             // \r
             this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
@@ -787,30 +791,6 @@ namespace Maestro {
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";\r
             this.dataGridViewTextBoxColumn2.ReadOnly = true;\r
             // \r
-            // timeDataGridViewTextBoxColumn\r
-            // \r
-            this.timeDataGridViewTextBoxColumn.DataPropertyName = "Time";\r
-            this.timeDataGridViewTextBoxColumn.HeaderText = "Time";\r
-            this.timeDataGridViewTextBoxColumn.Name = "timeDataGridViewTextBoxColumn";\r
-            this.timeDataGridViewTextBoxColumn.ReadOnly = true;\r
-            this.timeDataGridViewTextBoxColumn.Width = 60;\r
-            // \r
-            // messageDataGridViewTextBoxColumn\r
-            // \r
-            this.messageDataGridViewTextBoxColumn.DataPropertyName = "Message";\r
-            this.messageDataGridViewTextBoxColumn.HeaderText = "Message";\r
-            this.messageDataGridViewTextBoxColumn.Name = "messageDataGridViewTextBoxColumn";\r
-            this.messageDataGridViewTextBoxColumn.ReadOnly = true;\r
-            this.messageDataGridViewTextBoxColumn.Width = 83;\r
-            // \r
-            // systemMessageBindingSource\r
-            // \r
-            this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage);\r
-            // \r
-            // metadataInfoBindingSource\r
-            // \r
-            this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo);\r
-            // \r
             // MaestroForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -904,8 +884,6 @@ namespace Maestro {
         private System.Windows.Forms.BindingSource systemMessageBindingSource;\r
         private System.Windows.Forms.Label lbSourceTitle;\r
         private System.Windows.Forms.DataGridView dataGridMessages;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;\r
         private System.Windows.Forms.DataGridViewTextBoxColumn columnLabel;\r
         private System.Windows.Forms.DataGridViewTextBoxColumn columnID;\r
         private Commons.DataGridViewProgressColumn Progress;\r
@@ -915,8 +893,8 @@ namespace Maestro {
         private System.Windows.Forms.DataGridViewTextBoxColumn columnInput;\r
         private System.Windows.Forms.DataGridViewTextBoxColumn columnOutput;\r
         private System.Windows.Forms.DataGridViewTextBoxColumn columnKillDate;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn timeDataGridViewTextBoxColumn;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn messageDataGridViewTextBoxColumn;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;\r
     }\r
 }\r
 \r
index 5e74d6efb0626aee08d0b675cfb4be11a5d21982..0606f55585d96c1ed82cbd0f3138ae5f24ed5b96 100644 (file)
@@ -144,7 +144,8 @@ namespace Maestro {
                 segments = null;\r
                 return;\r
             }\r
-\r
+            if (segments != null)\r
+                segments.Clear();\r
             foreach (MovieSegment actual in movieSegments) {\r
                 Segment actualSegment = segmentConverter.ConvertToSegment(actual);\r
                 if (segments == null)\r
index 676ae4fac0a4281890b97917f6b03ca9734b1381..784c5681b75d9e36dc1dc2b8be5219ebf994c3ca 100644 (file)
@@ -119,9 +119,11 @@ namespace Maestro {
             if (String.IsNullOrEmpty(replacementHost))\r
                 return;\r
             var mediaCubeProvider = config.GetMetadataProvider<MediaCubeMetadata>();\r
-            mediaCubeProvider.Server.Address = replaceAuthority(replacementHost, mediaCubeProvider.Server.Address);\r
+            if (mediaCubeProvider != null)\r
+                mediaCubeProvider.Server.Address = replaceAuthority(replacementHost, mediaCubeProvider.Server.Address);\r
             var octopusProvider = config.GetMetadataProvider<OctopusMetadata>();\r
-            octopusProvider.Server.Address = replaceAuthority(replacementHost, octopusProvider.Server.Address);\r
+            if (octopusProvider != null)\r
+                octopusProvider.Server.Address = replaceAuthority(replacementHost, octopusProvider.Server.Address);\r
             if (config.Source is NEXIOSource)\r
                 config.Source.Local.Address = replaceAuthority(replacementHost, config.Source.Local.Address);\r
         }\r
index 08ceaa4d9e78d15020e7d97dc1f4fcc22000cb75..5ff6cda989aafd128bb2a990a96d4abdd3ce759e 100644 (file)
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.9.4.0")]\r
-[assembly: AssemblyFileVersion("1.9.4.0")]\r
+[assembly: AssemblyVersion("1.9.4.2")]\r
+[assembly: AssemblyFileVersion("1.9.4.2")]\r
index 9115e9bd1312bb5206178f96b77eb1069fbe3b14..dd18bcad46c80b80f2098aae6614a7c2005a6b90 100644 (file)
Binary files a/client/Maestro/Resources/installforge-installer-project.ifp and b/client/Maestro/Resources/installforge-installer-project.ifp differ
index bc1e62dc8e21cb8f1d7935e8da8b958e28c417fe..1625b07da4fb4ddb0957de2dd5c5cb7430383e1f 100644 (file)
@@ -29,7 +29,8 @@ namespace Maestro.Targets {
             try {\r
                 sourceFTP = CreateClient(sourceConfig.Remote);\r
 \r
-                long ilength = sourceFTP.GetFileSize(inputUri.AbsolutePath);\r
+                string input = inputUri.AbsolutePath.Replace("%20", " ");\r
+                long ilength = sourceFTP.GetFileSize(input);\r
                 if (parameters.TargetConfig.NexioServer)\r
                     ilength = ilength / 2;\r
 \r
@@ -50,7 +51,6 @@ namespace Maestro.Targets {
                 if (!sourceReplyTYPE.Success)\r
                     throw new Exception(sourceReplyTYPE.ErrorMessage);\r
 \r
-                string input = inputUri.AbsolutePath;\r
                 if (input.LastIndexOf("/") == 0)\r
                     input = input.Replace("/", "");\r
                 FtpReply replyRETR = sourceFTP.Execute("RETR " + input);\r
index 7e4f8eaac670827d761a040d282fdf4d54c08e89..2c73ff1bf64f5abf45507ed902b59454d242465b 100644 (file)
@@ -87,9 +87,10 @@ namespace OctopusClient {
 \r
         public IEnumerable<Rundown> GetRundowns(DateTime scheduledDate) {\r
             IEnumerable<Rundown> result = null;\r
+            logger.Debug("GetRundowns");\r
             try {\r
                 var request = new RestRequest("rundowns/{scheduledDate}", Method.GET);\r
-                var dt = scheduledDate.ToUniversalTime().ToString("s", CultureInfo.InvariantCulture);\r
+                var dt = scheduledDate.ToString("s", CultureInfo.CurrentCulture);\r
                 request.AddParameter("scheduledDate", dt, ParameterType.UrlSegment);\r
                 var response = client.Execute<JsonArray>(request);\r
                 if (response.ContentLength == 0) {\r
index abf2ab5fce3a48523cc2ce452e626593cda49d42..9b9718d1dc5f104f80a449ab0257fe5a0196cbb7 100644 (file)
@@ -112,7 +112,7 @@ namespace OctopusClient {
             Cursor.Current = Cursors.WaitCursor;\r
             IEnumerable<Rundown> rundowns = client.GetRundowns(dateScheduled.Value.Date)?.ToArray();\r
             if (rundowns == null) {\r
-                bindingRundown.DataSource = null;\r
+                //bindingRundown.DataSource = null;\r
                 Cursor.Current = Cursors.Default;\r
                 return;\r
             }\r
index 921d8aa58001d7e5c77edd8578c74c6bcf0eeb43..01eb58e9a14a56cc89ca14649666dc4fc833d8d5 100644 (file)
@@ -95,8 +95,10 @@ namespace TrafficClient {
             TrafficItem res = actualRow.DataBoundItem as TrafficItem;\r
             if (String.IsNullOrEmpty(res.MediaID)) {\r
                 TrafficVersion v = trafficAPI.CreateMaterialVersion(res.EpisodeID);\r
-                res.MediaID = v.MediaID;\r
-                res.VariantID = v.VariantID;\r
+                if (v != null) {\r
+                    res.MediaID = v.MediaID;\r
+                    res.VariantID = v.VariantID;\r
+                }\r
                 if (res.VariantID == 0 || String.IsNullOrEmpty(res.MediaID))\r
                     return;\r
             }\r
index 01732efc7c073ceb88a221685ddf31e7e33762b5..7a44a3ad40cc5123729ec533c6b6a84f16df31ac 100644 (file)
@@ -28,7 +28,7 @@ namespace TrafficClient.Workers {
                 NextBroadcastDate = data.v_NextBroadcastDate,\r
                 FirstBroadcastDate = data.v_FirstBroadcastDate,\r
                 EpisodeID = data.v_EpisodeID,\r
-                OK = data.v_OkForAir != null && "OK".Equals(data.v_OkForAir)\r
+                OK = data.v_OkForAir != null && true.Equals(data.v_OkForAir)\r
             };\r
         }\r
 \r
@@ -153,7 +153,8 @@ namespace TrafficClient.Workers {
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1100);\r
                     cmd.Parameters.AddWithValue("@@ItemID", itemID);\r
-                    cmd.Parameters.AddWithValue("@@@Options", options);\r
+                    cmd.Parameters.AddWithValue("@@@Options", DBNull.Value);\r
+                    cmd.Parameters.AddWithValue("@@IntParam1", options);\r
                     cmd.ExecuteNonQuery();\r
                 }\r
             }\r
index 53807a4215f05ae66675e8543e3987f0da6e95de..cc492eccc47c0fde34025ec6955ed253049bca36 100644 (file)
                                        <parameter name="mediaCubeMedia" />\r
                                </input>\r
                                <input>\r
-                                       <parameter name="targetPath" />\r
+                                       <variable name="targetPath" />\r
                                </input>\r
                                <input>\r
-                                       <parameter name="targetNamePattern" />\r
+                                       <variable name="targetNamePattern" />\r
                                </input>\r
                                <input>\r
                                        <parameter name="successRecipient" />\r
index 2db2f3c98e7f2b8da25e89661be0080e71952991..3d04d264a43a1b91e58a5037337b2d80fa88ae35 100644 (file)
@@ -29,18 +29,41 @@ public class OctopusRESTService {
                logger.info("Created");
        }
 
+       private Response createErrorResponse(Exception e) {
+               return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
+       }
+
        @GET
-       @Path("/test/{id}")
+       @Path("/getMosObjectsByID/{id}")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response test(@PathParam("id") Long jobId) {
+       public Response getMosObjectsByID(@PathParam("id") String id) {
+               logger.trace("Entry");
                Response result = null;
                try {
-                       String json = "{valami: " + jobId + " }";
-                       result = Response.ok(json).build();
+                       List<DBObject> mosObjects = octopusService.getMosObjectsByID(id);
+                       result = Response.ok(mosObjects).build();
                } catch (Exception e) {
-                       result = Response.serverError().build();
+                       result = createErrorResponse(e);
                }
+               logger.trace("Exit");
+               return result;
+       }
+
+       @GET
+       @Path("/getRundownByStoryID/{id}")
+       @Consumes({ MediaType.APPLICATION_JSON })
+       @Produces({ MediaType.APPLICATION_JSON })
+       public Response getRundownByStoryID(@PathParam("id") String id) {
+               logger.trace("Entry");
+               Response result = null;
+               try {
+                       List<DBObject> rundowns = octopusService.getRundownByStoryID(Long.parseLong(id));
+                       result = Response.ok(rundowns).build();
+               } catch (Exception e) {
+                       result = createErrorResponse(e);
+               }
+               logger.trace("Exit");
                return result;
        }
 
@@ -57,7 +80,7 @@ public class OctopusRESTService {
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
        public Response getRundowns(@PathParam("scheduledDate") String scheduledDate) {
-               logger.trace("Entry");
+               logger.info("Entry {}", scheduledDate);
                Response result = null;
                try {
                        Date calendar = null;
@@ -77,15 +100,15 @@ public class OctopusRESTService {
        }
 
        @GET
-       @Path("/storyfolders")
+       @Path("/getRundownsByPlaceHolderId/{id}")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response getStoryFolders() {
+       public Response getRundownsByPlaceHolderId(@PathParam("id") String id) {
                logger.trace("Entry");
                Response result = null;
                try {
-                       List<DBObject> storyFolders = octopusService.getStoryFolders();
-                       result = Response.ok(storyFolders).build();
+                       List<DBObject> rundowns = octopusService.getRundownsByPlaceHolderId(id);
+                       result = Response.ok(rundowns).build();
                } catch (Exception e) {
                        result = createErrorResponse(e);
                }
@@ -93,36 +116,15 @@ public class OctopusRESTService {
                return result;
        }
 
-       private Response createErrorResponse(Exception e) {
-               return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
-       }
-
        @GET
-       @Path("/stories/{rundownID}")
-       @Consumes({ MediaType.APPLICATION_JSON })
-       @Produces({ MediaType.APPLICATION_JSON })
-       public Response getStories(@PathParam("rundownID") long rundownID) {
-               logger.trace("Entry");
-               Response result = null;
-               try {
-                       List<DBObject> stories = octopusService.getStories(rundownID);
-                       result = Response.ok(stories).build();
-               } catch (Exception e) {
-                       result = createErrorResponse(e);
-               }
-               logger.trace("Exit");
-               return result;
-       }
-       
-       @GET
-       @Path("/storiesByStoryFolderID/{storyFolderID}")
+       @Path("/stories/")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response getStoriesByStoryFolderId(@PathParam("storyFolderID") long storyFolderID) {
+       public Response getStories() {
                logger.trace("Entry");
                Response result = null;
                try {
-                       List<DBObject> stories = octopusService.getStoriesByStoryFolderId(storyFolderID);
+                       List<DBObject> stories = octopusService.getStories();
                        result = Response.ok(stories).build();
                } catch (Exception e) {
                        result = createErrorResponse(e);
@@ -130,16 +132,16 @@ public class OctopusRESTService {
                logger.trace("Exit");
                return result;
        }
-       
+
        @GET
-       @Path("/stories/")
+       @Path("/stories/{rundownID}")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response getStories() {
+       public Response getStories(@PathParam("rundownID") long rundownID) {
                logger.trace("Entry");
                Response result = null;
                try {
-                       List<DBObject> stories = octopusService.getStories();
+                       List<DBObject> stories = octopusService.getStories(rundownID);
                        result = Response.ok(stories).build();
                } catch (Exception e) {
                        result = createErrorResponse(e);
@@ -147,7 +149,7 @@ public class OctopusRESTService {
                logger.trace("Exit");
                return result;
        }
-       
+
        @GET
        @Path("/getStoriesByIDRegex/{id}")
        @Consumes({ MediaType.APPLICATION_JSON })
@@ -164,84 +166,84 @@ public class OctopusRESTService {
                logger.trace("Exit");
                return result;
        }
-       
+
        @GET
-       @Path("/getMosObjectsByID/{id}")
+       @Path("/getStoriesByPlaceHolderId/{id}")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response getMosObjectsByID(@PathParam("id") String id) {
+       public Response getStoriesByPlaceHolderId(@PathParam("id") String id) {
                logger.trace("Entry");
                Response result = null;
                try {
-                       List<DBObject> mosObjects = octopusService.getMosObjectsByID(id);
-                       result = Response.ok(mosObjects).build();
+                       List<DBObject> stories = octopusService.getStoriesByPlaceHolderId(id);
+                       result = Response.ok(stories).build();
                } catch (Exception e) {
                        result = createErrorResponse(e);
                }
                logger.trace("Exit");
                return result;
        }
-       
+
        @GET
-       @Path("/getStoryFolders/{id}")
+       @Path("/storiesByStoryFolderID/{storyFolderID}")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response getStoryFoldersByStoryID(@PathParam("id") String id) {
+       public Response getStoriesByStoryFolderId(@PathParam("storyFolderID") long storyFolderID) {
                logger.trace("Entry");
                Response result = null;
                try {
-                       List<DBObject> storyFolders = octopusService.getStoryFolders(Long.parseLong(id));
-                       result = Response.ok(storyFolders).build();
+                       List<DBObject> stories = octopusService.getStoriesByStoryFolderId(storyFolderID);
+                       result = Response.ok(stories).build();
                } catch (Exception e) {
                        result = createErrorResponse(e);
                }
                logger.trace("Exit");
                return result;
        }
-       
+
        @GET
-       @Path("/getRundownByStoryID/{id}")
+       @Path("/storyfolders")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response getRundownByStoryID(@PathParam("id") String id) {
+       public Response getStoryFolders() {
                logger.trace("Entry");
                Response result = null;
                try {
-                       List<DBObject> rundowns = octopusService.getRundownByStoryID(Long.parseLong(id));
-                       result = Response.ok(rundowns).build();
+                       List<DBObject> storyFolders = octopusService.getStoryFolders();
+                       result = Response.ok(storyFolders).build();
                } catch (Exception e) {
                        result = createErrorResponse(e);
                }
                logger.trace("Exit");
                return result;
        }
-       
+
        @GET
-       @Path("/getRundownsByPlaceHolderId/{id}")
+       @Path("/getStoryFoldersByPlaceHolderId/{id}")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response getRundownsByPlaceHolderId(@PathParam("id") String id) {
+       public Response getStoryFoldersByPlaceHolderId(@PathParam("id") String id) {
                logger.trace("Entry");
                Response result = null;
                try {
-                       List<DBObject> rundowns = octopusService.getRundownsByPlaceHolderId(id);
-                       result = Response.ok(rundowns).build();
+                       List<DBObject> storyFolders = octopusService.getStoryFoldersByPlaceHolderId(id);
+                       result = Response.ok(storyFolders).build();
                } catch (Exception e) {
                        result = createErrorResponse(e);
                }
                logger.trace("Exit");
                return result;
        }
-       
+
        @GET
-       @Path("/getStoryFoldersByPlaceHolderId/{id}")
+       @Path("/getStoryFolders/{id}")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response getStoryFoldersByPlaceHolderId(@PathParam("id") String id) {
+       public Response getStoryFoldersByStoryID(@PathParam("id") String id) {
                logger.trace("Entry");
                Response result = null;
                try {
-                       List<DBObject> storyFolders = octopusService.getStoryFoldersByPlaceHolderId(id);
+                       List<DBObject> storyFolders = octopusService.getStoryFolders(Long.parseLong(id));
                        result = Response.ok(storyFolders).build();
                } catch (Exception e) {
                        result = createErrorResponse(e);
@@ -249,21 +251,19 @@ public class OctopusRESTService {
                logger.trace("Exit");
                return result;
        }
-       
+
        @GET
-       @Path("/getStoriesByPlaceHolderId/{id}")
+       @Path("/test/{id}")
        @Consumes({ MediaType.APPLICATION_JSON })
        @Produces({ MediaType.APPLICATION_JSON })
-       public Response getStoriesByPlaceHolderId(@PathParam("id") String id) {
-               logger.trace("Entry");
+       public Response test(@PathParam("id") Long jobId) {
                Response result = null;
                try {
-                       List<DBObject> stories = octopusService.getStoriesByPlaceHolderId(id);
-                       result = Response.ok(stories).build();
+                       String json = "{valami: " + jobId + " }";
+                       result = Response.ok(json).build();
                } catch (Exception e) {
-                       result = createErrorResponse(e);
+                       result = Response.serverError().build();
                }
-               logger.trace("Exit");
                return result;
        }
 }
\ No newline at end of file