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

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java
index 50a32812bb7e869c02795834afaf81165c881fa3..05553a5631e6ed958cc1be7686fb56c6d9927b4e 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java
@@ -34,90 +34,95 @@ import user.jobengine.db.IStatementDecorator;
 \r
 public class PlanAirExtensions {\r
        private static final Logger logger = LogManager.getLogger();\r
-       //      @Operation int, @@@Options int, @@ItemID int, @@IntParam1 int=Null, @@IntParam2 int=Null, @@IntParam3 int=Null,\r
-       //                      @@StrParam1 varchar(200)=Null, @@StrParam2 varchar(max)=Null, @@DateParam1 datetime=Null, @@DateParam2 datetime=Null\r
-       private static final String MATERIAL_SQL = "{call dbo.clIFsp_EC_MAM(1002, Null, Null, Null, Null, Null, ?)}";//musorid\r
-       //    item.v_ProgrammeID = (int)ReadInt(reader, ref f);\r
-       //    item.v_Live = (bool)ReadBool(reader, ref f);\r
-       //    item.v_EpisodeID = ReadString(reader, ref f);\r
-       //    item.v_VariantID = ReadInt(reader, ref f);\r
-       //    item.v_MediaID = ReadString(reader, ref f);\r
-       //    item.v_VariantTypeID = ReadInt(reader, ref f);\r
-       //    item.v_ProgTitle = ReadString(reader, ref f);\r
-       //    item.v_EpTitle = ReadString(reader, ref f);\r
-       //    item.v_Episode = ReadShort(reader, ref f);\r
-       //    item.v_VariantType = ReadString(reader, ref f);\r
-       //    item.v_VariantKeywords = ReadString(reader, ref f);\r
-       //    item.v_VariantLengthTC = ReadString(reader, ref f);\r
-       //    item.v_VariantLengthFrame = ReadInt(reader, ref f);\r
-       //    item.v_VariantNrSegments = ReadInt(reader, ref f);\r
-       //    item.v_FirstBroadcastDate = ReadDateTime(reader, ref f);\r
-       //    item.v_NextBroadcastDate = ReadDateTime(reader, ref f);\r
-       //    item.v_OkForAir = ReadBool(reader, ref f);\r
-       //    item.v_ForTransm = ReadBool(reader, ref f);\r
+       // @Operation int, @@@Options int, @@ItemID int, @@IntParam1 int=Null,\r
+       // @@IntParam2 int=Null, @@IntParam3 int=Null,\r
+       // @@StrParam1 varchar(200)=Null, @@StrParam2 varchar(max)=Null, @@DateParam1\r
+       // datetime=Null, @@DateParam2 datetime=Null\r
+       private static final String MATERIAL_SQL = "{call dbo.clIFsp_EC_MAM(1002, Null, Null, Null, Null, Null, ?)}";// musorid\r
+       // item.v_ProgrammeID = (int)ReadInt(reader, ref f);\r
+       // item.v_Live = (bool)ReadBool(reader, ref f);\r
+       // item.v_EpisodeID = ReadString(reader, ref f);\r
+       // item.v_VariantID = ReadInt(reader, ref f);\r
+       // item.v_MediaID = ReadString(reader, ref f);\r
+       // item.v_VariantTypeID = ReadInt(reader, ref f);\r
+       // item.v_ProgTitle = ReadString(reader, ref f);\r
+       // item.v_EpTitle = ReadString(reader, ref f);\r
+       // item.v_Episode = ReadShort(reader, ref f);\r
+       // item.v_VariantType = ReadString(reader, ref f);\r
+       // item.v_VariantKeywords = ReadString(reader, ref f);\r
+       // item.v_VariantLengthTC = ReadString(reader, ref f);\r
+       // item.v_VariantLengthFrame = ReadInt(reader, ref f);\r
+       // item.v_VariantNrSegments = ReadInt(reader, ref f);\r
+       // item.v_FirstBroadcastDate = ReadDateTime(reader, ref f);\r
+       // item.v_NextBroadcastDate = ReadDateTime(reader, ref f);\r
+       // item.v_OkForAir = ReadBool(reader, ref f);\r
+       // item.v_ForTransm = ReadBool(reader, ref f);\r
 \r
-       private static final String MATERIAL_SEGMENTS_SQL = "{call dbo.clIFsp_EC_MAM(1010, Null, ?)}";//variantid\r
-       //    item.v_SegID = (int)ReadInt(reader, ref f);\r
-       //    item.v_VariantID = ReadInt(reader, ref f);\r
-       //    item.v_SegTitle = ReadString(reader, ref f);\r
-       //    item.v_SegKeyWords = ReadString(reader, ref f);\r
-       //    item.v_SegNumber = ReadInt(reader, ref f);\r
-       //    item.v_TcIn = ReadInt(reader, ref f);\r
-       //    item.v_TcOut = ReadInt(reader, ref f);\r
-       //    item.v_Duration = ReadInt(reader, ref f);\r
-       //    item.v_TcInTC = ReadString(reader, ref f);\r
-       //    item.v_TcOutTC = ReadString(reader, ref f);\r
-       //    item.v_DurationTC = ReadString(reader, ref f);\r
-       //    item.v_Dropable = ReadBool(reader, ref f);\r
+       private static final String MATERIAL_SEGMENTS_SQL = "{call dbo.clIFsp_EC_MAM(1010, Null, ?)}";// variantid\r
+       // item.v_SegID = (int)ReadInt(reader, ref f);\r
+       // item.v_VariantID = ReadInt(reader, ref f);\r
+       // item.v_SegTitle = ReadString(reader, ref f);\r
+       // item.v_SegKeyWords = ReadString(reader, ref f);\r
+       // item.v_SegNumber = ReadInt(reader, ref f);\r
+       // item.v_TcIn = ReadInt(reader, ref f);\r
+       // item.v_TcOut = ReadInt(reader, ref f);\r
+       // item.v_Duration = ReadInt(reader, ref f);\r
+       // item.v_TcInTC = ReadString(reader, ref f);\r
+       // item.v_TcOutTC = ReadString(reader, ref f);\r
+       // item.v_DurationTC = ReadString(reader, ref f);\r
+       // item.v_Dropable = ReadBool(reader, ref f);\r
 \r
        private static final String PROMO_SQL = "{call dbo.clIFsp_EC_MAM(2002, Null, Null, Null, Null, Null, ?)}";\r
-       //    item.t_SpotID = (int)ReadInt(reader, ref f);\r
-       //    item.t_MediaID = ReadString(reader, ref f);\r
-       //    item.v_Title = ReadString(reader, ref f);\r
-       //    item.v_PromoType = ReadString(reader, ref f);\r
-       //    item.v_ProgTitle = ReadString(reader, ref f);\r
-       //    item.v_Episode = ReadShort(reader, ref f);\r
-       //    item.t_PSStart = ReadDateTime(reader, ref f);\r
-       //    item.t_PSEnd = ReadDateTime(reader, ref f);\r
-       //    item.v_EstimatedDuration = ReadInt(reader, ref f);\r
-       //    item.t_TcIn = ReadInt(reader, ref f);\r
-       //    item.t_TcOut = ReadInt(reader, ref f);\r
-       //    item.t_Duration = ReadInt(reader, ref f);\r
-       //    item.v_TcIn = ReadString(reader, ref f);\r
-       //    item.v_TcOut = ReadString(reader, ref f);\r
-       //    item.v_Duration = ReadString(reader, ref f);\r
-       //    item.v_Stations = ReadString(reader, ref f);\r
-       //    item.t_OkForAir = ReadBool(reader, ref f);\r
-       //    item.v_OkForAirs = ReadString(reader, ref f);\r
-       //    item.v_IsInactive = ReadBool(reader, ref f);\r
+       // item.t_SpotID = (int)ReadInt(reader, ref f);\r
+       // item.t_MediaID = ReadString(reader, ref f);\r
+       // item.v_Title = ReadString(reader, ref f);\r
+       // item.v_PromoType = ReadString(reader, ref f);\r
+       // item.v_ProgTitle = ReadString(reader, ref f);\r
+       // item.v_Episode = ReadShort(reader, ref f);\r
+       // item.t_PSStart = ReadDateTime(reader, ref f);\r
+       // item.t_PSEnd = ReadDateTime(reader, ref f);\r
+       // item.v_EstimatedDuration = ReadInt(reader, ref f);\r
+       // item.t_TcIn = ReadInt(reader, ref f);\r
+       // item.t_TcOut = ReadInt(reader, ref f);\r
+       // item.t_Duration = ReadInt(reader, ref f);\r
+       // item.v_TcIn = ReadString(reader, ref f);\r
+       // item.v_TcOut = ReadString(reader, ref f);\r
+       // item.v_Duration = ReadString(reader, ref f);\r
+       // item.v_Stations = ReadString(reader, ref f);\r
+       // item.t_OkForAir = ReadBool(reader, ref f);\r
+       // item.v_OkForAirs = ReadString(reader, ref f);\r
+       // item.v_IsInactive = ReadBool(reader, ref f);\r
        private static final String AD_SQL = "{call dbo.clIFsp_EC_MAM(3002, Null, Null, Null, Null, Null, ?)}";\r
-       //    item.t_SpotID = (int)ReadInt(reader, ref f);\r
-       //    item.t_MediaID = ReadString(reader, ref f);\r
-       //    item.v_Title = ReadString(reader, ref f);\r
-       //    item.t_Advertiser = ReadString(reader, ref f);\r
-       //    item.v_EstimatedDuration = ReadInt(reader, ref f);\r
-       //    item.t_TcIn = ReadInt(reader, ref f);\r
-       //    item.t_TcOut = ReadInt(reader, ref f);\r
-       //    item.t_Duration = ReadInt(reader, ref f);\r
-       //    item.v_TcIn = ReadString(reader, ref f);\r
-       //    item.v_TcOut = ReadString(reader, ref f);\r
-       //    item.v_Duration = ReadString(reader, ref f);\r
-       //    item.t_OkForAir = ReadBool(reader, ref f);\r
-       //    item.v_OkForAirs = ReadString(reader, ref f);\r
+       // item.t_SpotID = (int)ReadInt(reader, ref f);\r
+       // item.t_MediaID = ReadString(reader, ref f);\r
+       // item.v_Title = ReadString(reader, ref f);\r
+       // item.t_Advertiser = ReadString(reader, ref f);\r
+       // item.v_EstimatedDuration = ReadInt(reader, ref f);\r
+       // item.t_TcIn = ReadInt(reader, ref f);\r
+       // item.t_TcOut = ReadInt(reader, ref f);\r
+       // item.t_Duration = ReadInt(reader, ref f);\r
+       // item.v_TcIn = ReadString(reader, ref f);\r
+       // item.v_TcOut = ReadString(reader, ref f);\r
+       // item.v_Duration = ReadString(reader, ref f);\r
+       // item.t_OkForAir = ReadBool(reader, ref f);\r
+       // item.v_OkForAirs = ReadString(reader, ref f);\r
 \r
        private static final String SQLSERVER_JDBC_SQL_SERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";\r
        private static final String HYPHEN_SPACES = " - ";\r
        private static Connection connection;\r
 \r
-       private static void appendInstanceData(Document doc, Node node, String name, String deviceID, Timecode tcIn, Timecode tcOut) {\r
+       private static void appendInstanceData(Document doc, Node node, String name, String deviceID, Timecode tcIn,\r
+                       Timecode tcOut) {\r
                node.appendChild(doc.createElement("Long_File_Id")).appendChild(doc.createTextNode(name));\r
                node.appendChild(doc.createElement("Device_Id")).appendChild(doc.createTextNode(deviceID));\r
                node.appendChild(doc.createElement("Timecode_In")).appendChild(doc.createTextNode(tcIn.toString("")));\r
                node.appendChild(doc.createElement("Timecode_Out")).appendChild(doc.createTextNode(tcOut.toString("")));\r
-               node.appendChild(doc.createElement("Quality_Check")).appendChild(doc.createTextNode(new SimpleDateFormat("dd/MM/yyyy").format(new Date())));\r
+               node.appendChild(doc.createElement("Quality_Check"))\r
+                               .appendChild(doc.createTextNode(new SimpleDateFormat("dd/MM/yyyy").format(new Date())));\r
        }\r
 \r
-       private static void appendItemData(Document doc, Node node, String name, String title, Timecode duration, String type) {\r
+       private static void appendItemData(Document doc, Node node, String name, String title, Timecode duration,\r
+                       String type) {\r
 \r
                node.appendChild(doc.createElement("Material_Id")).appendChild(doc.createTextNode(name));\r
                node.appendChild(doc.createElement("Title")).appendChild(doc.createTextNode(title));\r
@@ -154,24 +159,17 @@ public class PlanAirExtensions {
        }\r
 \r
        /*\r
-       <?xml version="1.0" encoding="UTF-8"?>\r
-       <ImportItems>\r
-         <ImportItem>\r
-           <Item>\r
-             <Material_Id>XMLTEST011</Material_Id>\r
-             <Title>Teszt Mozi</Title>\r
-             <On_Air_Duration>00000914</On_Air_Duration>\r
-             <Material_Type>PROGRAMME</Material_Type> //PROGRAMME, COMMERCIAL, JUNCTION\r
-           </Item>\r
-           <Instance>\r
-             <Device_Id>ISILON</Device_Id>\r
-             <Quality_Check>09/11/2017</Quality_Check>\r
-             <Long_File_Id>XMLTEST011</Long_File_Id>\r
-           </Instance>\r
-         </ImportItem>\r
-       </ImportItems>\r
-       */\r
-       public static String getMorpeusXML(IItemManager manager, String dbUrl, String userName, String password, String name, String deviceID) throws Exception {\r
+        * <?xml version="1.0" encoding="UTF-8"?> <ImportItems> <ImportItem> <Item>\r
+        * <Material_Id>XMLTEST011</Material_Id> <Title>Teszt Mozi</Title>\r
+        * <On_Air_Duration>00000914</On_Air_Duration>\r
+        * <Material_Type>PROGRAMME</Material_Type> //PROGRAMME, COMMERCIAL, JUNCTION\r
+        * </Item> <Instance> <Device_Id>ISILON</Device_Id>\r
+        * <Quality_Check>09/11/2017</Quality_Check>\r
+        * <Long_File_Id>XMLTEST011</Long_File_Id> </Instance> </ImportItem>\r
+        * </ImportItems>\r
+        */\r
+       public static String getMorpeusXML(IItemManager manager, String dbUrl, String userName, String password,\r
+                       String name, String deviceID) throws Exception {\r
                String result = null;\r
                try {\r
                        Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER);\r
@@ -185,7 +183,7 @@ public class PlanAirExtensions {
                        Node instanceNode = importItemNode.appendChild(doc.createElement("Instance"));\r
 \r
                        connection = DriverManager.getConnection(dbUrl, userName, password);\r
-                       //TODO hiba esetén exception\r
+                       // TODO hiba esetén exception\r
                        switch (type) {\r
                        case TrafficMaterial:\r
                                manager.executeQuery(connection, MATERIAL_SQL, rs -> {\r
@@ -210,7 +208,8 @@ public class PlanAirExtensions {
                                        int out = segments.get(segments.size() - 1)[1];\r
                                        int in = segments.get(0)[0];\r
                                        appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "PROGRAMME");\r
-                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL));\r
+                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL),\r
+                                                       new Timecode(out, Type.PAL));\r
                                        return false;\r
                                }, st -> {\r
                                        st.setString(1, name);\r
@@ -222,7 +221,8 @@ public class PlanAirExtensions {
                                        int in = rs.getInt("t_TcIn");\r
                                        int out = rs.getInt("t_TcOut");\r
                                        appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "COMMERCIAL");\r
-                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL));\r
+                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL),\r
+                                                       new Timecode(out, Type.PAL));\r
                                        return false;\r
                                }, st -> {\r
                                        st.setString(1, name);\r
@@ -234,7 +234,8 @@ public class PlanAirExtensions {
                                        int in = rs.getInt("t_TcIn");\r
                                        int out = rs.getInt("t_TcOut");\r
                                        appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "JUNCTION");\r
-                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL));\r
+                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL),\r
+                                                       new Timecode(out, Type.PAL));\r
                                        return false;\r
                                }, st -> {\r
                                        st.setString(1, name);\r
@@ -254,14 +255,15 @@ public class PlanAirExtensions {
                return result;\r
        }\r
 \r
-       public static Connection search(Connection con, MetadataType type, IItemManager manager, String dbUrl, String userName, String password,\r
-                       IResultSetConsumer consumer, IStatementDecorator decorator) throws Exception {\r
+       public static Connection search(Connection con, MetadataType type, IItemManager manager, String dbUrl,\r
+                       String userName, String password, IResultSetConsumer consumer, IStatementDecorator decorator)\r
+                       throws Exception {\r
                try {\r
                        Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER);\r
 \r
                        if (con == null)\r
                                connection = DriverManager.getConnection(dbUrl, userName, password);\r
-                       //TODO hiba esetén exception\r
+                       // TODO hiba esetén exception\r
                        switch (type) {\r
                        case TrafficMaterial:\r
                                manager.executeQuery(connection, MATERIAL_SQL, consumer, decorator);\r
@@ -272,13 +274,15 @@ public class PlanAirExtensions {
                        case TrafficAD:\r
                                manager.executeQuery(connection, AD_SQL, consumer, decorator);\r
                                break;\r
+                       default:\r
+                               break;\r
                        }\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
                        throw e;\r
                } finally {\r
-                       //                      if (connection != null)\r
-                       //                              connection.close();\r
+                       // if (connection != null)\r
+                       // connection.close();\r
                }\r
                return connection;\r
        }\r
@@ -287,7 +291,7 @@ public class PlanAirExtensions {
                DOMSource domSource = new DOMSource(doc);\r
                TransformerFactory tf = TransformerFactory.newInstance();\r
                Transformer transformer = tf.newTransformer();\r
-               //transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");\r
+               // transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");\r
                transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");\r
                transformer.setOutputProperty(OutputKeys.METHOD, "xml");\r
                transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");\r