[Rqda-commits] r45 - pkg pkg/R pkg/man www

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Mon Dec 15 15:42:46 CET 2008 

Author: wincent
Date: 2008-12-15 15:42:46 +0100 (Mon, 15 Dec 2008)
New Revision: 45

Modified:
   pkg/ChangeLog
   pkg/R/CaseButton.R
   pkg/R/autoCoding.R
   pkg/R/utils.R
   pkg/TODO
   pkg/man/RQDA-internal.rd
   pkg/man/list.deleted.rd
   www/documentation.html
   www/index.html
Log:


Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2008-12-14 01:47:55 UTC (rev 44)
+++ pkg/ChangeLog	2008-12-15 14:42:46 UTC (rev 45)
@@ -1,3 +1,7 @@
+2008-12-15
+	* Add help of GetCodingTable.
+	* Fix bugs of "Web Search-Baidu" and "Web Search-Sohu" of the case popup menu (now works for UTF-8 locale).
+
 2008-12-14
 	* Add help of SearchFiles and GetFileId.
 	* Change the default of ask argument of undelete to TRUE.
@@ -3,5 +7,5 @@
 
 2008-12-13
-	* New function of gselect.list, gtk version of select.list.
+	* New function of gselect.list, gtk version of select.list (Thanks John).
 	* Add help of SummaryCoding, improve help of write.FileList.
 

Modified: pkg/R/CaseButton.R
===================================================================
--- pkg/R/CaseButton.R	2008-12-14 01:47:55 UTC (rev 44)
+++ pkg/R/CaseButton.R	2008-12-15 14:42:46 UTC (rev 45)
@@ -273,14 +273,14 @@
 CaseNamesWidgetMenu$"Web Search"$Baidu$handler <- function(h,...){
   KeyWord <- svalue(.rqda$.CasesNamesWidget)
   if (length(KeyWord)!=0){
-    KeyWord <- iconv(KeyWord, from="UTF-8")
+    KeyWord <- iconv(KeyWord, from="UTF-8",to="CP936") ## should be in CP936 to work properly.
     browseURL(sprintf("http://www.baidu.com/s?wd=%s",paste("%",paste(charToRaw(KeyWord),sep="",collapse="%"),sep="",collapse="")))
   }
 }
 CaseNamesWidgetMenu$"Web Search"$Sogou$handler <- function(h,...){
   KeyWord <- svalue(.rqda$.CasesNamesWidget)
   if (length(KeyWord)!=0){
-    KeyWord <- iconv(KeyWord, from="UTF-8")
+    KeyWord <- iconv(KeyWord, from="UTF-8",to="CP936")## should be in CP936 to work properly.
     browseURL(sprintf("http://www.sogou.com/sohu?query=%s",paste("%",paste(charToRaw(KeyWord),sep="",collapse="%"),sep="",collapse="")))
   }
 }

