[Stacomir-commits] r167 - in pkg/stacomirtools: . R man

[noreply at r-forge.r-project.org]

Author: briand
Date: 2016-08-20 14:56:22 +0200 (Sat, 20 Aug 2016)
New Revision: 167

Added:
   pkg/stacomirtools/R/stacomirtools.R
Modified:
   pkg/stacomirtools/DESCRIPTION
   pkg/stacomirtools/R/RequeteODBC.r
   pkg/stacomirtools/R/utilitaires.r
   pkg/stacomirtools/man/killfactor.Rd
Log:


Modified: pkg/stacomirtools/DESCRIPTION
===================================================================
--- pkg/stacomirtools/DESCRIPTION	2016-08-19 20:02:58 UTC (rev 166)
+++ pkg/stacomirtools/DESCRIPTION	2016-08-20 12:56:22 UTC (rev 167)
@@ -12,6 +12,7 @@
     'RequeteODBC.r'
     'RequeteODBCwhere.r'
     'RequeteODBCwheredate.r'
-    'utilitaires.r'    
+    'utilitaires.r'   
+    'stacomirtools.r' 
 LazyLoad: yes
 Imports: methods,RODBC,xtable,utils
\ No newline at end of file

Modified: pkg/stacomirtools/R/RequeteODBC.r
===================================================================
--- pkg/stacomirtools/R/RequeteODBC.r	2016-08-19 20:02:58 UTC (rev 166)
+++ pkg/stacomirtools/R/RequeteODBC.r	2016-08-20 12:56:22 UTC (rev 167)
@@ -51,7 +51,7 @@
 						if(arret) stop(text) else print(text)
 						return(NULL)
 					}	
-					stacomirtools::killfactor=function(df){
+					killfactor=function(df){
 						for (i in 1:ncol(df))
 						{
 							if(is.factor(df[,i])) df[,i]=as.character(df[,i])
@@ -72,7 +72,7 @@
 					if(arret) stop(text) else print(text)
 					return(NULL)
 				}	
-				stacomirtools::killfactor=function(df){
+				killfactor=function(df){
 					for (i in 1:ncol(df))
 					{
 						if(is.factor(df[,i])) df[,i]=as.character(df[,i])
@@ -124,7 +124,7 @@
 			}
 			if ((class(resultatRequete)=="data.frame")[1]) {
 				if (!object at silent) funout(msg6)
-				object at query=stacomirtools::killfactor(query)     # instead of query 11/08/2009 11:55:20
+				object at query=killfactor(query)     # instead of query 11/08/2009 11:55:20
 				object at etat=msg6
 			} else {
 				if (!object at silent) print(resultatRequete)

Added: pkg/stacomirtools/R/stacomirtools.R
===================================================================
--- pkg/stacomirtools/R/stacomirtools.R	                        (rev 0)
+++ pkg/stacomirtools/R/stacomirtools.R	2016-08-20 12:56:22 UTC (rev 167)
@@ -0,0 +1,4 @@
+# this is to be able to use the package outside from stacomir
+utils::globalVariables("envir_stacomi","funout")
+
+

Modified: pkg/stacomirtools/R/utilitaires.r
===================================================================
--- pkg/stacomirtools/R/utilitaires.r	2016-08-19 20:02:58 UTC (rev 166)
+++ pkg/stacomirtools/R/utilitaires.r	2016-08-20 12:56:22 UTC (rev 167)
@@ -57,12 +57,13 @@
 }
 
 
-#' very usefull function used to "kill" these bloody factors that appears, noticeably after loading with odbc
+#' very usefull function used to "kill" the factors, noticeably after loading with odbc
+#' 
 #' @param df a data.frame
 #' @return df
 #' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
 #' @export
-stacomirtools::killfactor=function(df){
+killfactor=function(df){
 	for (i in 1:ncol(df))
 	{
 		if(is.factor(df[,i])) df[,i]=as.character(df[,i])

Modified: pkg/stacomirtools/man/killfactor.Rd
===================================================================
--- pkg/stacomirtools/man/killfactor.Rd	2016-08-19 20:02:58 UTC (rev 166)
+++ pkg/stacomirtools/man/killfactor.Rd	2016-08-20 12:56:22 UTC (rev 167)
@@ -1,8 +1,8 @@
-\name{stacomirtools::killfactor}
-\alias{stacomirtools::killfactor}
+\name{killfactor}
+\alias{killfactor}
 \title{very usefull function remove factor that appear, noticeably after loading with ODBC}
 \usage{
-  stacomirtools::killfactor(df)
+  killfactor(df)
 }
 \arguments{
   \item{df}{a data.frame}