From ee71d4a5cef8544bff1c57cc7b81870982d55c93 Mon Sep 17 00:00:00 2001 From: megabigbug Date: Sun, 17 Oct 2010 16:23:39 +0200 Subject: adapt opensearch reader and writer for xml suggestions --- src/opensearch/opensearchreader.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/opensearch/opensearchreader.cpp') diff --git a/src/opensearch/opensearchreader.cpp b/src/opensearch/opensearchreader.cpp index 7da4113f..ebca7877 100644 --- a/src/opensearch/opensearchreader.cpp +++ b/src/opensearch/opensearchreader.cpp @@ -145,16 +145,17 @@ OpenSearchEngine *OpenSearchReader::read() } else { - engine->setSuggestionsUrlTemplate(url); - engine->setSuggestionsParameters(parameters); - - if (type == QL1S("application/x-suggestions+xml")) + if (engine->suggestionsUrlTemplate().isEmpty() && type == QL1S("application/x-suggestions+json")) //note: xml is prefered { - engine->setSuggestionParser(new XMLParser()); + engine->setSuggestionsUrlTemplate(url); + engine->setSuggestionsParameters(parameters); + engine->setSuggestionParser(new JSONParser()); } - else if (type == QL1S("application/x-suggestions+json")) + else if (type == QL1S("application/x-suggestions+xml")) { - engine->setSuggestionParser(new JSONParser()); + engine->setSuggestionsUrlTemplate(url); + engine->setSuggestionsParameters(parameters); + engine->setSuggestionParser(new XMLParser()); } } -- cgit v1.2.1