diff --git a/R/get_species.R b/R/get_species.R index 3108e0f..389bdfa 100644 --- a/R/get_species.R +++ b/R/get_species.R @@ -62,7 +62,7 @@ get_species <- function(channel,species="all"){ query <- DBI::dbGetQuery(channel,sqlStatement) # get column names - sqlcolName <- "select COLUMN_NAME from ALL_TAB_COLUMNS where TABLE_NAME = 'CFSPP' and owner='CFDBS';" + sqlcolName <- "select COLUMN_NAME from ALL_TAB_COLUMNS where TABLE_NAME = 'CFSPP' and owner='CFDBS'" colNames <- t(DBI::dbGetQuery(channel,sqlcolName)) return (list(data=dplyr::as_tibble(query),sql=sqlStatement, colNames=colNames)) diff --git a/R/process_foreign_data.R b/R/process_foreign_data.R index d846768..3051032 100644 --- a/R/process_foreign_data.R +++ b/R/process_foreign_data.R @@ -81,7 +81,7 @@ process_foreign_data <- function(channel, nafoland, useLanded = T, useHerringMai c('Year', 'GearCode', 'Tonnage', 'Code', 'Divcode'), c('YEAR', 'NAFOGEAR', 'TONCL1', 'NAFOSPP', 'AREA')) - spp <- data.table::as.data.table(DBI::dbGetQuery(channel, "select NAFOSPP, NESPP3 from CFSPP")) + spp <- data.table::as.data.table(DBI::dbGetQuery(channel, "select NAFOSPP, NESPP3 from cfdbs.CFSPP")) spp$NAFOSPP <- as.integer(spp$NAFOSPP) spp$NESPP3 <- as.integer(spp$NESPP3) @@ -118,13 +118,13 @@ process_foreign_data <- function(channel, nafoland, useLanded = T, useHerringMai #Convert scallops to meat weight if(useLanded) nafoland[NESPP3 == 800, SPPLIVMT := SPPLIVMT / 8.33] - + #Remove herring catch - if pulling using comlandr::get_herring_data() if(useHerringMaine) nafoland <- nafoland[NESPP3 != 168, ] #Gearcodes - gear <- data.table::as.data.table(DBI::dbGetQuery(channel, "select NEGEAR, NAFOGEAR from Gear")) + gear <- data.table::as.data.table(DBI::dbGetQuery(channel, "select NEGEAR, NAFOGEAR from cfdbs.Gear")) gear$NEGEAR <- as.integer(gear$NEGEAR) gear$NAFOGEAR <- as.integer(gear$NAFOGEAR)