Helpviewer/HelpBrowserWV.py

changeset 3702
dabc69b82c7c
parent 3670
f0cb7579c0b4
child 3734
e642b2099fc8
diff -r 864226db1abe -r dabc69b82c7c Helpviewer/HelpBrowserWV.py
--- a/Helpviewer/HelpBrowserWV.py	Sun Jul 13 16:33:32 2014 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Sun Jul 13 18:40:52 2014 +0200
@@ -1531,6 +1531,7 @@
         if searchUrl.scheme() != "http":
             return
         
+        searchUrlQuery = UrlQuery()
         searchEngines = {}
         inputFields = formElement.findAll("input")
         for inputField in inputFields.toList():
@@ -1543,12 +1544,12 @@
             elif type_ == "text":
                 if inputField == element:
                     value = "{searchTerms}"
-                searchUrl.addQueryItem(name, value)
+                searchUrlQuery.addQueryItem(name, value)
             elif type_ == "checkbox" or type_ == "radio":
                 if inputField.evaluateJavaScript("this.checked"):
-                    searchUrl.addQueryItem(name, value)
+                    searchUrlQuery.addQueryItem(name, value)
             elif type_ == "hidden":
-                searchUrl.addQueryItem(name, value)
+                searchUrlQuery.addQueryItem(name, value)
         
         selectFields = formElement.findAll("select")
         for selectField in selectFields.toList():
@@ -1560,7 +1561,7 @@
             
             options = selectField.findAll("option")
             value = options.at(selectedIndex).toPlainText()
-            searchUrl.addQueryItem(name, value)
+            searchUrlQuery.addQueryItem(name, value)
         
         ok = True
         if len(searchEngines) > 1:
@@ -1574,7 +1575,7 @@
                 return
             
             if searchEngines[searchEngine] != "":
-                searchUrl.addQueryItem(
+                searchUrlQuery.addQueryItem(
                     searchEngines[searchEngine], searchEngine)
         
         engineName = ""
@@ -1591,6 +1592,8 @@
         if not ok:
             return
         
+        searchUrl.setQuery(searchUrlQuery)
+        
         from .OpenSearch.OpenSearchEngine import OpenSearchEngine
         engine = OpenSearchEngine()
         engine.setName(engineName)

eric ide

mercurial