From 6c1f01c276f2d9fe2aa06e52a9c2cea061fc0918 Mon Sep 17 00:00:00 2001
From: Brett Bieber <brett.bieber@gmail.com>
Date: Fri, 12 Aug 2011 15:44:51 +0000
Subject: [PATCH] Move from the deprecated WebSearch api to the
CustomSearchControl api.
---
www/searchFunc.js | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/www/searchFunc.js b/www/searchFunc.js
index 8f43597..a334094 100644
--- a/www/searchFunc.js
+++ b/www/searchFunc.js
@@ -21,29 +21,22 @@ function searchInit() {
}
}
- UNL_Search.unl_search = new google.search.WebSearch();
- //Apply the Custom Search Engine
- UNL_Search.unl_search.setSiteRestriction("015236299699564929946:nk1siew10ie");
- UNL_Search.unl_search.setResultSetSize(GSearch.LARGE_RESULTSET)
- UNL_Search.unl_search.setSearchCompleteCallback(UNL_Search, UNL_Search.handleUNLResults)
- UNL_Search.unl_search.setLinkTarget(GSearch.LINK_TARGET_SELF);
+ UNL_Search.unl_search = new google.search.CustomSearchControl("015236299699564929946:nk1siew10ie");
+ UNL_Search.unl_search.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+ UNL_Search.unl_search.setSearchCompleteCallback(UNL_Search.handleUNLResults)
+ UNL_Search.unl_search.draw('unl_results');
if (UNL_Search.do_local_search) {
-
- UNL_Search.local_search = new google.search.WebSearch();
- //Apply the Custom Search Engine
- UNL_Search.local_search.setSiteRestriction(UNL_Search.local_search_context);
- //UNL_Search.local_search.setSiteRestriction('000150017203523626721:-1etga1qfci');
- UNL_Search.local_search.setResultSetSize(GSearch.SMALL_RESULTSET)
- UNL_Search.local_search.setSearchCompleteCallback(UNL_Search, UNL_Search.handleLocalResults)
- UNL_Search.local_search.setLinkTarget(GSearch.LINK_TARGET_SELF);
-
+ UNL_Search.local_search = new google.search.CustomSearchControl(UNL_Search.local_search_context);
+ UNL_Search.local_search.setResultSetSize('small')
+ UNL_Search.local_search.setSearchCompleteCallback(UNL_Search.handleLocalResults)
+ UNL_Search.local_search.draw('local_results');
}
var gSearchForm = new GSearchForm(false, document.getElementById("searchform"));
gSearchForm.setOnSubmitCallback(UNL_Search, UNL_Search.doQuery);
gSearchForm.input.value = (UNL_Search.query ? UNL_Search.query : "");
-
+
// Execute an inital search
if (UNL_Search.query && UNL_Search.query != "") {
UNL_Search.unl_search.execute(UNL_Search.query);
@@ -55,7 +48,7 @@ function searchInit() {
}
//Attach search initializer to onLoad
-google.setOnLoadCallback(searchInit);
+google.setOnLoadCallback(searchInit, true);
//
--
GitLab