X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fdb.R;h=c41fb529465e23ff3580b4e0dc8463322fbd3741;hb=371d29f94db2f81306dda090d760ce915042477e;hp=9e09f24b9e53253f90c505f0f2c949a204cef1a4;hpb=5c4a83b24dce711003452dfa391c7fe6fd48dc24;p=cran2deb.git

diff --git a/trunk/R/db.R b/trunk/R/db.R
index 9e09f24..c41fb52 100644
--- 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'
@@ -69,7 +70,13 @@ db_start <- function() {
     if (!dbExistsTable(con,'blacklist_packages')) {
         dbGetQuery(con,paste('CREATE TABLE blacklist_packages ('
                   ,' package TEXT PRIMARY KEY NOT NULL '
-                  ,',reason TEXT NOT NULL '
+                  ,',nonfree INTEGER NOT NULL DEFAULT 0'
+                  ,',obsolete INTEGER NOT NULL DEFAULT 0'
+                  ,',broken_dependency INTEGER NOT NULL DEFAULT 0'
+                  ,',unsatisfied_dependency INTEGER NOT NULL DEFAULT 0'
+                  ,',breaks_cran2deb INTEGER NOT NULL DEFAULT 0'
+                  ,',other INTEGER NOT NULL DEFAULT 0'
+                  ,',explanation TEXT NOT NULL '
                   ,')'))
     }
     return(con)
@@ -296,10 +303,29 @@ 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) {
+    # if the log is more than 1kB, only keep the last 1kB.
+    # this is to work around a problem that seems to have appeared in R 2.10 causing calloc errors.
+    # if the log is not pruned then we get the following error:
+    # 
+    # Error in gsub("(['\"])", "\\1\\1", text) :
+    #   Calloc could not allocate (-197080581 of 1) memory
+    # Error in dbGetQuery(con, paste("INSERT OR REPLACE INTO builds", "(package,system,r_version,deb_epoch,deb_revision,db_version,success,date_stamp,time_stamp,scm_revision,log)",  :
+    #   error in evaluating the argument 'statement' in selecting a method for function 'dbGetQuery'
+
+    log = paste(log,collapse='\n')
+    end = nchar(log)
+    max_log_len = 1024
+    if (end > max_log_len) {
+        log = db_quote(substr(log,end-max_log_len,end))
+    }
     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 +334,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(format(Sys.time(),'%a, %d %b %Y %H:%M:%S %z'))
+                        ,',',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'))
+                        ,',',log
                         ,')'))
+    options(o)
     db_stop(con)
 }
 
@@ -326,8 +354,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 +383,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) {
@@ -395,3 +435,48 @@ db_blacklist_packages <- function() {
     db_stop(con)
     return(packages)
 }
+
+db_blacklist_reasons <- function () {
+    con <- db_start()
+    packages <- dbGetQuery(con,'SELECT package,explanation from blacklist_packages')
+    db_stop(con)
+    return(packages)
+}
+
+db_todays_builds <- function() {
+    today <- db_quote(format(Sys.time(), db_date_format))
+    con <- db_start()
+    builds <- dbGetQuery(con,paste('select id,success,system,package,
+                                    r_version as version,deb_epoch as epo,
+                                    deb_revision as rev, scm_revision as svnrev,
+                                    db_version as db,date_stamp,time_stamp
+                                    from builds where date_stamp = ',today))
+    db_stop(con)
+    return(builds)
+}
+
+db_successful_builds <- function() {
+    con <- db_start()
+    builds <- dbGetQuery(con,'select system,package,r_version,date_stamp,time_stamp
+                              from builds natural join (select system,package,max(id) as id
+                                                        from builds
+                                                        where package not in
+                                                                (select package from blacklist_packages)
+                                                        group by package,system)
+                              where success = 1')
+    db_stop(con)
+    return(builds)
+}
+
+db_failed_builds <- function() {
+    con <- db_start()
+    builds <- dbGetQuery(con,'select system,package,r_version,date_stamp,time_stamp
+                              from builds natural join (select system,package,max(id) as id
+                                                        from builds
+                                                        where package not in
+                                                                (select package from blacklist_packages)
+                                                        group by package,system)
+                              where success = 0')
+    db_stop(con)
+    return(builds)
+}