From 9116c6e8a97c206137de7702873938d17c60607c Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Thu, 30 Jun 2011 22:10:22 +0000
Subject: [PATCH] improve new folder icon, allow [S]CRID searches from the term
 box

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@216 2a923420-c742-0410-a762-8d5b09965624
---
 var/mongoose/cgi-bin/browse/browse.js |   2 +-
 var/mongoose/cgi-bin/epg_search.jim   |  28 +++++++++++++++++++-------
 var/mongoose/html/img/Folder_New.png  | Bin 0 -> 3526 bytes
 3 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 var/mongoose/html/img/Folder_New.png

diff --git a/var/mongoose/cgi-bin/browse/browse.js b/var/mongoose/cgi-bin/browse/browse.js
index 55e053f..6ffb1ae 100755
--- a/var/mongoose/cgi-bin/browse/browse.js
+++ b/var/mongoose/cgi-bin/browse/browse.js
@@ -40,7 +40,7 @@ function set_folder_new(folder, cnt)
 	folder = folder.replace(/ /g, '');
 	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
 	console.log("Folder: (%s) = (%s)", folder, cnt);
-	$('#img' + folder).attr('src', '/images/711_1_09_Media_Folder_C.png');
+	$('#img' + folder).attr('src', '/img/Folder_New.png');
 }
 
 function new_folder_callback(data, status, xhr)
diff --git a/var/mongoose/cgi-bin/epg_search.jim b/var/mongoose/cgi-bin/epg_search.jim
index cbdacf6..26ab4ab 100755
--- a/var/mongoose/cgi-bin/epg_search.jim
+++ b/var/mongoose/cgi-bin/epg_search.jim
@@ -15,6 +15,27 @@ puts "<script type=text/javascript src=/js/highlight.js></script>"
 cgi_input
 #cgi_dump
 
+set ct 0
+catch { set ct [dict get $_cgi ct] }
+set crid ""
+catch { set crid [dict get $_cgi crid] }
+set scrid ""
+catch { set scrid [dict get $_cgi scrid] }
+
+if {[dict exists $_cgi term]} {
+	set lterm [dict get $_cgi term]
+
+	if {[string match {CRID:*} $lterm]} {
+		set crid [string range $lterm 5 end]
+	} elseif {[string match {SCRID:*} $lterm]} {
+		set scrid [string range $lterm 6 end]
+	}
+} elseif {$crid ne ""} {
+	set _cgi(term) "CRID:$crid"
+} elseif {$scrid ne ""} {
+	set _cgi(term) "SCRID:$scrid"
+}
+
 source /mod/var/mongoose/lib/epg_search
 
 [spinner new {
@@ -31,13 +52,6 @@ source /mod/var/mongoose/lib/epg_popup
 set cmd "search"
 if {$searchfull} { set cmd "searchall" }
 
-set ct 0
-catch { set ct [dict get $_cgi ct] }
-set crid ""
-catch { set crid [dict get $_cgi crid] }
-set scrid ""
-catch { set scrid [dict get $_cgi scrid] }
-
 if {$ct > 0 } {
 	set records [epg fetch dump -type $ct]
 } elseif {$crid ne ""} {
diff --git a/var/mongoose/html/img/Folder_New.png b/var/mongoose/html/img/Folder_New.png
new file mode 100644
index 0000000000000000000000000000000000000000..5986b754fd9c25cec8a1585feb438873be2b0005
GIT binary patch
literal 3526
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
ArvLx|

literal 0
HcmV?d00001