1cran<rev> instead of <rev>cran1

[cran2deb.git] / trunk / R / db.R

diff --git a/trunk/R/db.R b/trunk/R/db.R
index 6c38b93e70aa1ad8bd93cbb7225ee7c891afafc1..9e8ad03a8475f1522a953bf76a1b3ce76863b1d4 100644 (file)
--- a/trunk/R/db.R
+++ b/trunk/R/db.R
@@ -60,6 +60,7 @@ db_start <- function() {
                   ,',deb_revision INTEGER NOT NULL'
                   ,',db_version INTEGER NOT NULL'
                   ,',date_stamp TEXT NOT NULL'
+                  ,',time_stamp TEXT NOT NULL'
                   ,',scm_revision TEXT NOT NULL'
                   ,',success INTEGER NOT NULL'
                   ,',log TEXT'
@@ -296,10 +297,14 @@ db_update_package_versions <- function() {
     db_stop(con)
 }
 
+db_date_format <- '%Y-%m-%d'
+db_time_format <- '%H:%M:%OS %Z'
+
 db_record_build <- function(package, deb_version, log, success=F) {
     con <- db_start()
+    o<-options(digits.secs = 6)
     dbGetQuery(con,paste('INSERT OR REPLACE INTO builds'
-                        ,'(package,system,r_version,deb_epoch,deb_revision,db_version,success,date_stamp,scm_revision,log)'
+                        ,'(package,system,r_version,deb_epoch,deb_revision,db_version,success,date_stamp,time_stamp,scm_revision,log)'
                         ,'VALUES'
                         ,'(',db_quote(package)
                         ,',',db_quote(which_system)
@@ -308,10 +313,12 @@ db_record_build <- function(package, deb_version, log, success=F) {
                         ,',',db_quote(version_revision(deb_version))
                         ,',',db_cur_version(con)
                         ,',',as.integer(success)
-                        ,',',db_quote(Sys.time())
+                        ,',',db_quote(format(Sys.time(), db_date_format))
+                        ,',',db_quote(format(Sys.time(), db_time_format))
                         ,',',db_quote(scm_revision)
                         ,',',db_quote(paste(log, collapse='\n'))
                         ,')'))
+    options(o)
     db_stop(con)
 }
 
@@ -326,8 +333,21 @@ db_builds <- function(pkgname) {
     if (length(build) == 0) {
         return(NULL)
     }
+    return(db_cleanup_builds(build))
+}
+
+db_cleanup_builds <- function(build) {
     build$success <- as.logical(build$success)
-    return(build)
+    #o <-options(digits.secs = 6)
+    dt <- as.POSIXct(strptime(paste(as.character(build[,"date_stamp"]), as.character(build[,"time_stamp"])),
+                              paste(db_date_format, db_time_format)))
+    build$time_stamp <- NULL
+    build$date_stamp <- NULL
+    newdf <- data.frame(build, date_stamp=dt)
+    #print(newdf[, -grep("log", colnames(newdf))])
+    #options(o)
+    #print(newdf[, -grep("log", colnames(newdf))])
+    return(newdf)
 }
 
 db_latest_build <- function(pkgname) {
@@ -342,8 +362,7 @@ db_latest_build <- function(pkgname) {
     if (length(build) == 0) {
         return(NULL)
     }
-    build$success <- as.logical(build$success)
-    return(build)
+    return(db_cleanup_builds(build))
 }
 
 db_latest_build_version <- function(pkgname) {