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

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java
index 70cfd1ed051712c6f11fcbb101300e0896417008..a550521c450f0aaa7ac17890726be39b0915cdec 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java
@@ -34,6 +34,8 @@ import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HTTP;\r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
+import org.apache.logging.log4j.Marker;\r
+import org.apache.logging.log4j.MarkerManager;\r
 import org.w3c.dom.Document;\r
 import org.w3c.dom.NamedNodeMap;\r
 import org.w3c.dom.Node;\r
@@ -63,6 +65,7 @@ public class PBQuery {
        }\r
 \r
        private static final Logger logger = LogManager.getLogger();\r
+       private Marker subtitleMarker = MarkerManager.getMarker("MISSING-SUBTITLE");\r
        private static final int CONNECTION_TIMEOUT = 5000;\r
        private static final int SOCKET_TIMEOUT = 5000;\r
        public static final String GETMEDIAUSAGEBYUTRANGE = "/getMediaUsageByUTRange";\r
@@ -111,7 +114,7 @@ public class PBQuery {
 \r
                TreeMap<String, MMMedia> sortedUsages = new TreeMap<>();\r
                for (MMMedia m : result.values()) {\r
-                       //a TreeMap lehetove teszi: nincs duplikatum + a korabbi musorok elore kerulnek\r
+                       // a TreeMap lehetove teszi: nincs duplikatum + a korabbi musorok elore kerulnek\r
                        sortedUsages.put(m.getUsage() + "." + m.getName(), m);\r
                }\r
 \r
@@ -125,8 +128,8 @@ public class PBQuery {
                return Paths.get(configDir, viewName);\r
        }\r
 \r
-       public void init(String primaryEndPoint, String primaryUserName, String primaryPassword, String secondaryEndPoint, String secondaryUserName,\r
-                       String secondaryPassword, int rangeForwardHours) throws Exception {\r
+       public void init(String primaryEndPoint, String primaryUserName, String primaryPassword, String secondaryEndPoint,\r
+                       String secondaryUserName, String secondaryPassword, int rangeForwardHours) throws Exception {\r
                this.primaryEndPoint = primaryEndPoint;\r
                this.primaryUserName = primaryUserName;\r
                this.primaryPassword = primaryPassword;\r
@@ -139,7 +142,7 @@ public class PBQuery {
        private void putEarliest(Map<String, MMMedia> result, String mediaName, String usageTime) {\r
                if (result.containsKey(mediaName)) {\r
                        MMMedia m = result.get(mediaName);\r
-                       //az aktualis a korabbi idopont\r
+                       // az aktualis a korabbi idopont\r
                        if (usageTime.compareTo(m.getUsage()) < 0)\r
                                result.put(mediaName, new MMMedia(mediaName, usageTime));\r
                } else\r
@@ -152,28 +155,30 @@ public class PBQuery {
                HttpConnectionParams.setConnectionTimeout(httpParameters, CONNECTION_TIMEOUT);\r
                HttpConnectionParams.setSoTimeout(httpParameters, SOCKET_TIMEOUT);\r
                DefaultHttpClient httpclient = new DefaultHttpClient(httpParameters);\r
-               //http://10.170.100.61:18083\r
+               // http://10.170.100.61:18083\r
 \r
                String result = null;\r
                DataInputStream is = null;\r
                try {\r
                        URL url = new URL(endPoint);\r
-                       httpclient.getCredentialsProvider()\r
-                                       .setCredentials(new AuthScope(url.getHost(), url.getPort(), null, "Digest"), new UsernamePasswordCredentials(user, pwd));\r
+                       httpclient.getCredentialsProvider().setCredentials(\r
+                                       new AuthScope(url.getHost(), url.getPort(), null, "Digest"),\r
+                                       new UsernamePasswordCredentials(user, pwd));\r
 \r
                        HttpPost httppost = new HttpPost(url.toURI());\r
                        httppost.setHeader("soapaction", action);\r
-                       //Content-Type  application/soap+xml; charset=utf-8; action="/getMediaUsageByUTRange"\r
+                       // Content-Type application/soap+xml; charset=utf-8;\r
+                       // action="/getMediaUsageByUTRange"\r
                        httppost.setHeader("Content-Type", "text/xml; charset=utf-8");\r
                        HttpEntity entity = new StringEntity(soap.toString(), HTTP.UTF_8);\r
                        httppost.setEntity(entity);\r
                        logger.info("Executing call {}", action);\r
                        HttpResponse response = httpclient.execute(httppost);// calling server\r
-                       HttpEntity r_entity = response.getEntity(); //get response\r
-                       //                      Header[] headers = response.getAllHeaders();\r
-                       //                      for (Header h : headers) {\r
-                       //                              logger.info("Reponse Header", h.getName() + ": " + h.getValue());\r
-                       //                      }\r
+                       HttpEntity r_entity = response.getEntity(); // get response\r
+                       // Header[] headers = response.getAllHeaders();\r
+                       // for (Header h : headers) {\r
+                       // logger.info("Reponse Header", h.getName() + ": " + h.getValue());\r
+                       // }\r
                        if (r_entity != null) {\r
                                byte[] bytes = new byte[(int) r_entity.getContentLength()];\r
                                if (r_entity.isStreaming()) {\r
@@ -233,10 +238,13 @@ public class PBQuery {
                        Node mediaNode = mediaNodes.item(i);\r
                        String mediaName = getAttribute(mediaNode, "mediaName");\r
                        if (StringUtils.isBlank(mediaName)) {\r
-                               logger.info("Missing mediaName");\r
                                continue;\r
                        }\r
 \r
+                       String usageType = getAttribute(mediaNode, "UsageType");\r
+                       if (!"PrimaryVideo".equals(usageType) && !"Live".equals(usageType))\r
+                               logger.info(subtitleMarker, "queryOtherMedias: {}, {}", usageType, mediaName);\r
+\r
                        if (poolContent.contains(mediaName))\r
                                continue;\r
 \r
@@ -295,14 +303,14 @@ public class PBQuery {
                        Node mediaNode = mediaNodes.item(i);\r
                        String mediaName = getAttribute(mediaNode, "mediaName");\r
                        String mediaType = getAttribute(mediaNode, "mediaType");\r
-                       if (StringUtils.isBlank(mediaName)) {\r
-                               logger.info("Missing mediaName");\r
+                       if (StringUtils.isBlank(mediaName))\r
                                continue;\r
-                       }\r
 \r
-                       if (!StringUtils.equals("Video", mediaType)) {\r
+                       if (!StringUtils.equals("Subtitle", mediaType))\r
+                               logger.info(subtitleMarker, "querySortableMedias: {}", mediaName);\r
+\r
+                       if (!StringUtils.equals("Video", mediaType))\r
                                continue;\r
-                       }\r
 \r
                        if (poolContent.contains(mediaName))\r
                                continue;\r

diff --git a/server/user.mediacube.gui/WEB-INF/web.xml b/server/user.mediacube.gui/WEB-INF/web.xml
index 867e1ac4d6a1daf45d0fc071ad59ef1a81bbd830..7d84e06c9e0b1aa1a5d32726c0b8a389c78b73cc 100644 (file)
--- a/server/user.mediacube.gui/WEB-INF/web.xml
+++ b/server/user.mediacube.gui/WEB-INF/web.xml
@@ -68,7 +68,6 @@
 \r
 \r
 <!-- Enable http to https redirect \r
--->    \r
        <security-constraint>\r
                <web-resource-collection>\r
                        <web-resource-name>Everything on the app</web-resource-name>\r
@@ -78,4 +77,5 @@
                        <transport-guarantee>CONFIDENTIAL</transport-guarantee>\r
                </user-data-constraint>\r
        </security-constraint>\r
+-->    \r
 </web-app>\r