From b92335b45ed432de54070d77b83c19aa11209bde Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Tue, 10 Apr 2018 14:43:59 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31015

---
 server/-configuration/scheduledjobs.json      |  36 ++++++++
 .../config/config.xml                         |   1 +
 .../jobtemplates/batch-retrieve-ondemand.xml  |  41 +++++++++
 .../server/steps/BatchRetrieveForkStep.java   |  56 ++++++++++++
 .../src/user/commons/nosql/NoSQLUtils.java    |   7 ++
 .../src/user/jobengine/db/ItemDAOEx.java      |   2 +-
 .../src/user/jobengine/db/Media.java          |   2 +-
 .../META-INF/MANIFEST.MF                      |   1 +
 .../css/archivum.css                          |   2 +-
 .../ic_remove_shopping_cart_black_18dp.png    | Bin 0 -> 221 bytes
 .../img/ic_search_black_18dp.png              | Bin 0 -> 215 bytes
 .../pages/mediaplayer.jsp                     |   3 +-
 .../pages/retrievebatchselector.zul           |  27 +++---
 .../pages/searchitems.zul                     |  76 +++++++++++------
 .../resources/i3-label_hu.properties          |   2 +-
 .../src/user/jobengine/server/IJobEngine.java |   3 +
 .../src/user/jobengine/server/JobEngine.java  |  19 +++++
 .../server/scheduler/SchedulerService.java    |  11 ++-
 .../user/jobengine/zk/model/MenuModel.java    |  31 +++++--
 .../zk/model/MissingMaterialsModel.java       |  20 +----
 .../zk/model/RetrieveBatchSelectorModel.java  |  80 ++++++++++++------
 .../zk/model/RetrieveSelectorModel.java       |  20 +++--
 .../user/jobengine/zk/model/SearchModel.java  |  55 +++++++++---
 23 files changed, 375 insertions(+), 120 deletions(-)
 create mode 100644 server/user.jobengine.executors/jobtemplates/batch-retrieve-ondemand.xml
 create mode 100644 server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java
 create mode 100644 server/user.jobengine.osgi.server/img/ic_remove_shopping_cart_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/ic_search_black_18dp.png

diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json
index b2fc4826..bf3faacb 100644
--- a/server/-configuration/scheduledjobs.json
+++ b/server/-configuration/scheduledjobs.json
@@ -1,4 +1,24 @@
 {"joblist":[
+	{
+	  "name" : "SYS: batch-retrieve-ondemand",
+      "template": "batch-retrieve-ondemand.xml",
+      "parameters": [ 
+      	{"name": "trafficOutputPath", "value": "/mnt/ISILON/PLAYOUT_NLE", "type": "java.lang.String"},
+      	{"name": "octopusOutputPath", "value": "/mnt/ISILON/OCTOPUS", "type": "java.lang.String"},
+      	{"name": "genericOutputPath", "value": "/mnt/ISILON/ARCHIVE_RESTORE", "type": "java.lang.String"},
+      	{"name": "killDateDays", "value": 7, "type": "java.lang.Integer"}
+      ]
+	},
+	{
+	  "name" : "SYS: retrieve-ondemand",
+      "template": "retrieve-ondemand.xml",
+      "parameters": [ 
+      	{"name": "trafficOutputPath", "value": "/mnt/ISILON/PLAYOUT_NLE", "type": "java.lang.String"},
+      	{"name": "octopusOutputPath", "value": "/mnt/ISILON/OCTOPUS", "type": "java.lang.String"},
+      	{"name": "genericOutputPath", "value": "/mnt/ISILON/ARCHIVE_RESTORE", "type": "java.lang.String"},
+      	{"name": "killDateDays", "value": 7, "type": "java.lang.Integer"}
+      ]
+	},
 	{
       "active": false,
       "executeimmediate": false,
@@ -206,6 +226,22 @@
       "template": "fake.xml",
       "cronexpression": "0 40 22 * * ?",
       "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ]
+	},
+	{
+      "active": false,
+      "executeimmediate": false,
+	  "name" : "",
+      "cronexpression": "",
+      "template": "retrieve-ondemand.xml",
+      "parameters": [ 
+      	{"name": "trafficOutputPath", "value": "/mnt/ISILON/PLAYOUT_NLE", "type": "java.lang.String"}, 
+      	{"name": "octopusOutputPath", "value": "/mnt/ISILON/OCTOPUS", "type": "java.lang.String"}, 
+      	{"name": "genericOutputPath", "value": "/mnt/ISILON/ARCHIVE_RESTORE", "type": "java.lang.String"},
+      	{"name": "basket", "type": "java.lang.ArrayList"},
+      	{"name": "houseId", "type": "java.lang.String"},
+      	{"name": "successRecipient", "type": "java.lang.String"},
+      	{"name": "killDateDays", "type": "java.lang.Integer"}
+      ]
 	}
 ]}
 
diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml
index 7331063b..5e56e335 100644
--- a/server/user.jobengine.executors/config/config.xml
+++ b/server/user.jobengine.executors/config/config.xml
@@ -2,6 +2,7 @@
 <executors>
 	<executor className="user.jobengine.server.steps.ArchiveListBuilderStep" maxConcurrent="1"/>
 	<executor className="user.jobengine.server.steps.ArchiveMaterialSubmitStep" maxConcurrent="1"/>
+	<executor className="user.jobengine.server.steps.BatchRetrieveForkStep" maxConcurrent="10"/>
 	<executor className="user.jobengine.server.steps.CheckMORPHEUSMissingMaterialsStep" maxConcurrent="1"/>
 	<executor className="user.jobengine.server.steps.CheckTRAFFICMissingMaterialsStep" maxConcurrent="1"/>
 	<executor className="user.jobengine.server.steps.CleanupMountedLocationStep" maxConcurrent="10"/>
