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

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 dfc813d3d57f0e513c433dcf375ace1053fa0bef..6d68dc92490a8acc855fc202cd4099faff011c59 100644 (file)
--- 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;\r
        }\r
 \r
+       public String getSegment() {\r
+               return String.format("%d / %d : %s", variantNrSegments, segNr, mediaID);\r
+       }\r
+\r
        public int getSegNr() {\r
                return segNr;\r
        }\r

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 5d5a487b27b05b67987556eeb68282040b108f6f..6198a40f738b6a2c55cf976a701bac540f744c5b 100644 (file)
--- 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;\r
 \r
 import user.mediacube.metadata.interfaces.IMetadataListOptions;\r
+import user.mediacube.metadata.interfaces.MetadataType;\r
 \r
 public class PlanAirMetadataListOptions implements IMetadataListOptions {\r
        private Date broadcastDay;\r

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 ad215422150f336d6e47eff92a437f2c826438f6..850460be21725f14069c113cf4d91a9348658b98 100644 (file)
--- 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;\r
 \r
+import java.util.Arrays;\r
 import java.util.List;\r
 \r
 import javax.sql.DataSource;\r
@@ -17,6 +18,7 @@ import com.microsoft.sqlserver.jdbc.SQLServerDriver;
 import user.mediacube.metadata.interfaces.IMetadata;\r
 import user.mediacube.metadata.interfaces.IMetadataListOptions;\r
 import user.mediacube.metadata.interfaces.IMetadataProvider;\r
+import user.mediacube.metadata.interfaces.MetadataType;\r
 \r
 public class PlanAirMetadataProvider implements IMetadataProvider {\r
        private static final String JDBC_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";\r
@@ -47,6 +49,11 @@ public class PlanAirMetadataProvider implements IMetadataProvider {
                return builder.build(configuration);\r
        }\r
 \r
+       @Override\r
+       public List<String> getColumnNames(MetadataType type) {\r
+               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");\r
+       }\r
+\r
        @Override\r
        public List<IMetadata> list(IMetadataListOptions options) throws Exception {\r
                List<IMetadata> result = null;\r

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 063bd6286df60a2055bb5c9c8309a631886460b8..400cd9927c54eecb95cf6a037e4f3c604b1025fd 100644 (file)
--- 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();