Modified: pkg/R/autoCoding.R
===================================================================
--- pkg/R/autoCoding.R	2008-12-14 01:47:55 UTC (rev 44)
+++ pkg/R/autoCoding.R	2008-12-15 14:42:46 UTC (rev 45)
@@ -1,5 +1,5 @@
 AutoCoding <- function(KeyWord,expansion=6){
-  Files <- SearchFiles(paste("%",KeyWordm,"%",collapse=""),content=TRUE)
+  Files <- SearchFiles(paste("%",KeyWord,"%",collapse=""),content=TRUE)
   AnsIndex <- gregexpr(KeyWord,Files$file)
   AnsIndex2 <- lapply(AnsIndex, FUN=function(x) {
     begin <- x-expansion

Modified: pkg/R/utils.R
===================================================================
--- pkg/R/utils.R	2008-12-14 01:47:55 UTC (rev 44)
+++ pkg/R/utils.R	2008-12-15 14:42:46 UTC (rev 45)
@@ -141,17 +141,17 @@
   } else cat("Open a project first.\n")
 }
 
-select <- function(x,multiple=TRUE,title=NULL,...){
-## select a method for selecting items conditional on the OS, to maxizied the chance of GUI-style of selection.
-## use as replacement of  select.list.
-  if (.Platform$OS.type == "unix" && capabilities("tcltk") && capabilities("X11"))
-    {
-      ans <- tcltk::tk_select.list(x,multiple=multiple,title=title,...)
-    } else {
-      ans <- select.list(x,multiple=multiple,title=title,...)
-    }
-  return(list(selected=ans))
-}
+## select <- function(x,multiple=TRUE,title=NULL,...){
+## ## select a method for selecting items conditional on the OS, to maxizied the chance of GUI-style of selection.
+## ## use as replacement of  select.list.
+##   if (.Platform$OS.type == "unix" && capabilities("tcltk") && capabilities("X11"))
+##     {
+##       ans <- tcltk::tk_select.list(x,multiple=multiple,title=title,...)
+##     } else {
+##       ans <- select.list(x,multiple=multiple,title=title,...)
+##     }
+##   return(list(selected=ans))
+## }
 
 
 RunOnSelected <- function(x,multiple=TRUE,expr,enclos,title=NULL,...){

Modified: pkg/TODO
===================================================================
--- pkg/TODO	2008-12-14 01:47:55 UTC (rev 44)
+++ pkg/TODO	2008-12-15 14:42:46 UTC (rev 45)
@@ -6,5 +6,4 @@
 
 inter-coder reliability 
 
-export coding to html.
-
+export coding to html
\ No newline at end of file

Modified: pkg/man/RQDA-internal.rd
===================================================================
--- pkg/man/RQDA-internal.rd	2008-12-14 01:47:55 UTC (rev 44)
+++ pkg/man/RQDA-internal.rd	2008-12-15 14:42:46 UTC (rev 45)
@@ -90,6 +90,11 @@
 \alias{ProjectMemoWidget}
 \alias{FileNameWidgetUpdate}
 \alias{OrderByTime}
+\alias{AutoCoding}
+\alias{c2InfoFun}
+\alias{CodingInfoButton}
+\alias{gselect.list}
+\alias{RunOnSelected}
 %% add related alias functions here.
 
 \title{Internal Functions}

Modified: pkg/man/list.deleted.rd
===================================================================
--- pkg/man/list.deleted.rd	2008-12-14 01:47:55 UTC (rev 44)
+++ pkg/man/list.deleted.rd	2008-12-15 14:42:46 UTC (rev 45)
@@ -16,7 +16,7 @@
 list.deleted(type=c("file","code","case","codecategory","filecategory"))
 pdelete(type=c("file","code","case","codecategory","filecategory","coding"),ask=FALSE)
 CleanProject(ask=FALSE)
-undelete(type=c("file","code","case","codecategory","filecategory"),ask=FALSE)
+undelete(type=c("file","code","case","codecategory","filecategory"),ask=TRUE)
 }
 
 \arguments{

Modified: www/documentation.html
===================================================================
--- www/documentation.html	2008-12-14 01:47:55 UTC (rev 44)
+++ www/documentation.html	2008-12-15 14:42:46 UTC (rev 45)
@@ -56,7 +56,7 @@
 
 <p>When you have imported a list of files and generate a code list, then you can go on the process of coding. First, you should open a file. Then you read and think, if you think some words is relevant to a code, you can apply that code to the text segment: select a code, select that text segment, and click mark button in the Codes Tab. Then you can find that text segment is highlighted with color (by default, it is blue). We call this process <b>"coding"</b>. You can undo the coding as well: select the same text segment and click Unmark button in the Codes Tab. Now, the highlight is remove, which means that you have succesfully remove that coding. 
 
-<p>If you want to see what information has been attached to a code, you can  double click a code to retrieval all the related coding to that code. This process is called <b>"coding retrieval"</b>. Of course, you can select a code, and then click retrieval button to conduct similar operation. The latter method has an advantage that you can go back to the original file content by clicking the back button within the retrieved coding (though this method takes a bit more time to retrieve the coding). This method can give you a closeness with the original content and avoid, to some extent, segmentation due to coding. To get a overall statistics of coding, you can use R function SummaryCoding() to inspect the "Number of codings for each code", "Average number of words assciated with each code", "Number of files associated with each code". You can get more by GetFileId function. For more information, please refer to the help page by <i>?GetFileId</i>.
+<p>If you want to see what information has been attached to a code, you can  double click a code to retrieval all the related coding to that code. This process is called <b>"coding retrieval"</b>. Of course, you can select a code, and then click retrieval button to conduct similar operation. The latter method has an advantage that you can go back to the original file content by clicking the back button within the retrieved coding (though this method takes a bit more time to retrieve the coding). This method can give you a closeness with the original content and avoid, to some extent, segmentation due to coding. To get a overall statistics of coding, you can use R function SummaryCoding() to inspect the "Number of codings for each code", "Average number of words assciated with each code", "Number of files associated with each code". You can get more by GetCodingTable and GetFileId function. For more information, please refer to the help page by <i>?GetCodingTable</i> and <i>?GetFileId</i>.
 
 
 <p><b>4. Writing memo</b>

Modified: www/index.html
===================================================================
--- www/index.html	2008-12-14 01:47:55 UTC (rev 44)
+++ www/index.html	2008-12-15 14:42:46 UTC (rev 45)
@@ -58,7 +58,7 @@
 
 <p>RQDA is based on R, so you have to install R and relevant packages in order to use RQDA.
 
-<li>Go to <A HREF="http://cran.r-project.org/">CRAN</A>, download R (Suggest using version 2.8.0 or above) and install it. For Linux and BSD users, you can download binary version of R or the sources. For Windows users, you can download the binary version of R from the <A HREF="http://cran.r-project.org/bin/windows/base/">download page</A>. For MacOS users, download the binary version of R from the <A HREF="http://cran.r-project.org/bin/macosx/">download page</A>, More instruction about installing R is in the <A HREF="http://cran.r-project.org/doc/manuals/R-admin.html">R Installation and Administration</A> Manual.
+<li>Go to <A HREF="http://cran.r-project.org/">CRAN</A>, download R and install it. For Linux and BSD users, you can download binary version of R or the sources. For Windows users, you can download the binary version of R from the <A HREF="http://cran.r-project.org/bin/windows/base/">download page</A>. For MacOS users, download the binary version of R from the <A HREF="http://cran.r-project.org/bin/macosx/">download page</A>, More instruction about installing R is in the <A HREF="http://cran.r-project.org/doc/manuals/R-admin.html">R Installation and Administration</A> Manual.
 
 <li>Launch R (as usual applications under Windows; or by command $R within shell terminal under Linux and FreeBSD). Then, you can see the prompt &ldquo;&gt;&rdquo;,which indicates that R is ready for further commands.

More information about the Rqda-commits mailing list