From: Vásáry Dániel Date: Mon, 23 Jul 2018 12:11:46 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=b29a6cae74b4bf8709d61c33cceeea1be0ac05f5;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31211 --- 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 7a7bd409..26a4e075 100644 --- 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 { private static final String SQLSERVER_JDBC_SQL_SERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; private static final String HYPHEN_SPACES = " - "; + private static Connection connection; private static void appendInstanceData(Document doc, Node node, String name, String deviceID, Timecode tcIn, Timecode tcOut) { - node.appendChild(doc.createElement("Long_File_Id")).setNodeValue(name); - node.appendChild(doc.createElement("Device_Id")).setNodeValue(deviceID); - node.appendChild(doc.createElement("Timecode_In")).setNodeValue(tcIn.toString("")); - node.appendChild(doc.createElement("Timecode_Out")).setNodeValue(tcOut.toString("")); - node.appendChild(doc.createElement("Quality_Check")).setNodeValue(new SimpleDateFormat("dd/MM/yyyy").format(new Date())); + node.appendChild(doc.createElement("Long_File_Id")).appendChild(doc.createTextNode(name)); + node.appendChild(doc.createElement("Device_Id")).appendChild(doc.createTextNode(deviceID)); + node.appendChild(doc.createElement("Timecode_In")).appendChild(doc.createTextNode(tcIn.toString(""))); + node.appendChild(doc.createElement("Timecode_Out")).appendChild(doc.createTextNode(tcOut.toString(""))); + node.appendChild(doc.createElement("Quality_Check")).appendChild(doc.createTextNode(new SimpleDateFormat("dd/MM/yyyy").format(new Date()))); } private static void appendItemData(Document doc, Node node, String name, String title, Timecode duration, String type) { - node.appendChild(doc.createElement("Material_Id")).setNodeValue(name); - node.appendChild(doc.createElement("Title")).setNodeValue(title); - node.appendChild(doc.createElement("On_Air_Duration")).setNodeValue(duration.toString("")); - node.appendChild(doc.createElement("Material_Type")).setNodeValue(type); + + node.appendChild(doc.createElement("Material_Id")).appendChild(doc.createTextNode(name)); + node.appendChild(doc.createElement("Title")).appendChild(doc.createTextNode(title)); + node.appendChild(doc.createElement("On_Air_Duration")).appendChild(doc.createTextNode(duration.toString(""))); + node.appendChild(doc.createElement("Material_Type")).appendChild(doc.createTextNode(type)); } private static Document createXMLDocument() throws ParserConfigurationException { @@ -170,8 +172,9 @@ public class PlanAirExtensions { */ public static String getMorpeusXML(IItemManager manager, String dbUrl, String userName, String password, String name, String deviceID) throws Exception { String result = null; - final Connection connection = DriverManager.getConnection(dbUrl, userName, password); try { + Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER); + MetadataType type = MetadataTypeDetector.GuessMetadataType(name); Document doc = createXMLDocument(); @@ -180,6 +183,7 @@ public class PlanAirExtensions { Node itemNode = importItemNode.appendChild(doc.createElement("Item")); Node instanceNode = importItemNode.appendChild(doc.createElement("Instance")); + connection = DriverManager.getConnection(dbUrl, userName, password); //TODO hiba esetén exception switch (type) { case TrafficMaterial: @@ -210,8 +214,8 @@ public class PlanAirExtensions { case TrafficPromo: manager.executeQuery(connection, PROMO_SQL, rs -> { String title = rs.getString("v_Title"); - int in = rs.getInt("v_TcIn"); - int out = rs.getInt("v_TcOut"); + int in = rs.getInt("t_TcIn"); + int out = rs.getInt("t_TcOut"); appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "COMMERCIAL"); appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL)); return false; @@ -222,8 +226,8 @@ public class PlanAirExtensions { case TrafficAD: manager.executeQuery(connection, AD_SQL, rs -> { String title = rs.getString("v_Title"); - int in = rs.getInt("v_TcIn"); - int out = rs.getInt("v_TcOut"); + int in = rs.getInt("t_TcIn"); + int out = rs.getInt("t_TcOut"); appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "JUNCTION"); appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL)); return false; 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 2c6dcfd4..00582eee 100644 --- 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, String localRetrievePath, String globalRetrievePath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { marker = jobRuntime.getMarker(); - String targetFileName = String.format(targetNamePattern, sourceFileName); setAndCheck(mediaCubeMedia, targetPath, targetNamePattern, localRetrievePath, globalRetrievePath, jobEngine); + String targetFileName = String.format(targetNamePattern, sourceFileName); try { beforeRestore(targetUri, targetNamePattern); final IJobRuntime runtime = jobRuntime; 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 f28782f3..4f6e6dc6 100644 --- 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 { IItemManager itemManager = jobEngine.getItemManager(); Media mediaCubeMedia = itemManager.getMedia(material.getLong(MorpheusStrings.MEDIAID)); + super.execute(mediaCubeMedia, targetPath, TARGETNAMEPATTERN, null, 0, targetPath, globalRetrievePath, jobEngine, jobRuntime); saveMaterial(material, MorpheusStrings.STATUS_DONE); } catch (Exception e) {