https://git.useribm.hu / mediacube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ae377e6)
git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 24 Sep 2019 12:51:38 +0000 (12:51 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 24 Sep 2019 12:51:38 +0000 (12:51 +0000)
server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java patch | blob | history
server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportCheckItem.java [new file with mode: 0644] patch | blob
server/user.mediacube.metadata/src/user/mediacube/metadata/MetadataProviderFactory.java patch | blob | history
server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirADMapper.java [moved from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirADMapper.java with 95% similarity] patch | blob | history
server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirMaterialMapper.java [moved from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirMaterialMapper.java with 96% similarity] patch | blob | history
server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirPromoMapper.java [moved from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirPromoMapper.java with 96% similarity] patch | blob | history
server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java [moved from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirAD.java with 89% similarity] patch | blob | history
server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java [moved from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMaterial.java with 93% similarity] patch | blob | history
server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMetadataProvider.java [moved from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataProvider.java with 96% similarity] patch | blob | history
server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java [moved from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirPromo.java with 91% similarity] patch | blob | history

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
index 2824fe2c162f55892cedd47c3033ce015ffd3866..6d4ae6894298966003c2a23314cb0c7d750dcd13 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
@@ -419,8 +419,13 @@ public class ItemManager extends MemoryCache implements IItemManager {
                                decorator.decorate(st);\r
                        rs = st.executeQuery();\r
                        while (rs.next()) {\r
-                               if (!consumer.process(rs))\r
+\r
+                               if (!consumer.process(rs)) {\r
+                                       //ha nem megyunk vevig pool exception a tranzakcio miatt\r
+                                       connection.rollback();\r
                                        break;\r
+                               }\r
+\r
                        }\r
 \r
                        connection.commit();\r
diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportCheckItem.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportCheckItem.java
new file mode 100644 (file)
index 0000000..3a64560
--- /dev/null
+++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportCheckItem.java
@@ -0,0 +1,66 @@
+package user.jobengine.server.IT;\r
+\r
+import java.sql.Timestamp;\r
+\r
+import org.junit.AfterClass;\r
+import org.junit.BeforeClass;\r
+import org.junit.Test;\r
+\r
+import user.commons.logging.LogUtils;\r
+import user.jobengine.db.IItemManager;\r
+import user.jobengine.db.ItemManager;\r
+import user.jobengine.osgi.server.ComponentBinder;\r
+import user.mediacube.metadata.interfaces.IMetadataProvider;\r
+import user.mediacube.metadata.interfaces.IMetadataProviderFactory;\r
+import user.mediacube.metadata.interfaces.MetadataProviderType;\r
+\r
+public class SupportCheckItem {\r
+       protected static IItemManager manager = null;\r
+       private static final String LOWRES_ROOT = "//10.10.1.27/mclowres/www/video";\r
+       private static final long[] duplicateLength = { 0 };\r
+\r
+       @BeforeClass\r
+       static public void setUpConnection() {\r
+               //              System.setProperty("jobengine.octopus.rundowns.name", "test_rundowns");\r
+               //              System.setProperty("jobengine.octopus.stories.name", "test_stories");\r
+               //              System.setProperty("jobengine.octopus.storyfolders.name", "test_storyfolders");\r
+               System.setProperty("jobengine.octopus.rundowns.name", "rundowns180620");\r
+               System.setProperty("jobengine.octopus.stories.name", "stories180620");\r
+               System.setProperty("jobengine.octopus.storyfolders.name", "storyfolders180620");\r
+\r
+               System.setProperty("jobengine.nosql.db.url", "jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;");\r
+               System.setProperty("jobengine.nosql.db.user", "db2admin");\r
+               System.setProperty("jobengine.nosql.db.password", "password");\r
+               System.setProperty(ItemManager.DBURL, "jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;");\r
+               System.setProperty(ItemManager.DBUSERNAME, "db2admin");\r
+               System.setProperty(ItemManager.DBPASSWORD, "password");\r
+               System.setProperty(LogUtils.LOGLEVEL, "INFO");\r
+               // System.setProperty(ItemManager.DBURL,\r
+\r
+               manager = new ItemManager();\r
+               manager.connect();\r
+       }\r
+\r
+       @AfterClass\r
+       static public void tearDownConnection() {\r
+               manager.disconnect();\r
+       }\r
+\r
+       @Test\r
+       public void process() {\r
+\r
+               IMetadataProviderFactory factory = ComponentBinder.getMetadataProviderFactory();\r
+               IMetadataProvider provider = factory.getProvider(MetadataProviderType.PLANAIR);\r
+               manager.executeQuery(\r
+                               "select itemid, itemhouseid, itemtitle, mediaid, mediafilehouseid, mediacreated from vw_items where mediatype = 'Műsor' order by mediacreated desc",\r
+                               rs -> {\r
+                                       String itemHouseId = rs.getString("itemHouseId");\r
+                                       String itemTitle = rs.getString("itemTitle");\r
+                                       String mediaFileHouseId = rs.getString("mediaFileHouseId");\r
+                                       Timestamp mediaCreated = rs.getTimestamp("mediaCreated");\r
+                                       System.out.println(mediaCreated + ", " + itemHouseId + ", " + itemTitle);\r
+                                       return false;\r
+                               }, null);\r
+       }\r
+\r
+}\r
diff --git a/server/user.mediacube.metadata/src/user/mediacube/metadata/MetadataProviderFactory.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/MetadataProviderFactory.java
index e875eead185448c64ca3b2d8a0b18a2d83c557f3..08cf880dffdb8845e7484cd94b4c21e646a31771 100644 (file)
--- a/server/user.mediacube.metadata/src/user/mediacube/metadata/MetadataProviderFactory.java
+++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/MetadataProviderFactory.java
@@ -3,10 +3,10 @@ package user.mediacube.metadata;
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
-import user.mediabube.metadata.planair.PlanAirMetadataProvider;\r
 import user.mediacube.metadata.interfaces.IMetadataProvider;\r
 import user.mediacube.metadata.interfaces.IMetadataProviderFactory;\r
 import user.mediacube.metadata.interfaces.MetadataProviderType;\r
+import user.mediacube.metadata.planair.PlanAirMetadataProvider;\r
 \r
 public class MetadataProviderFactory implements IMetadataProviderFactory {\r
 \r
diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirAD.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java
similarity index 89%
rename from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirAD.java
rename to server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java
index 96937b996802da129d485fffddbac40d908e6bca..1394ee2f64d7f1fcbaddae88e4bc97e919fad618 100644 (file)
--- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirAD.java
+++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java
@@ -1,4 +1,4 @@
-package user.mediabube.metadata.planair;\r
+package user.mediacube.metadata.planair;\r
 \r
 import user.mediacube.metadata.interfaces.IMetadata;\r
 \r
mediacube repository