From ea2f231ad86e5cb6565105f680fc81ce320ca143 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Sun, 2 Feb 2014 23:37:50 +0000
Subject: [PATCH] fix duplicate check

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1775 2a923420-c742-0410-a762-8d5b09965624
---
 var/mongoose/html/browse/assets.jim | 11 ++++++++---
 var/mongoose/html/browse/script.js  | 17 ++++++++++++++++-
 var/mongoose/lib/rsv.class          |  3 ++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/var/mongoose/html/browse/assets.jim b/var/mongoose/html/browse/assets.jim
index a3b763e..4b90144 100755
--- a/var/mongoose/html/browse/assets.jim
+++ b/var/mongoose/html/browse/assets.jim
@@ -209,7 +209,10 @@ puts {
 <div id=savestreamform title="Save streamed content"
     style="display: none">
 	<div class=pre id=savestream_detail></div>
-	<form id=savestream_form>
+	<div id=savestream_retrieving>
+		<img src=/img/loading.gif> Retrieving details...
+	</div>
+	<form id=savestream_form class=hidden>
 }
 puts "<input type=hidden name=dir value=\"$dir\">"
 puts {
@@ -217,7 +220,7 @@ puts {
 	<tr>
 	<th>
 		<label for="savestream_name">
-			<b>Filename</b>
+			<b>Enter Filename</b>
 		</label>
 	</th>
 	<td>
@@ -225,7 +228,9 @@ puts {
 		    id="savestream_name"
 		    value="" size=70 maxlength=255
 		    class="text ui-widget-content ui-corner-all">
-		<img id=savestream_spin src=/img/loading.gif>
+		<span id=savestream_spin>
+			<img src=/img/loading.gif> Saving...
+		</span>
 	</td>
 	</tr>
 	</table>
diff --git a/var/mongoose/html/browse/script.js b/var/mongoose/html/browse/script.js
index ac56480..15ffca2 100755
--- a/var/mongoose/html/browse/script.js
+++ b/var/mongoose/html/browse/script.js
@@ -231,6 +231,7 @@ function savestream_submit()
 {
 	var s = $('#savestream_form').serialize();
 	var sf = $('#save_stream').attr('file');
+	$('#savestream_name').disable();
 	$('#savestream_spin').show();
 	$.get('/browse/savestream.jim?sfile=' +
 	    encodeURIComponent(sf) + '&' + s,
@@ -791,6 +792,11 @@ var dmenuclick = function(action, el, pos)
 		close: function() { $('#savestream_name').val(''); }
 	});
 
+	$('#savestream_name').keyup(function(e) {
+		if (e.keyCode == $.ui.keyCode.ENTER)
+			savestream_submit();
+	});
+
 	$('#bmpdialogue').dialog({
 		autoOpen: false,
 		height: 'auto', width: 'auto',
@@ -837,11 +843,20 @@ var dmenuclick = function(action, el, pos)
 	});
 
 	$('#save_stream').button().click(function() {
+		$('#savestream_retrieving').show();
+		$('#savestream_detail').text('').hide();
 		$('#savestream_spin').hide();
+		$('#savestream_name').val('').enable();
+
 		$('#savestreamform').dialog('open');
 		$('#savestream_detail').load(
 		    '/browse/ffmpeg.jim?file=' +
-		    encodeURIComponent($('#save_stream').attr('file')));
+		    encodeURIComponent($('#save_stream').attr('file')),
+		    function() {
+			$('#savestream_retrieving').hide();
+			$('#savestream_detail').show();
+			$('#savestream_form').show();
+		    });
 	});
 
 	$('#selectall').click(function(e) {
diff --git a/var/mongoose/lib/rsv.class b/var/mongoose/lib/rsv.class
index 1ff58cc..db9d529 100755
--- a/var/mongoose/lib/rsv.class
+++ b/var/mongoose/lib/rsv.class
@@ -224,7 +224,8 @@ rsv method insert {{table pending} {force 0}} {
 			set rec [$rsvdb query "
 				select ulslot from $tab
 				where szCRID = '%s'
-			" $szCRID]
+				and hsvc = '%s'
+			" $szCRID $hsvc]
 			if {[llength $rec] > 0} {
 				throw 20 "Duplicate reservation."
 				return