[rkward-cvs] SF.net SVN: rkward:[3940] branches/release_branch_0.5.7

[tfry at users.sourceforge.net]

Revision: 3940
          http://rkward.svn.sourceforge.net/rkward/?rev=3940&view=rev
Author:   tfry
Date:     2011-10-14 07:41:02 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Merge r3939 from trunk

Revision Links:
--------------
    http://rkward.svn.sourceforge.net/rkward/?rev=3939&view=rev

Modified Paths:
--------------
    branches/release_branch_0.5.7/rkward/rbackend/rpackages/rkward/R/internal_help.R
    branches/release_branch_0.5.7/rkward/windows/rkhelpsearchwindow.cpp

Property Changed:
----------------
    branches/release_branch_0.5.7/
    branches/release_branch_0.5.7/debian/


Property changes on: branches/release_branch_0.5.7
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
/trunk/rkward:3894,3932-3933
   + /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
/trunk/rkward:3894,3932-3933,3939


Property changes on: branches/release_branch_0.5.7/debian
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2010_10_18_backend_restructuring_branch/debian:3130-3196
/branches/release_branch_0.5.4:3098-3102
/branches/release_branch_0.5.4/debian:3098-3102
/trunk/rkward/debian:3894,3932-3933
   + /branches/2010_10_18_backend_restructuring_branch/debian:3130-3196
/branches/release_branch_0.5.4:3098-3102
/branches/release_branch_0.5.4/debian:3098-3102
/trunk/rkward/debian:3894,3932-3933,3939

Modified: branches/release_branch_0.5.7/rkward/rbackend/rpackages/rkward/R/internal_help.R
===================================================================
--- branches/release_branch_0.5.7/rkward/rbackend/rpackages/rkward/R/internal_help.R	2011-10-14 07:38:22 UTC (rev 3939)
+++ branches/release_branch_0.5.7/rkward/rbackend/rpackages/rkward/R/internal_help.R	2011-10-14 07:41:02 UTC (rev 3940)
@@ -39,6 +39,6 @@
 ".rk.get.search.results" <- function (pattern, ...) {
 	H=as.data.frame (help.search(pattern, ...)$matches)
 	# NOTE: The field "Type" was added in R 2.14.0. For earlier versions of R, only help pages were returned as results of help.search()
-	if (is.null (H$Type)) H$Type <- "help"
+	if ((dim (H)[1] > 0) && (is.null (H$Type))) H$Type <- "help"
 	c (as.character (H$topic), as.character (H$title), as.character(H$Package), as.character(H$Type))
 }

Modified: branches/release_branch_0.5.7/rkward/windows/rkhelpsearchwindow.cpp
===================================================================
--- branches/release_branch_0.5.7/rkward/windows/rkhelpsearchwindow.cpp	2011-10-14 07:38:22 UTC (rev 3939)
+++ branches/release_branch_0.5.7/rkward/windows/rkhelpsearchwindow.cpp	2011-10-14 07:41:02 UTC (rev 3940)
@@ -242,14 +242,15 @@
 void RKHelpSearchWindow::rCommandDone (RCommand *command) {
 	RK_TRACE (APP);
 	if (command->getFlags () == HELP_SEARCH) {
+		QStringList res;
 		if (command->failed ()) {
 			RK_ASSERT (false);
-			return;
+		} else {
+			RK_ASSERT (command->getDataType () == RData::StringVector);
+			res = command->getStringVector ();
 		}
-		RK_ASSERT (command->getDataType () == RData::StringVector);
+		results->setResults (res);
 
-		results->setResults (command->getStringVector ());
-
 		for (int i = 0; i < COL_COUNT; ++i) results_view->resizeColumnToContents (i);
 		setEnabled(true);
 	} else if (command->getFlags () == GET_HELP) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.