diff --git a/server/user.jobengine.executors/jobtemplates/batch-retrieve-ondemand.xml b/server/user.jobengine.executors/jobtemplates/batch-retrieve-ondemand.xml
new file mode 100644
index 00000000..14cebcde
--- /dev/null
+++ b/server/user.jobengine.executors/jobtemplates/batch-retrieve-ondemand.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jobtemplate name="Archivált anyag visszatöltése" multiInstance="true">
+	<declarations>
+		<parameters>
+			<parameter name="trafficOutputPath" type="java.lang.String" />
+			<parameter name="octopusOutputPath" type="java.lang.String" />
+			<parameter name="genericOutputPath" type="java.lang.String" />
+			<parameter name="basket" type="java.util.ArrayList" />
+			<parameter name="houseId" type="java.lang.String" />
+			<parameter name="recipient" type="java.lang.String" />
+			<parameter name="killDateDays" type="java.lang.Integer"/>
+		</parameters>
+	</declarations>
+	<commands>
+		<calljobstep type="user.jobengine.server.steps.BatchRetrieveForkStep" weight="1">
+			<inputs>
+				<input>
+					<parameter name="trafficOutputPath" />
+				</input>
+				<input>
+					<parameter name="octopusOutputPath" />
+				</input>
+				<input>
+					<parameter name="genericOutputPath" />
+				</input>
+				<input>
+					<parameter name="basket" />
+				</input>
+				<input>
+					<parameter name="houseId" />
+				</input>
+				<input>
+					<parameter name="recipient" />
+				</input>
+				<input>
+					<parameter name="killDateDays" />
+				</input>
+			</inputs>
+		</calljobstep>
+	</commands>
+</jobtemplate>
\ No newline at end of file
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java
new file mode 100644
index 00000000..b743b704
--- /dev/null
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java
@@ -0,0 +1,56 @@
+package user.jobengine.server.steps;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import user.commons.MediaCubeMarker;
+import user.jobengine.db.Media;
+import user.jobengine.server.IJobEngine;
+import user.jobengine.server.IJobRuntime;
+import user.jobengine.server.scheduler.ScheduledJob;
+
+public class BatchRetrieveForkStep extends JobStep {
+	private static final Logger logger = LogManager.getLogger();
+	private static final String CHILD_TEMPLATE = "retrieve-ondemand.xml";
+	private static final String MEDIACUBEMEDIA = "mediaCubeMedia";
+	private static final String RECIPIENT = "successRecipient";
+	private static final String HOUSEID = "houseId";
+	private MediaCubeMarker marker;
+
+	@StepEntry
+	public Object[] execute(String trafficOutputPath, String octopusOutputPath, String genericOutputPath, List<Media> basket, String houseId, String recipient,
+			int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {
+		marker = (MediaCubeMarker) jobRuntime.getMarker();
+		marker.setTo(recipient);
+		setProgress(10);
+		if (jobRuntime.forkPrepare()) {
+			for (Media mediaCubeMedia : basket) {
+				submit(trafficOutputPath, octopusOutputPath, genericOutputPath, mediaCubeMedia, recipient, houseId, killDateDays, jobEngine, jobRuntime);
+			}
+		}
+		setProgress(50);
+		jobRuntime.forkWaitComplete();
+		setProgress(100);
+		return null;
+	}
+
+	public void submit(String trafficOutputPath, String octopusOutputPath, String genericOutputPath, Media mediaCubeMedia, String recipient, String houseId,
+			int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {
+		try {
+			ScheduledJob scheduledJob = jobEngine.getScheduledJob(CHILD_TEMPLATE);
+			Map<String, Object> parameters = scheduledJob.getJobParameters();
+			parameters.put(MEDIACUBEMEDIA, mediaCubeMedia);
+			parameters.put(HOUSEID, houseId);
+			parameters.put(RECIPIENT, recipient);
+			IJobRuntime child = jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE, String.format("Visszatöltés %s részére", recipient), parameters);
+		} catch (Exception e) {
+			logger.catching(e);
+			logger.error(marker, "Hiba a kötegelt visszatöltésben. A rendszer üzenete: {}", e.getMessage());
+		}
+
+	}
+
+}
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
index 4938a66a..a4705e22 100644
--- a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
@@ -27,6 +27,13 @@ public class NoSQLUtils {
 		obj.put(name, current + value);
 	}
 
+	public static boolean asBool(BasicDBObject obj, String name) {
+		boolean result = false;
+		if (obj != null && obj.containsKey(name))
+			result = obj.getBoolean(name);
+		return result;
+	}
+
 	public static BasicDBList asDBList(BasicDBObject obj, String name) {
 		BasicDBList result = null;
 		if (obj.containsKey(name) && (obj.get(name) instanceof BasicDBList))
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
index 4a248c2e..fe496d04 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
@@ -480,7 +480,7 @@ public class ItemDAOEx {
 					if (end > content.length() - 1)
 						end = content.length() - 1;
 
-					String relevant = content.substring(start, pos) + "<b>" + content.substring(pos, pos + c.length()) + "</b>"
+					String relevant = content.substring(start, pos) + "<span class='rhl'>" + content.substring(pos, pos + c.length()) + "</span>"
 							+ content.substring(pos + c.length(), end);
 
 					if (start > 0)
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java
index 696f24ba..3d2fdbc3 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java
@@ -9,7 +9,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import user.commons.TimestampAdapter;
 
 /**
- * Verzi� Pojo oszt�ly.
+ * Medi Pojo osztaly.
  *
  * @author User
  *
diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
index 51b3e221..1da0b30f 100644
--- a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
+++ b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
@@ -27,6 +27,7 @@ Export-Package: user.jobengine.osgi.server,
  user.jobengine.server.ast,
  user.jobengine.server.messagequeue,
  user.jobengine.server.messages,
+ user.jobengine.server.scheduler,
  user.jobengine.server.steps
 DynamicImport-Package: *
 Bundle-ClassPath: .,
diff --git a/server/user.jobengine.osgi.server/css/archivum.css b/server/user.jobengine.osgi.server/css/archivum.css
index 695d8905..51cd06c8 100644
--- a/server/user.jobengine.osgi.server/css/archivum.css
+++ b/server/user.jobengine.osgi.server/css/archivum.css
@@ -154,7 +154,7 @@ body *:not([class*="z-icon-"]) {
 
 .listbox-normal-style .z-listitem .z-listcell {
     border-left: 1px solid gray;
-    border-bottom: 1px solid blue;
+    border-bottom: 1px solid gray;
 }
 
 .z-treerow, .z-tree-body{
diff --git a/server/user.jobengine.osgi.server/img/ic_remove_shopping_cart_black_18dp.png b/server/user.jobengine.osgi.server/img/ic_remove_shopping_cart_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ba85743e8648928d48d8076583a017bf6c068f1
GIT binary patch
literal 221
zcmV<303!d1P)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0001_Nkl<ZcmZP|
z4oqceAgm~p;UDqJ7#XH9{KtT^h*4I6Y}#a?0H(6L3~b1XWEg&7Q5J^ovbjJ(RAt98
zov#m-LMXGrR8$WXKFDww>V+1DR7@rO44)ZR5(+m(pwumf17P?GY$;Zd!LSFY00Ix=
zGR=S?o`DO_E5>G;FvAa^a5tPk1L9M3Mc+{rbpv^SFfG+*h(lNhWF;_I5uZY)GB5xD
XGPh#kDu(pe00000NkvXXu0mjfb~jHw

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/ic_search_black_18dp.png b/server/user.jobengine.osgi.server/img/ic_search_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0d4e97577508554557c9073d1607218a48a9215
GIT binary patch
literal 215
zcmV;|04V>7P)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0001<Nkl<ZcmcJ_
zA#MUe6adgS8i&B5IKYaEJ<2*xfaL@=Ad$c+2npO^Bm!MWLeeVKAYf`qe$qAc>E|B|
z&Fvg5O@Qdb)zev4+)aswuD&#2<lvzd%sn*#1}^r3owHXfH^EW%YM}_0iV=Y1Bnu|)
z4hA6kRCOX#4;L#7C)Kx^MAX{5DYDK?wUzuS*{U}EZKGQEx3wQ*J(96E`vn_qFUyO~
RS0?}f002ovPDHLkV1l)CQ_=tc

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/pages/mediaplayer.jsp b/server/user.jobengine.osgi.server/pages/mediaplayer.jsp
index 5aec32ff..d51833ef 100644
--- a/server/user.jobengine.osgi.server/pages/mediaplayer.jsp
+++ b/server/user.jobengine.osgi.server/pages/mediaplayer.jsp
@@ -34,8 +34,7 @@
 <body>
 
 	<script>
-		console.log('URL is: <%=mediaURL%>
-		');
+		//console.log('URL is: <%=mediaURL%> ');
 	</script>
 	<center>
 	<video id="myVideoDiv"
diff --git a/server/user.jobengine.osgi.server/pages/retrievebatchselector.zul b/server/user.jobengine.osgi.server/pages/retrievebatchselector.zul
index 98045733..fcfd7e15 100644
--- a/server/user.jobengine.osgi.server/pages/retrievebatchselector.zul
+++ b/server/user.jobengine.osgi.server/pages/retrievebatchselector.zul
@@ -3,8 +3,8 @@
 	viewModel="@id('jlm') @init('user.jobengine.zk.model.RetrieveBatchSelectorModel')" onCancel="wndRetrieveBatch.detach()">
 	<grid>
 		<columns>
-			<column width="120px" />
-			<column width="100%" />
+			<column hflex="min" />
+			<column hflex="1" />
 		</columns>
 		<rows>
 			<row>
@@ -19,31 +19,36 @@
 			</row>
 			<row>
 				<cell colspan="2">
-					<listbox id="basketList" height="200px" sizedByContent="false" model="@load(jlm.basketItems)" multiple="true"
-						style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" emptyMessage="Üres">
+					<listbox ctrlKeys="#del" onCtrlKey="@command('remove')" height="400px" id="basketList" sizedByContent="false" model="@load(jlm.basketItems)" multiple="true" checkmark="true" 
+						style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" emptyMessage="Üres" 
+						selectedItems="@save(jlm.selectedItems)">
 						<listhead>
 							<listheader label="Azonosító" hflex="min" align="left" sort="auto" />
 							<listheader label="Cím" hflex="min" align="left" sort="auto" />
-							<listheader label="Filenév" hflex="min" align="left" sort="auto" />
+							<listheader label="Filenév" hflex="1" align="left" sort="auto" />
 						</listhead>
 
 						<template name="model">
 							<listitem>
 								<listcell label="@load(each.media.id)" />
 								<listcell label="@load(each.media.title)" />
-								<listcell label="@load(each.media.mediaFilesName)">></listcell>
+								<listcell label="@load(each.media.mediaFilesName)" />
 							</listitem>
 						</template>
 					</listbox>
 				</cell>
 			</row>
+			<row>
+				<cell colspan="2">
+					<toolbar vflex="min" style="font-size:8px">
+						<toolbarbutton id="remove" image="/img/ic_remove_shopping_cart_black_18dp.png" autodisable="self" onClick="@command('remove')"/>
+					</toolbar>
+				</cell>
+			</row>
 		</rows>
 	</grid>
-	<vbox>
-
-	</vbox>
-	<hbox width="100%" pack="center">
+	<hbox width="100%" pack="center" align="center">
 		<button id="cancel" label="Mégsem" autodisable="execute,cancel" onClick="wndRetrieveBatch.detach()" />
-		<button id="execute" label="Végrehajtás" autodisable="execute,cancel" onClick="@command('execute')" />
+		<button id="execute" label="Végrehajtás" autodisable="execute,cancel" disabled="@load(jlm.disabled)" onClick="@command('execute')" />
 	</hbox>
 </window>
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 9fcd7c2a..6d4ea9c0 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -12,7 +12,6 @@
 	<style>
 .myimg {
 	margin: 5px; border: 1px solid #CFCFCF;
-	cursor: pointer;
 }
 div.z-row-content span {
 	font-family: Tahoma,Arial,serif;
@@ -21,34 +20,61 @@ div.z-row-content span {
     padding: 3px 6px;
 }
 .heavy {
-	font-weight:bold;
+	font-weight: bold;
+	font-family: Tahoma,Arial,serif;
+}
+.ir {
+	font-weight: bold;
+	font-family: Tahoma,Arial,serif;
+	text-color: green;
 }
-
 .details {
     padding: 5px;
     line-height: 1.5em;
 	font-size: 10px;
-	border-bottom: 1px solid #ebebeb;
 }
 .relevant {
     padding: 8px;
 	font-size: 10px;
+}
+.rhl {
+	color: #E53935;
+	font-weight: bold;
+}
+
+.z-row:hover > .z-row-inner, .z-row:hover > .z-cell {
+        background: none;
+}
+.z-row:hover>.z-row-inner>.z-row-content{
+		text-color: black;
 }
 	</style>
 	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">
 		<timer id="timer" delay="100" repeats="true" onTimer="@command('uiTick')" />
 		<borderlayout>
-			<west border="none" size="60%" splittable="true" minsize="250">
+			<west border="none" size="60%" splittable="true" minsize="500">
 				<div height="100%" width="100%">
 					<groupbox vflex="min" closable="false">
-						<textbox style="border:none" instant="true" value="@bind(vm.searchValue)" width="100%"
-							tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')" />
-						<toolbar vflex="min" style="font-size:8px">
-							<checkbox checked="@bind(vm.allChecked)" />
-							<forEach items="@load(vm.typeFilterNames)" >
-								<toolbarbutton label="@load(each)" mode="toggle" checked="@bind(vm.typeFilters[each]) @validator(vm.allFilterCheckedValidator)" />
-							</forEach>							
-						</toolbar>
+						<hbox hflex="1" pack="center" align="center">
+							<button hflex="min" label="Típusok" popup="filter"/>
+							<textbox focus="true" width="300px" instant="true" value="@bind(vm.searchValue)"  tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')" />
+							<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" />
+							<popup id="filter">
+								<vlayout vflex="min">
+									<checkbox label="Összes típus" checked="@bind(vm.allChecked)" />
+									<separator/>
+									<forEach items="@load(vm.typeFilterNames)" >
+										<checkbox label="@load(each)" checked="@bind(vm.typeFilters[each]) @validator(vm.allFilterCheckedValidator)" />
+									</forEach>							
+								</vlayout>						    
+						    </popup>							
+						</hbox>
+<!-- 						<toolbar style="font-size:8px"> -->
+<!-- 							<checkbox checked="@bind(vm.allChecked)" /> -->
+<!-- 							<forEach items="@load(vm.typeFilterNames)" > -->
+<!-- 								<toolbarbutton label="@load(each)" mode="toggle" checked="@bind(vm.typeFilters[each]) @validator(vm.allFilterCheckedValidator)" /> -->
+<!-- 							</forEach>							 -->
+<!-- 						</toolbar> -->
 					</groupbox>
 					<groupbox vflex="true" closable="false">
 						<grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"
@@ -67,28 +93,24 @@ div.z-row-content span {
 								<column label="Fájlnév" hflex="min" align="left" />
 								<column label="Megtekinthető" hflex="min" align="right" />
 							</columns>
-							<rows id="rows">
+							<rows id="rows" style="cursor: pointer;" >
 								<template name="model">
-									<row onClick="@command('selectMediaArchive', selectedObject=each)">
-<!-- 										<attribute name="style" if="${vm.isSelected(each)}"> -->
-<!-- 											background: green; -->
-<!-- 										</attribute>												 -->
-<!-- 										<attribute name="style" if="${not vm.isSelected(each)}"> -->
-<!-- 											background: white; -->
-<!-- 										</attribute>												 -->
-										<detail open="@load(vm.rowsExpanded)" style="border-bottom: 1px solid gray">
-											<hlayout>
+									<row onClick="@command('selectMediaArchive', selectedObject=each)" onMouseOver="@Command('rowMouseOver', evt=event)" onMouseOut="@Command('rowMouseOut', evt=event)"
+									style="background: none;">
+										<detail open="@load(vm.rowsExpanded)">
+											<hlayout style="border-bottom: 1px solid #ebebeb; width: 100%;">
 												<image tooltiptext="Kattints a lejátszáshoz!" width="140px" height="90px" 
 												sclass="myimg" content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')" 
 												onClick="@command('selectMediaArchive', selectedObject=each)" />
 												<div sclass="details">
 													<div>
-														<label style="border-left: 1px solid #008AC8; border-bottom: 1px solid #008AC8; padding: 4px; margin: 2px" value="@load(each.media.itemType.name)" />
 														<label style="font: 20px Century Gothic; color: #008AC8;" value="@load(each.item.title)" />
+														<label style="" value="@load(each.media.length)" />
+														<label style="border-left: 1px solid #008AC8; border-bottom: 1px solid #008AC8; padding: 4px;" value="@load(each.media.itemType.name)" />
 													</div>
 													<html sclass="relevant">
 													<![CDATA[
-													    <div>${each.relevant}</div>
+													    <div style='width: 90%'>${each.relevant}</div>
 													]]>
 													</html>													
 												</div>
@@ -97,7 +119,7 @@ div.z-row-content span {
 										<checkbox checked="@save(vm.itemSelected) @validator(vm.itemSelectedValidator, arg=each)" />
 										<label value="@load(each.media.houseId)" />
 										<label value="@load(each.media.title)" />
-										<label value="@load(each.media.houseId)" />
+										<label value="@load(each.media.mediaFilesName)" />
 										<checkbox checked="@load(each.media.mediaFilesCount > 1)" w:onCheck="this.setChecked(!this.isChecked())" />
 									</row>
 								</template>
@@ -122,7 +144,7 @@ div.z-row-content span {
 
 						<groupbox closable="false" mold="3d" width="100%" height="100%">
 							<caption>
-								<button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not vm.hasTSMMediaFile)"
+								<button label="Kosárba" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not vm.hasTSMMediaFile)"
 									sclass="buttonboldfont" />
 							</caption>
 
diff --git a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
index 31802809..893d9e3c 100644
--- a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
+++ b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
@@ -1,4 +1,4 @@
-version=2.3.3
+version=2.3.4
 footer=2016 © Copyright User Rendszerház Kft.
 
 login_info=Információ
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngine.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngine.java
index 7de9089b..e6f53d7c 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngine.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngine.java
@@ -6,6 +6,7 @@ import user.commons.Job;
 import user.jobengine.db.IItemManager;
 import user.jobengine.server.messagequeue.IUserMessageQueues;
 import user.jobengine.server.messages.IJobMessage;
+import user.jobengine.server.scheduler.ScheduledJob;
 import user.jobengine.server.scheduler.SchedulerService;
 
 public interface IJobEngine {
@@ -59,6 +60,8 @@ public interface IJobEngine {
 
 	Map<String, IProgram> getPrograms();
 
+	ScheduledJob getScheduledJob(String template);
+
 	SchedulerService getScheduler();
 
 	IUserMessageQueues getUserMessageQueues();
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java
index e35b6c61..80d4429e 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java
@@ -22,10 +22,13 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.ibm.nosql.json.api.BasicDBObject;
+
 import user.commons.Job;
 import user.commons.JobStatus;
 import user.commons.RemoteFile;
 import user.commons.StoreUri;
+import user.commons.nosql.NoSQLUtils;
 import user.commons.remotestore.DirectoryUtils;
 import user.commons.remotestore.RemoteStoreProtocol;
 import user.jobengine.db.IItemManager;
@@ -43,6 +46,7 @@ import user.jobengine.server.messagequeue.UserMessageQueues;
 import user.jobengine.server.messages.IJobMessage;
 import user.jobengine.server.messages.JobStepCompletedMessage;
 import user.jobengine.server.messages.UserReplyMessage;
+import user.jobengine.server.scheduler.ScheduledJob;
 import user.jobengine.server.scheduler.SchedulerService;
 import user.jobengine.server.steps.IJobStep;
 import user.tsm.client.TSMClient;
@@ -430,6 +434,21 @@ public class JobEngine implements IJobEngine {
 		return programs;
 	}
 
+	@Override
+	public ScheduledJob getScheduledJob(String template) {
+		List<BasicDBObject> jobs = NoSQLUtils.asList(schedulerService.getScheduleJobs());
+		BasicDBObject importJob = null;
+		for (BasicDBObject job : jobs) {
+			if (template.equals(job.getString("template"))) {
+				importJob = job;
+				break;
+			}
+		}
+		if (importJob == null)
+			throw new NullPointerException("Missing template: " + template);
+		return schedulerService.createScheduledJob(importJob);
+	}
+
 	@Override
 	public SchedulerService getScheduler() {
 		return schedulerService;
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/scheduler/SchedulerService.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/scheduler/SchedulerService.java
index cd4722f0..dd93f699 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/scheduler/SchedulerService.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/scheduler/SchedulerService.java
@@ -32,6 +32,7 @@ import com.ibm.nosql.json.JSONUtil;
 import com.ibm.nosql.json.api.BasicDBList;
 import com.ibm.nosql.json.api.BasicDBObject;
 
+import user.commons.nosql.NoSQLUtils;
 import user.jobengine.server.IJobEngine;
 
 /**
@@ -68,15 +69,17 @@ public class SchedulerService {
 		sj.setJobId(String.format("%s.%s", template, name));
 		sj.setJobName(name);
 		sj.setTemplateName(template);
-		sj.setCronExpressions(jobJSON.getString("cronexpression"));
-		sj.setExecuteOnStartup(jobJSON.getBoolean("executeimmediate"));
-		sj.setActive(jobJSON.getBoolean("active"));
+		sj.setCronExpressions(NoSQLUtils.asString(jobJSON, "cronexpression"));
+		sj.setExecuteOnStartup(NoSQLUtils.asBool(jobJSON, "executeimmediate"));
+		sj.setActive(NoSQLUtils.asBool(jobJSON, "active"));
 
 		BasicDBList jobParams = (BasicDBList) jobJSON.get("parameters");
 		if (jobParams != null) {
 			for (int p = 0; p < jobParams.size(); p++) {
 				BasicDBObject jsParam = (BasicDBObject) jobParams.get(p);
 				String stringValue = jsParam.getString("value");
+				if (stringValue == null)
+					continue;
 				try {
 					Class<?> clazz = Class.forName(jsParam.getString("type"));
 					Object value = parseObjectFromString(stringValue, clazz);
@@ -171,7 +174,7 @@ public class SchedulerService {
 				try {
 					sj = createScheduledJob(sjob);
 				} catch (Exception e) {
-					logger.error("Error creating job: {}", sj);
+					logger.error("Error creating job: {}", sjob);
 				}
 				//skip inactive jobs
 				if (!sj.isActive())
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
index a247c036..d82eb2bd 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
@@ -12,11 +12,11 @@ import org.zkoss.bind.annotation.AfterCompose;
 import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.ContextParam;
 import org.zkoss.bind.annotation.ContextType;
-import org.zkoss.bind.annotation.NotifyChange;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.select.Selectors;
 import org.zkoss.zk.ui.select.annotation.Wire;
+import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Include;
 import org.zkoss.zul.Menuitem;
 import org.zkoss.zul.Window;
@@ -44,7 +44,12 @@ public class MenuModel extends BaseModel {
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
 		Selectors.wireEventListeners(view, this);
-		//Clients.showNotification("Új funkció, kötegelt visszaigényléshez.", "info", basketIMenuItem, "end_center", 3000);
+	}
+
+	public void clearBasket() {
+		basketItems.clear();
+		basketMenuLabel = String.format("(%d)", basketItems.size());
+		BindUtils.postNotifyChange(null, null, this, "basketMenuLabel");
 	}
 
 	@Command
@@ -53,15 +58,19 @@ public class MenuModel extends BaseModel {
 		Executions.sendRedirect("/");
 	}
 
+	public List<ArchivedMedia> getBasketItems() {
+		return basketItems;
+	}
+
 	public String getBasketMenuLabel() {
 		return basketMenuLabel;
 	}
 
-	public List<ArchivedMedia> getBasketItems() {
-		return basketItems;
+	public void removeBasketItems(List<ArchivedMedia> items) {
+		basketItems.removeAll(items);
+		updateBasketLabel();
 	}
 
-	@NotifyChange("basketMenuLabel")
 	public void selectArchivedMedia(ArchivedMedia item, boolean select) {
 		if (item == null) {
 			logger.warn("Item to select is null");
@@ -70,15 +79,16 @@ public class MenuModel extends BaseModel {
 		if (basketItems == null)
 			basketItems = new ArrayList<>();
 		if (select) {
-			if (!basketItems.contains(item))
+			if (!basketItems.contains(item)) {
 				basketItems.add(item);
+				Clients.showNotification(String.format("Hozzáadva: %s", item.getMedia().getMediaFilesName()), "info", basketIMenuItem, "start_center", 2000);
+			}
 		} else {
 			if (basketItems.contains(item))
 				basketItems.remove(item);
 		}
 		logger.info("SelectedItems: {}", basketItems.size());
-		basketMenuLabel = String.format("(%d)", basketItems.size());
-		BindUtils.postNotifyChange(null, null, this, "basketMenuLabel");
+		updateBasketLabel();
 	}
 
 	@Command
@@ -89,4 +99,9 @@ public class MenuModel extends BaseModel {
 		window.doModal();
 	}
 
+	private void updateBasketLabel() {
+		basketMenuLabel = String.format("(%d)", basketItems.size());
+		BindUtils.postNotifyChange(null, null, this, "basketMenuLabel");
+	}
+
 }
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java
index 36fbc9c7..83902809 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java
@@ -29,7 +29,6 @@ import user.jobengine.server.IJobRuntime;
 import user.jobengine.server.JobChangedEvent;
 import user.jobengine.server.JobEngine;
 import user.jobengine.server.scheduler.ScheduledJob;
-import user.jobengine.server.scheduler.SchedulerService;
 import user.jobengine.zk.util.SessionUtil;
 
 public class MissingMaterialsModel extends AsyncBaseModel implements IJobChangedListener {
@@ -38,7 +37,6 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 	private static final String IMPORT_DISABLED = "importDisabled";
 	private static final String IMPORT_TEMPLATE = "import-morpheus-missing-materials.xml";
 	private static final String RETRIEVE_TEMPLATE = "retrieve-missing-material.xml";
-	private static final String TEMPLATE = "template";
 	private ListModelList<BasicDBObject> jobList = new ListModelList<BasicDBObject>();
 	private Set<BasicDBObject> selectedJobs;
 	private IJobEngine jobEngine = null;
@@ -101,22 +99,6 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 		}
 	}
 
-	private ScheduledJob getImportScheduledJob() {
-		SchedulerService scheduler = jobEngine.getScheduler();
-		List<BasicDBObject> jobs = NoSQLUtils.asList(scheduler.getScheduleJobs());
-		BasicDBObject importJob = null;
-		for (BasicDBObject job : jobs) {
-			if (isImportJob(job.getString(TEMPLATE))) {
-				importJob = job;
-				//logger.info(job.toString());
-				break;
-			}
-		}
-		if (importJob == null)
-			throw new NullPointerException("Nem található az import sablon.");
-		return scheduler.createScheduledJob(importJob);
-	}
-
 	public ListModelList<BasicDBObject> getJobList() {
 		return jobList;
 	}
@@ -143,7 +125,7 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 			if (jobEngine == null)
 				throw new Exception("Belső hiba! A JobEngine szolgáltatás elérhetetlen.");
 
-			importJob = getImportScheduledJob();
+			importJob = jobEngine.getScheduledJob(IMPORT_TEMPLATE);
 
 			List<IJobRuntime> jobRuntimes = new ArrayList<>(jobEngine.getJobs().values());
 			Optional<IJobRuntime> findFirst = jobRuntimes.stream().filter(jobRuntime -> isImportJob(jobRuntime.getTemplate())).findFirst();
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java
index 461ac69e..13b30a59 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java
@@ -2,6 +2,7 @@ package user.jobengine.zk.model;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -11,42 +12,39 @@ import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.ContextParam;
 import org.zkoss.bind.annotation.ContextType;
 import org.zkoss.bind.annotation.Init;
-import org.zkoss.util.resource.Labels;
+import org.zkoss.bind.annotation.NotifyChange;
 import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.select.Selectors;
 import org.zkoss.zk.ui.select.annotation.Wire;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Window;
 
-import user.commons.ListUtils;
 import user.jobengine.db.ArchivedMedia;
 import user.jobengine.db.Media;
 import user.jobengine.server.IJobEngine;
-import user.jobengine.server.IJobRuntime;
 import user.jobengine.server.JobEngine;
+import user.jobengine.server.scheduler.ScheduledJob;
 import user.jobengine.zk.util.SessionUtil;
 
 public class RetrieveBatchSelectorModel extends BaseModel {
 	private static final Logger logger = LogManager.getLogger();
-	private static final String KILLDATEDAYS = "killDateDays";
-	private static final String MEDIACUBEMEDIA = "mediaCubeMedia";
-	private static final String SUCCESSRECIPIENT = "successRecipient";
-	private static final String GENERICOUTPUTPATH = "genericOutputPath";
-	private static final String OCTOPUSOUTPUTPATH = "octopusOutputPath";
-	private static final String TRAFFICOUTPUTPATH = "trafficOutputPath";
+	private static final String BASKET = "basket";
+	private static final String RECIPIENT = "recipient";
 	private static final String HOUSEID = "houseId";
 	private static final String RESTORE = "Visszatöltés";
-	private static final String JOBTEMPLATE = "retrieve-ondemand.xml";
+	private static final String JOBTEMPLATE = "batch-retrieve-ondemand.xml";
+	private List<ArchivedMedia> selectedItems;
+	private boolean disabled;
 
 	@Wire()
 	private Window wndRetrieveBatch;
-	private Media selectedMedia;
 	private String houseId;
 	private String email;
+	private MenuModel menuModel;
 
 	@AfterCompose
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
+		menuModel = (MenuModel) SessionUtil.getAttribute(SessionUtil.MENUMODEL);
 		Selectors.wireComponents(view, this, false);
 	}
 
@@ -56,30 +54,35 @@ public class RetrieveBatchSelectorModel extends BaseModel {
 	}
 
 	@Command
+	@NotifyChange("basketItems")
 	public void execute() {
 		try {
 			if (StringUtils.isBlank(houseId))
 				throw new Exception("Az azonosító megadása kötelező!");
 			if (StringUtils.isBlank(email))
 				throw new Exception("Az értesítési cím megadása kötelező!");
-			String trafficOutputPath = "/mnt/ISILON/PLAYOUT_NLE";
-			String octopusOutputPath = "/mnt/ISILON/OCTOPUS";
-			String genericOutputPath = "/mnt/ISILON/ARCHIVE_RESTORE";
-			Map<String, Object> parameters = ListUtils.asMap(TRAFFICOUTPUTPATH, trafficOutputPath, OCTOPUSOUTPUTPATH, octopusOutputPath, GENERICOUTPUTPATH,
-					genericOutputPath, MEDIACUBEMEDIA, this.selectedMedia, HOUSEID, houseId, SUCCESSRECIPIENT, email, KILLDATEDAYS, 7);
+
 			IJobEngine jobEngine = JobEngine.getInstance();
-			IJobRuntime runtime1 = jobEngine.submit(JOBTEMPLATE, RESTORE, parameters);
-			close();
+			ScheduledJob scheduledJob = jobEngine.getScheduledJob(JOBTEMPLATE);
+			Map<String, Object> parameters = scheduledJob.getJobParameters();
+			parameters.put(HOUSEID, houseId);
+			parameters.put(RECIPIENT, email);
+			parameters.put(BASKET, getMedias());
+			jobEngine.submit(JOBTEMPLATE, RESTORE, parameters);
+
+			menuModel.clearBasket();
+			SessionUtil.getUserPrincipal().setEmail(email);
+			wndRetrieveBatch.detach();
 		} catch (Exception e) {
-			Messagebox.show(e.getMessage(), Labels.getLabel("dialogger.warning"), Messagebox.OK, Messagebox.ERROR, defaultOKEventListener);
+			Messagebox.show(e.getMessage());
 			logger.catching(e);
 		}
 
 	}
 
 	public List<ArchivedMedia> getBasketItems() {
-		MenuModel model = (MenuModel) SessionUtil.getAttribute(SessionUtil.MENUMODEL);
-		return model.getBasketItems();
+		setDisabled(menuModel.getBasketItems() == null || menuModel.getBasketItems().size() == 0);
+		return menuModel.getBasketItems();
 	}
 
 	public String getEmail() {
@@ -90,13 +93,37 @@ public class RetrieveBatchSelectorModel extends BaseModel {
 		return houseId;
 	}
 
+	private List<Media> getMedias() {
+		List<ArchivedMedia> basket = getBasketItems();
+		List<Media> result = basket.stream().map(i -> {
+			return i.getMedia();
+		}).collect(Collectors.toList());
+		return result;
+	}
+
+	public List<ArchivedMedia> getSelectedItems() {
+		return selectedItems;
+	}
+
 	@Init
 	public void init() {
-		Map<?, ?> args = Executions.getCurrent().getArg();
-		this.selectedMedia = (Media) args.get(MEDIACUBEMEDIA);
 		setEmail(SessionUtil.getUserPrincipal().getEmail());
 	}
 
+	public boolean isDisabled() {
+		return disabled;
+	}
+
+	@Command
+	@NotifyChange({ "basketItems", "selectedItems" })
+	public void remove() {
+		menuModel.removeBasketItems(selectedItems);
+	}
+
+	public void setDisabled(boolean disabled) {
+		this.disabled = disabled;
+	}
+
 	public void setEmail(String email) {
 		this.email = email;
 	}
@@ -104,4 +131,9 @@ public class RetrieveBatchSelectorModel extends BaseModel {
 	public void setHouseId(String houseId) {
 		this.houseId = houseId;
 	}
+
+	public void setSelectedItems(List<ArchivedMedia> selectedItems) {
+		this.selectedItems = selectedItems;
+	}
+
 }
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveSelectorModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveSelectorModel.java
index f2c7821e..5d633e2b 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveSelectorModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveSelectorModel.java
@@ -21,8 +21,8 @@ import org.zkoss.zul.Window;
 import user.commons.ListUtils;
 import user.jobengine.db.Media;
 import user.jobengine.server.IJobEngine;
-import user.jobengine.server.IJobRuntime;
 import user.jobengine.server.JobEngine;
+import user.jobengine.server.scheduler.ScheduledJob;
 import user.jobengine.zk.util.SessionUtil;
 
 public class RetrieveSelectorModel extends BaseModel {
@@ -60,13 +60,19 @@ public class RetrieveSelectorModel extends BaseModel {
 				throw new Exception("Az azonosító megadása kötelező!");
 			if (StringUtils.isBlank(email))
 				throw new Exception("Az értesítési cím megadása kötelező!");
-			String trafficOutputPath = "/mnt/ISILON/PLAYOUT_NLE";
-			String octopusOutputPath = "/mnt/ISILON/OCTOPUS";
-			String genericOutputPath = "/mnt/ISILON/ARCHIVE_RESTORE";
-			Map<String, Object> parameters = ListUtils.asMap(TRAFFICOUTPUTPATH, trafficOutputPath, OCTOPUSOUTPUTPATH, octopusOutputPath, GENERICOUTPUTPATH,
-					genericOutputPath, MEDIACUBEMEDIA, this.selectedMedia, HOUSEID, houseId, SUCCESSRECIPIENT, email, KILLDATEDAYS, 7);
+
 			IJobEngine jobEngine = JobEngine.getInstance();
-			IJobRuntime runtime1 = jobEngine.submit(JOBTEMPLATE, RESTORE, parameters);
+			ScheduledJob scheduledJob = jobEngine.getScheduledJob(JOBTEMPLATE);
+
+			Map<String, Object> jobParameters = scheduledJob.getJobParameters();
+			String trafficOutputPath = (String) jobParameters.get(TRAFFICOUTPUTPATH);
+			String octopusOutputPath = (String) jobParameters.get(OCTOPUSOUTPUTPATH);
+			String genericOutputPath = (String) jobParameters.get(GENERICOUTPUTPATH);
+			int killDateDays = (int) jobParameters.get(KILLDATEDAYS);
+
+			Map<String, Object> parameters = ListUtils.asMap(TRAFFICOUTPUTPATH, trafficOutputPath, OCTOPUSOUTPUTPATH, octopusOutputPath, GENERICOUTPUTPATH,
+					genericOutputPath, MEDIACUBEMEDIA, this.selectedMedia, HOUSEID, houseId, SUCCESSRECIPIENT, email, KILLDATEDAYS, killDateDays);
+			jobEngine.submit(JOBTEMPLATE, RESTORE, parameters);
 			close();
 		} catch (Exception e) {
 			Messagebox.show(e.getMessage(), Labels.getLabel("dialogger.warning"), Messagebox.OK, Messagebox.ERROR, defaultOKEventListener);
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 726cd1db..9782e025 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
@@ -3,7 +3,6 @@ package user.jobengine.zk.model;
 import java.net.URL;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -20,15 +19,16 @@ import org.zkoss.bind.annotation.ContextParam;
 import org.zkoss.bind.annotation.ContextType;
 import org.zkoss.bind.annotation.NotifyChange;
 import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.MouseEvent;
 import org.zkoss.zk.ui.select.Selectors;
 import org.zkoss.zk.ui.select.annotation.Wire;
 import org.zkoss.zul.Checkbox;
+import org.zkoss.zul.Detail;
 import org.zkoss.zul.Grid;
+import org.zkoss.zul.Hlayout;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Row;
 import org.zkoss.zul.Rows;
-import org.zkoss.zul.Window;
 
 import user.commons.StoreUri;
 import user.commons.remotestore.RemoteStoreProtocol;
@@ -104,7 +104,6 @@ public class SearchModel extends AsyncBaseModel {
 				} catch (Exception e) {
 
 				}
-				updateAllChecked();
 			}
 		};
 	}
@@ -136,10 +135,13 @@ public class SearchModel extends AsyncBaseModel {
 	public void downloadMedia() {
 		if (!getHasTSMMediaFile())
 			return;
-		Map<String, Object> arguments = new HashMap<String, Object>();
-		arguments.put(MEDIACUBEMEDIA, this.selectedObject.getMedia());
-		Window window = (Window) Executions.createComponents(PAGES_RETRIEVESELECTOR_ZUL, null, arguments);
-		window.doModal();
+		//		Map<String, Object> arguments = new HashMap<String, Object>();
+		//		arguments.put(MEDIACUBEMEDIA, this.selectedObject.getMedia());
+		//		Window window = (Window) Executions.createComponents(PAGES_RETRIEVESELECTOR_ZUL, null, arguments);
+		//		window.doModal();
+
+		MenuModel model = (MenuModel) SessionUtil.getAttribute(SessionUtil.MENUMODEL);
+		model.selectArchivedMedia(this.selectedObject, true);
 	}
 
 	public int getActivePage() {
@@ -255,6 +257,29 @@ public class SearchModel extends AsyncBaseModel {
 		return typeFilters;
 	}
 
+	private void highlight(ArchivedMedia am, boolean highlight) {
+		if (am == null)
+			return;
+		List<Component> components = itemsGrid.getRows().getChildren();
+		for (int i = 0; i < components.size(); i++) {
+			Row row = (Row) components.get(i);
+			if (am == row.getValue()) {
+				Detail detail = (Detail) row.getChildren().get(0);
+				Hlayout hlayout = (Hlayout) detail.getChildren().get(0);
+				if (highlight) {
+					row.setStyle("background: #F1F8E9;");
+					hlayout.setStyle("border-bottom: 1px solid #C5E1A5; background: #F1F8E9;");
+				} else {
+					row.setStyle("background: none;");
+					hlayout.setStyle("border-bottom: 1px solid #ebebeb; background: none;");
+				}
+				break;
+
+			}
+		}
+
+	}
+
 	public boolean isAllChecked() {
 		return allChecked;
 	}
@@ -277,21 +302,23 @@ public class SearchModel extends AsyncBaseModel {
 		//			Clients.scrollIntoView(rows);
 	}
 
-	//	public void rowSelected(@BindingParam("item") Object media, @BindingParam("isChecked") boolean isChecked) {
 	@Command
-	public void rowSelected(@BindingParam("isChecked") boolean isChecked) {
-		logger.info(isChecked);
+	public void rowMouseOut(@BindingParam("evt") MouseEvent event) {
+		logger.info(event);
 	}
 
-	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
-	public void selectedMediaArchive(ArchivedMedia selectedObject) {
-		this.selectedObject = selectedObject;
+	//	public void rowSelected(@BindingParam("item") Object media, @BindingParam("isChecked") boolean isChecked) {
+	@Command
+	public void rowMouseOver(@BindingParam("evt") MouseEvent event) {
+		logger.info(event);
 	}
 
 	@Command
 	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
 	public void selectMediaArchive(@BindingParam("selectedObject") ArchivedMedia selectedObject) {
+		highlight(this.selectedObject, false);
 		this.selectedObject = selectedObject;
+		highlight(this.selectedObject, true);
 	}
 
 	public void setActivePage(int activePage) {
-- 
2.54.0