From: Vásáry Dániel Date: Tue, 13 Aug 2019 12:00:07 +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=3ca1701d66972626f0011b049a331ad96b999ff7;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31473 --- diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMaterial.java b/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMaterial.java index dfc813d3..6d68dc92 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMaterial.java +++ b/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMaterial.java @@ -50,6 +50,10 @@ public class PlanAirMaterial implements IMetadata { return segID; } + public String getSegment() { + return String.format("%d / %d : %s", variantNrSegments, segNr, mediaID); + } + public int getSegNr() { return segNr; } diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataListOptions.java b/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataListOptions.java index 5d5a487b..6198a40f 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataListOptions.java +++ b/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataListOptions.java @@ -3,6 +3,7 @@ package user.mediabube.metadata.planair; import java.util.Date; import user.mediacube.metadata.interfaces.IMetadataListOptions; +import user.mediacube.metadata.interfaces.MetadataType; public class PlanAirMetadataListOptions implements IMetadataListOptions { private Date broadcastDay; diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataProvider.java b/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataProvider.java index ad215422..850460be 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataProvider.java +++ b/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataProvider.java @@ -1,5 +1,6 @@ package user.mediabube.metadata.planair; +import java.util.Arrays; import java.util.List; import javax.sql.DataSource; @@ -17,6 +18,7 @@ import com.microsoft.sqlserver.jdbc.SQLServerDriver; import user.mediacube.metadata.interfaces.IMetadata; import user.mediacube.metadata.interfaces.IMetadataListOptions; import user.mediacube.metadata.interfaces.IMetadataProvider; +import user.mediacube.metadata.interfaces.MetadataType; public class PlanAirMetadataProvider implements IMetadataProvider { private static final String JDBC_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; @@ -47,6 +49,11 @@ public class PlanAirMetadataProvider implements IMetadataProvider { return builder.build(configuration); } + @Override + public List getColumnNames(MetadataType type) { + return Arrays.asList("Traffic ID", "OK", "Cím", "Epizódszám", "Epizód azonosító", "Első adás", "Következő adás", "Szegmensek", "Epizódcím"); + } + @Override public List list(IMetadataListOptions options) throws Exception { List result = null; diff --git a/server/user.mediacube.metadata/test/user/mediabube/metadata/PlanAirMetadataTest.java b/server/user.mediacube.metadata/test/user/mediabube/metadata/PlanAirMetadataTest.java index 063bd628..400cd992 100644 --- a/server/user.mediacube.metadata/test/user/mediabube/metadata/PlanAirMetadataTest.java +++ b/server/user.mediacube.metadata/test/user/mediabube/metadata/PlanAirMetadataTest.java @@ -8,13 +8,13 @@ import java.util.List; import org.junit.Test; -import user.mediabube.metadata.planair.MetadataType; import user.mediabube.metadata.planair.PlanAirMetadataListOptions; import user.mediacube.metadata.MetadataProviderFactory; import user.mediacube.metadata.interfaces.IMetadata; import user.mediacube.metadata.interfaces.IMetadataProvider; import user.mediacube.metadata.interfaces.IMetadataProviderFactory; import user.mediacube.metadata.interfaces.MetadataProviderType; +import user.mediacube.metadata.interfaces.MetadataType; public class PlanAirMetadataTest { private IMetadataProviderFactory factory = new MetadataProviderFactory();