From: Márk Mérész Date: Fri, 20 Jul 2018 14:49:33 +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=b4919c74144e81078fb10fcebc878e8450cf2403;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31202 --- diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java index 4a8cb20d..1338315b 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java @@ -78,7 +78,7 @@ public class OutputPathAndNameSelectorStep extends JobStep { case 1: return localTargetInit(localRetrievePath, onlineOutputFolder, houseId, jobRuntime); case 2: - return new Object[] { null, houseId + TARGETNAMEPATTERN, true }; + return new Object[] { null, houseId, true }; } return result; } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java index b8242447..01a9b72d 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java @@ -30,10 +30,14 @@ public class TSMExtendedRetrieveStep extends TSMRestoreStep { FTPClient targetFTP = ((FtpDirectoryLister) targetUri.getLister()).connect(); Calendar killDate = CalendarUtils.createCalendar(new Date()); killDate.add(Calendar.DAY_OF_YEAR, killDateDays); + if (targetFileName.toLowerCase().contains(".mxf")) + targetFileName = targetFileName.substring(0, targetFileName.lastIndexOf('.')); byte[] killDateFile = EscortFiles.createNEXIOKillDateFile(targetFileName, killDate.getTime(), null, nexioAgency); - outStream = targetFTP.storeFileStream(targetFileName + ".xml"); + String xml = targetFileName + ".xml"; + outStream = targetFTP.storeFileStream(xml); if (outStream == null) { - throw new NullPointerException("Can not open: " + targetFileName + ".xml" + " Reply:" + targetFTP.getReplyString()); + throw new NullPointerException( + "Can not open: " + targetFileName.substring(0, targetFileName.lastIndexOf('.')) + ".xml" + " Reply:" + targetFTP.getReplyString()); } outStream.write(killDateFile); outStream.flush(); @@ -47,6 +51,13 @@ public class TSMExtendedRetrieveStep extends TSMRestoreStep { } } + @Override + protected void beforeRestore(StoreUri targetURI, String targetName) throws Exception { + if (useNexioTarget) + if (targetURI.fileExists(targetName + ".mxf")) + throw new Exception("The newly created file name is existed."); + } + @Override protected void checkTargetPath(String targetPath) { if (!useNexioTarget) @@ -93,6 +104,7 @@ public class TSMExtendedRetrieveStep extends TSMRestoreStep { if (nexioAgency == null) { throw new NullPointerException("System is not configured properly, 'nexioAgency' input parameter missing."); } + return super.execute(mediaCubeMedia, targetPath, targetNamePattern, successRecipient, killDateDays, localRetrievePath, globalRetrievePath, jobEngine, jobRuntime); } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java index 9b81e0e7..2c6dcfd4 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java @@ -39,6 +39,9 @@ public class TSMRestoreStep extends JobStep { EscortFiles.createUNCKillDate(targetPath, targetFileName, killDateDays, marker); } + protected void beforeRestore(StoreUri targetURI, String targetFileName) throws Exception { + } + protected void checkTargetPath(String targetPath) { if (StringUtils.isBlank(targetPath)) { logger.error(marker, "A folyamat 'targetPath' bemeneti paramétere üres."); @@ -54,10 +57,10 @@ public class TSMRestoreStep extends JobStep { public Object[] execute(Media mediaCubeMedia, String targetPath, String targetNamePattern, String successRecipient, int killDateDays, String localRetrievePath, String globalRetrievePath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { marker = jobRuntime.getMarker(); + String targetFileName = String.format(targetNamePattern, sourceFileName); setAndCheck(mediaCubeMedia, targetPath, targetNamePattern, localRetrievePath, globalRetrievePath, jobEngine); - String targetFileName = null; try { - // TODO check file existance? + beforeRestore(targetUri, targetNamePattern); final IJobRuntime runtime = jobRuntime; sourceUri.addProgressListener(new IProgressEventListener() { @Override @@ -71,7 +74,6 @@ public class TSMRestoreStep extends JobStep { evt.setCancel(!canContinue()); } }); - targetFileName = String.format(targetNamePattern, sourceFileName); RemoteFile result = sourceUri.transferFrom(targetUri, sourceFileName, targetFileName); String globalTargetPath = Paths.get(targetPath, targetFileName).getParent().toString().replace(Paths.get(localRetrievePath).toString(), diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul index d0cb6670..94b17065 100644 --- a/server/user.jobengine.osgi.server/pages/searchitems.zul +++ b/server/user.jobengine.osgi.server/pages/searchitems.zul @@ -74,8 +74,8 @@
- - + + @@ -100,7 +100,7 @@ + tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')" > 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 155790d0..43dd8d6c 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 @@ -35,6 +35,7 @@ import org.zkoss.zul.Combobox; import org.zkoss.zul.Detail; import org.zkoss.zul.Div; import org.zkoss.zul.Grid; +import org.zkoss.zul.Hbox; import org.zkoss.zul.Hlayout; import org.zkoss.zul.ListModelList; import org.zkoss.zul.Menuitem; @@ -50,6 +51,7 @@ import user.commons.StoreUri; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.ArchivedMedia; import user.jobengine.db.IItemManager; +import user.jobengine.db.ItemManager; import user.jobengine.db.MediaFile; import user.jobengine.db.Store; import user.jobengine.zk.util.SessionUtil; @@ -94,6 +96,9 @@ public class SearchModel extends AsyncBaseModel { @Wire Combobox search; + @Wire + Hbox searchFiltersMenu; + @Wire Menupopup searchSettings; @Wire @@ -110,6 +115,7 @@ public class SearchModel extends AsyncBaseModel { private Map columnOrder; public SearchModel() { + this.itemManager = ItemManager.getInstance(); typeFilters = new LinkedHashMap<>(); addTypeFilter(TypeFilter.as(NEWS_MATERIAL, "RED200", "ic_language_black_18dp.png")); addTypeFilter(TypeFilter.as(RAW_NEWS_MATERIAL, "RED100", "ic_perm_camera_mic_black_18dp.png")); @@ -181,6 +187,8 @@ public class SearchModel extends AsyncBaseModel { if (SessionUtil.getUserPageSize() != 0) itemsGrid.setPageSize(SessionUtil.getUserPageSize()); setSettingsPageSize(itemsGrid.getPageSize()); + if (!allChecked) + Clients.showNotification(String.format("Figyelem! A keresési paraméterek megváltoztak! "), "warning", searchFiltersMenu, "end_center", 3000); } private void clearAllFilters() {