Merge pull request #3312 from Sweetdevil144/develop

Combine multiple `PEcAn.db` calls in a single query
PecanProject · Jul 10, 2024 · 1fd72ab · 1fd72ab
2 parents 4dfee93 + d287192
commit 1fd72ab
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/modules/data.atmosphere/R/read.register.R b/modules/data.atmosphere/R/read.register.R
@@ -35,14 +35,24 @@ read.register <- function(register.xml, con) {
     } else if ((!is.null(register$format$id) & is.null(register$format$name)) 
                | 
                (!is.null(register$format$id) & is.null(register$format$mimetype))) {
-      register$format$name <- PEcAn.DB::db.query(
-        paste("SELECT name from formats where id = ", register$format$id), con)[[1]]
-      register$format$mimetype <- PEcAn.DB::db.query(
-        paste("SELECT mime_type from formats where id = ", register$format$id), con)[[1]]
+      # Retrieve format name and mimetype from the database
+      query.format.info <- PEcAn.DB::db.query(
+        paste(
+          "SELECT name, type_string AS mimetype",
+          "FROM formats JOIN mimetypes ON formats.mimetype_id = mimetypes.id",
+          "WHERE formats.id = ", register$format$id),
+        con
+      )
+
+      register$format$name <- query.format.info$name
+      register$format$mimetype <- query.format.info$mimetype
+
     } else if (is.null(register$format$id) & !is.null(register$format$name) & !is.null(register$format$mimetype)) {
       register$format$id <- PEcAn.DB::db.query(
-        paste0("SELECT id from formats where name = '", register$format$name,
-               "' and mime_type = '", register$format$mimetype, "'"), con)[[1]]
+        paste0(
+          "SELECT formats.id FROM formats JOIN mimetypes ON formats.mimetype_id = mimetypes.id ",
+          "WHERE name = '", register$format$name,
+               "' AND type_string = '", register$format$mimetype, "'"), con)[[1]]
     }
   }
   return(invisible(register))