NEW - bug 151997: [connector] RSS
https://bugs.eclipse.org/bugs/show_bug.cgi?id=151997
diff --git a/org.eclipse.mylyn.web.tasks/src/org/eclipse/mylyn/internal/tasks/web/WebQueryWizardPage.java b/org.eclipse.mylyn.web.tasks/src/org/eclipse/mylyn/internal/tasks/web/WebQueryWizardPage.java
index 63d03d7..39f3af1 100644
--- a/org.eclipse.mylyn.web.tasks/src/org/eclipse/mylyn/internal/tasks/web/WebQueryWizardPage.java
+++ b/org.eclipse.mylyn.web.tasks/src/org/eclipse/mylyn/internal/tasks/web/WebQueryWizardPage.java
@@ -223,8 +223,6 @@
LinkedHashMap<String, String> vars = new LinkedHashMap<String, String>();
Map<String, String> params = new LinkedHashMap<String, String>();
if(repository!=null) {
-
-
queryUrlText.setText(addVars(vars, repository.getProperty(WebRepositoryConnector.PROPERTY_QUERY_URL)));
queryPatternText.setText(addVars(vars, repository.getProperty(WebRepositoryConnector.PROPERTY_QUERY_REGEXP)));
@@ -338,7 +336,7 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
String currentRegexp = regexp;
- String evaluatedRegexp = WebRepositoryConnector.evaluateParams(currentRegexp, params, repository);
+ String queryPattern = WebRepositoryConnector.evaluateParams(currentRegexp, params, repository);
String evaluatedUrl = WebRepositoryConnector.evaluateParams(url, params, repository);
active = true;
do {
@@ -356,7 +354,13 @@
}
};
- IStatus status = WebRepositoryConnector.performQuery(webPage, evaluatedRegexp, null, monitor, collector, repository);
+ IStatus status;
+ if (queryPattern != null && queryPattern.trim().length() > 0) {
+ status = WebRepositoryConnector.performQuery(webPage, queryPattern, null, monitor, collector, repository);
+ } else {
+ status = WebRepositoryConnector.performRssQuery(evaluatedUrl, monitor, collector, repository);
+ }
+
if(!status.isOK()) {
queryStatus.add(status);
}
diff --git a/org.eclipse.mylyn.web.tasks/src/org/eclipse/mylyn/internal/tasks/web/WebRepositoryConnector.java b/org.eclipse.mylyn.web.tasks/src/org/eclipse/mylyn/internal/tasks/web/WebRepositoryConnector.java
index a5ed103..72a3baf 100644
--- a/org.eclipse.mylyn.web.tasks/src/org/eclipse/mylyn/internal/tasks/web/WebRepositoryConnector.java
+++ b/org.eclipse.mylyn.web.tasks/src/org/eclipse/mylyn/internal/tasks/web/WebRepositoryConnector.java
@@ -219,7 +219,7 @@
if (queryPattern != null && queryPattern.trim().length() > 0) {
return performQuery(fetchResource(queryUrl, queryParameters, repository), queryPattern, taskPrefix,
monitor, resultCollector, repository);
- } else {
+ } else {
return performRssQuery(queryUrl, monitor, resultCollector, repository);
}
