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

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java
index 7a7bd409f21674aa390aabdbf43ab892fb0f76db..26a4e075d82bd39a7e5ce7311d4aa84e8dc9fd4c 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java
@@ -106,20 +106,22 @@ public class PlanAirExtensions {
 \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
-               node.appendChild(doc.createElement("Long_File_Id")).setNodeValue(name);\r
-               node.appendChild(doc.createElement("Device_Id")).setNodeValue(deviceID);\r
-               node.appendChild(doc.createElement("Timecode_In")).setNodeValue(tcIn.toString(""));\r
-               node.appendChild(doc.createElement("Timecode_Out")).setNodeValue(tcOut.toString(""));\r
-               node.appendChild(doc.createElement("Quality_Check")).setNodeValue(new SimpleDateFormat("dd/MM/yyyy").format(new Date()));\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
        }\r
 \r
        private static void appendItemData(Document doc, Node node, String name, String title, Timecode duration, String type) {\r
-               node.appendChild(doc.createElement("Material_Id")).setNodeValue(name);\r
-               node.appendChild(doc.createElement("Title")).setNodeValue(title);\r
-               node.appendChild(doc.createElement("On_Air_Duration")).setNodeValue(duration.toString(""));\r
-               node.appendChild(doc.createElement("Material_Type")).setNodeValue(type);\r
+\r
+               node.appendChild(doc.createElement("Material_Id")).appendChild(doc.createTextNode(name));\r
+               node.appendChild(doc.createElement("Title")).appendChild(doc.createTextNode(title));\r
+               node.appendChild(doc.createElement("On_Air_Duration")).appendChild(doc.createTextNode(duration.toString("")));\r
+               node.appendChild(doc.createElement("Material_Type")).appendChild(doc.createTextNode(type));\r
        }\r
 \r
        private static Document createXMLDocument() throws ParserConfigurationException {\r
@@ -170,8 +172,9 @@ public class PlanAirExtensions {
        */\r
        public static String getMorpeusXML(IItemManager manager, String dbUrl, String userName, String password, String name, String deviceID) throws Exception {\r
                String result = null;\r
-               final Connection connection = DriverManager.getConnection(dbUrl, userName, password);\r
                try {\r
+                       Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER);\r
+\r
                        MetadataType type = MetadataTypeDetector.GuessMetadataType(name);\r
 \r
                        Document doc = createXMLDocument();\r
@@ -180,6 +183,7 @@ public class PlanAirExtensions {
                        Node itemNode = importItemNode.appendChild(doc.createElement("Item"));\r
                        Node instanceNode = importItemNode.appendChild(doc.createElement("Instance"));\r
 \r
+                       connection = DriverManager.getConnection(dbUrl, userName, password);\r
                        //TODO hiba esetén exception\r
                        switch (type) {\r
                        case TrafficMaterial:\r
@@ -210,8 +214,8 @@ public class PlanAirExtensions {
                        case TrafficPromo:\r
                                manager.executeQuery(connection, PROMO_SQL, rs -> {\r
                                        String title = rs.getString("v_Title");\r
-                                       int in = rs.getInt("v_TcIn");\r
-                                       int out = rs.getInt("v_TcOut");\r
+                                       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
                                        return false;\r
@@ -222,8 +226,8 @@ public class PlanAirExtensions {
                        case TrafficAD:\r
                                manager.executeQuery(connection, AD_SQL, rs -> {\r
                                        String title = rs.getString("v_Title");\r
-                                       int in = rs.getInt("v_TcIn");\r
-                                       int out = rs.getInt("v_TcOut");\r
+                                       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
                                        return false;\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java
index 2c6dcfd49c32d327912459eda175cdc7edb231e0..00582eeedebf3f9803d6f979a48e3485607e9ddf 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java
@@ -57,8 +57,8 @@ public class TSMRestoreStep extends JobStep {
        public Object[] execute(Media mediaCubeMedia, String targetPath, String targetNamePattern, String successRecipient, int killDateDays,\r
                        String localRetrievePath, String globalRetrievePath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
                marker = jobRuntime.getMarker();\r
-               String targetFileName = String.format(targetNamePattern, sourceFileName);\r
                setAndCheck(mediaCubeMedia, targetPath, targetNamePattern, localRetrievePath, globalRetrievePath, jobEngine);\r
+               String targetFileName = String.format(targetNamePattern, sourceFileName);\r
                try {\r
                        beforeRestore(targetUri, targetNamePattern);\r
                        final IJobRuntime runtime = jobRuntime;\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRetrieveMissingMaterialStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRetrieveMissingMaterialStep.java
index f28782f305d0b31d25e205259005c203ddf30d35..4f6e6dc62709c830bceb9c98ebb3f3c0cd3b82a2 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRetrieveMissingMaterialStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRetrieveMissingMaterialStep.java
@@ -24,6 +24,7 @@ public class TSMRetrieveMissingMaterialStep extends TSMRestoreStep {
                try {\r
                        IItemManager itemManager = jobEngine.getItemManager();\r
                        Media mediaCubeMedia = itemManager.getMedia(material.getLong(MorpheusStrings.MEDIAID));\r
+\r
                        super.execute(mediaCubeMedia, targetPath, TARGETNAMEPATTERN, null, 0, targetPath, globalRetrievePath, jobEngine, jobRuntime);\r
                        saveMaterial(material, MorpheusStrings.STATUS_DONE);\r
                } catch (Exception e) {\r