From: Vásáry Dániel Date: Thu, 5 Sep 2019 12:48:05 +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=ea4fa53b803b5ec502f332f51f04cd3a1d12c5d8;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31500 --- diff --git a/server/-configuration/run-mediacube-server-bsh.launch b/server/-configuration/run-mediacube-server-bsh.launch index 66d960cb..b004926b 100644 --- a/server/-configuration/run-mediacube-server-bsh.launch +++ b/server/-configuration/run-mediacube-server-bsh.launch @@ -19,7 +19,7 @@ - + diff --git a/server/-configuration/run-mediacube-server-localhost.launch b/server/-configuration/run-mediacube-server-localhost.launch deleted file mode 100644 index 75a5031d..00000000 --- a/server/-configuration/run-mediacube-server-localhost.launch +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-configuration/run-mediacube-server-slim.launch b/server/-configuration/run-mediacube-server-slim.launch index 20dec987..bf4c9919 100644 --- a/server/-configuration/run-mediacube-server-slim.launch +++ b/server/-configuration/run-mediacube-server-slim.launch @@ -22,7 +22,7 @@ - + diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index e6a071f8..9d95d521 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -25,11 +25,17 @@ + + + + + + @@ -41,6 +47,7 @@ + @@ -57,6 +64,14 @@ + + + + + + + + @@ -88,6 +103,7 @@ + @@ -107,6 +123,7 @@ + diff --git a/server/-dependencies/libs/solr-solrj-7.5.0.jar b/server/-dependencies/libs/solr-solrj-7.5.0.jar deleted file mode 100644 index 33c194c1..00000000 Binary files a/server/-dependencies/libs/solr-solrj-7.5.0.jar and /dev/null differ diff --git a/server/-dependencies/libs/solr-solrj-8.2.0.jar b/server/-dependencies/libs/solr-solrj-8.2.0.jar new file mode 100644 index 00000000..b357a80c Binary files /dev/null and b/server/-dependencies/libs/solr-solrj-8.2.0.jar differ diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 4b89aaca..2900b7ad 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -107,6 +107,20 @@ jar + + install6 + package + + install-file + + + libs/solr-solrj-8.2.0.jar + org.apache.solr + solrj + 8.2.0 + jar + + diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml index 7dc37ce9..ebf9f9bb 100644 --- a/server/-modules/pom.xml +++ b/server/-modules/pom.xml @@ -19,8 +19,8 @@ - ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 - + ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 + 1.0.0 1.0.0 1.8 @@ -46,15 +46,15 @@ - - - - - - - - - + + + + + + + + + org.apache.maven.plugins @@ -109,11 +109,11 @@ gtk x86_64 - - - - - + + win32 + win32 + x86_64 + diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index 87c59aaa..2087b605 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -115,11 +115,9 @@ - - @@ -131,7 +129,6 @@ - @@ -169,7 +166,6 @@ - @@ -186,6 +182,7 @@ + diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java index f0206211..6734cd63 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java @@ -140,8 +140,7 @@ public class SearchModel extends AsyncBaseModel { addTypeFilter(TypeFilter.as(GENERIC, "YELLOW200", "ic_view_quilt_black_18dp.png")); addTypeFilter(TypeFilter.as(GENERIC_ORIGINAL, "YELLOW200", "ic_view_quilt_black_18dp.png")); topTypeFilterNames = new String[] { NEWS_MATERIAL, RAW_NEWS_MATERIAL, ECHO_RECORDING, RECORDING, GENERIC }; - bottomTypeFilterNames = new String[] { ECHO_MATERIAL, MATERIAL, RAW_MATERIAL, ECHO_PROMO, PROMO, RAW_PROMO, - ECHO_AD, AD, RAW_AD }; + bottomTypeFilterNames = new String[] { ECHO_MATERIAL, MATERIAL, RAW_MATERIAL, ECHO_PROMO, PROMO, RAW_PROMO, ECHO_AD, AD, RAW_AD }; columnHeaders = new LinkedHashMap<>(); columnHeaders.put("ID", "mediahouseid"); @@ -201,9 +200,7 @@ public class SearchModel extends AsyncBaseModel { itemsGrid.setPageSize(SessionUtil.getUserPageSize()); setSettingsPageSize(itemsGrid.getPageSize()); if (!allChecked) - Clients.showNotification( - String.format( - "Figyelem!

A keresési paraméterek megváltoztak! "), + Clients.showNotification(String.format("Figyelem!

A keresési paraméterek megváltoztak! "), "warning", searchFiltersMenu, "end_center", 3000); } @@ -235,13 +232,11 @@ public class SearchModel extends AsyncBaseModel { @Command public void copyMediaIdToClipboard() { - String port = (Executions.getCurrent().getServerPort() == 80) ? "" - : (":" + Executions.getCurrent().getServerPort()); + String port = (Executions.getCurrent().getServerPort() == 80) ? "" : (":" + Executions.getCurrent().getServerPort()); String baseURL = Executions.getCurrent().getScheme() + "://" + Executions.getCurrent().getServerName() + port + Executions.getCurrent().getContextPath(); String url = String.format("%s/?%s=%d", baseURL, MEDIA_ID, selectedObject.getMedia().getId()); - String email = String.format("mailto:?subject=Média címe: %s &body=A média itt tekinthető meg: %s", - selectedObject.getMedia().getTitle(), url); + String email = String.format("mailto:?subject=Média címe: %s &body=A média itt tekinthető meg: %s", selectedObject.getMedia().getTitle(), url); // Toolkit toolkit = Toolkit.getDefaultToolkit(); // Clipboard clipboard = toolkit.getSystemClipboard(); // StringSelection strSel = new StringSelection(url); @@ -513,45 +508,43 @@ public class SearchModel extends AsyncBaseModel { } @Command - public void onTcIn(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception - { + public void onTcIn(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception { ////////////Végén törölni innen!!! - if (selectedObject == null) { + if (selectedObject == null) { selectedObject = new ArchivedMedia(); } ////////////Végén törölni eddig!!! - - JSONObject jsObject = (JSONObject)event.getData(); - Double doubleVar = 0.0; - if (!jsObject.get("meta").equals(0)){ - doubleVar = (Double)jsObject.get("meta"); + + JSONObject jsObject = (JSONObject) event.getData(); + Double doubleVar = 0.0; + if (!jsObject.get("meta").equals(0)) { + doubleVar = (Double) jsObject.get("meta"); } - - if (doubleVar.floatValue() >= ((selectedObject.getTcOut() == null)?9999999999999999999999.9:selectedObject.getTcOut())){ + + if (doubleVar.floatValue() >= ((selectedObject.getTcOut() == null) ? 9999999999999999999999.9 : selectedObject.getTcOut())) { throw new Exception("A kilépés időpontjának későbbinek kell lennie mint a belépés időpontja!"); - }else{ + } else { selectedObject.setTcIn(new Float(doubleVar.floatValue())); } } - + @Command - public void onTcOut(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception - { + public void onTcOut(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception { ////////////Végén törölni innen!!! - if (selectedObject == null) { + if (selectedObject == null) { selectedObject = new ArchivedMedia(); } ////////////Végén törölni eddig!!! - - JSONObject jsObject = (JSONObject)event.getData(); - Double doubleVar = 0.0; - if (!jsObject.get("meta").equals(0)){ - doubleVar = (Double)jsObject.get("meta"); + + JSONObject jsObject = (JSONObject) event.getData(); + Double doubleVar = 0.0; + if (!jsObject.get("meta").equals(0)) { + doubleVar = (Double) jsObject.get("meta"); } - - if (doubleVar.floatValue() <= ((selectedObject.getTcIn() == null)?0.0:selectedObject.getTcIn())){ + + if (doubleVar.floatValue() <= ((selectedObject.getTcIn() == null) ? 0.0 : selectedObject.getTcIn())) { throw new Exception("A kilépés időpontjának későbbinek kell lennie mint a belépés időpontja!"); - }else{ + } else { selectedObject.setTcOut(new Float(doubleVar.floatValue())); } } @@ -564,8 +557,7 @@ public class SearchModel extends AsyncBaseModel { @Command public void openMetaDataDialog() { String template = "/pages/metadatadetails.zul"; - Window window = (Window) Executions.createComponents(template, null, - ListUtils.asMap("selectedObject", selectedObject)); + Window window = (Window) Executions.createComponents(template, null, ListUtils.asMap("selectedObject", selectedObject)); window.doModal(); } @@ -583,8 +575,7 @@ public class SearchModel extends AsyncBaseModel { @Command @NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" }) - public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject, - @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) { + public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject, @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) { Event event = ctx.getTriggerEvent(); // Nem mindig a row a target, ha a kepre kattintunk akkor az image // selectedRowIndex = ((Row) event.getTarget()).getIndex(); @@ -678,7 +669,7 @@ public class SearchModel extends AsyncBaseModel { try { String video = getLowresMediaFilePath(); - if (video.contentEquals(null)) { + if (video == null) { Clients.evalJavaScript("setSource('/img/mediacube_logo_v2_50x50.png')"); } else { Clients.evalJavaScript("setSource('" + video + "')"); @@ -726,8 +717,7 @@ public class SearchModel extends AsyncBaseModel { private void showExternalMediaID() { String mediaID = SessionUtil.getQueryParameter(MEDIA_ID); if (mediaID != null) - searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList(), orderBy, - orderAscending); + searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList(), orderBy, orderAscending); } @Command @@ -740,9 +730,7 @@ public class SearchModel extends AsyncBaseModel { // preventAfterRender = true; if (activePageIndex != itemsGrid.getActivePage()) { itemsGrid.setActivePage(activePageIndex); - logger.info( - "Selected media is shown in the results, which can be found on {} page and also it will be highlighted.", - activePageIndex + 1); + logger.info("Selected media is shown in the results, which can be found on {} page and also it will be highlighted.", activePageIndex + 1); } else { onAfterRenderGrid(); logger.info("Selected media is shown in the results, which can be found on opened page."); diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java index 95c4b302..81f73ad4 100644 --- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java +++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java @@ -63,23 +63,28 @@ public class OctopusRESTService { StringBuilder sb = new StringBuilder(); List rundowns = ListUtils.cast(octopusService.getRundowns(null)); - SimpleDateFormat sdt = new SimpleDateFormat("yyyy.MM.dd HH:mm"); - sdt.setTimeZone(TimeZone.getTimeZone("Europe/Prague")); - for (BasicDBObject rundown : rundowns) { - String name = rundown.getString(IOctopusAPI.NAME); - if (name != null) { - int pos = name.lastIndexOf(" "); - pos = name.lastIndexOf(" ", pos - 1); - if (pos > 0) - name = name.substring(0, pos); + if (rundowns == null) { + sb.append(String.format("%s collection is empty!", IOctopusAPI.RUNDOWN_COLLECTION)); + } else { + SimpleDateFormat sdt = new SimpleDateFormat("yyyy.MM.dd HH:mm"); + sdt.setTimeZone(TimeZone.getTimeZone("Europe/Prague")); + for (BasicDBObject rundown : rundowns) { + String name = rundown.getString(IOctopusAPI.NAME); + + if (name != null) { + int pos = name.lastIndexOf(" "); + pos = name.lastIndexOf(" ", pos - 1); + if (pos > 0) + name = name.substring(0, pos); + } + + String date = sdt.format(rundown.getDate(IOctopusAPI.SCHEDULED_START)); + long id = rundown.getLong(IOctopusAPI.ID); + sb.append(String.format("[%s] %s
", id, date, name)); } - String date = sdt.format(rundown.getDate(IOctopusAPI.SCHEDULED_START)); - long id = rundown.getLong(IOctopusAPI.ID); - sb.append(String.format("[%s] %s
", id, date, name)); } - result = Response.ok(sb.toString()).build(); // String a = TimeZone.getDefault().getDisplayName(); // String b = TimeZone.getDefault().getID();