update data model

ices-tools-dev · Feb 14, 2024 · 6696428 · 6696428
1 parent abace41
commit 6696428
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: RDBEScore
 Type: Package
 Title: Functions for the ICES Regional Database and Estimation System (RDBES)
-Version: 0.3.0
+Version: 0.3.1
 Author: c(
     person(given = "David", 
            family = "Currie", 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# RDBEScore 0.3.1 
+
+* update to the latest RDBES data format (version 1.19.20)
+
 # RDBEScore 0.3.0 - 20/11/2023
 
 This version introduces a bunch of changes to the package. The updated behaviour is best explained in the vignettes. The main changes are:

diff --git a/data-raw/dataFormat/RDBES Data Model CL CE.xlsx b/data-raw/dataFormat/RDBES Data Model CL CE.xlsx
diff --git a/data-raw/dataFormat/RDBES Data Model CS.xlsx b/data-raw/dataFormat/RDBES Data Model CS.xlsx
diff --git a/data-raw/dataFormat/RDBES Data Model VD SL.xlsx b/data-raw/dataFormat/RDBES Data Model VD SL.xlsx
diff --git a/data-raw/getRDBESDataModelColumnNames.R b/data-raw/getRDBESDataModelColumnNames.R
@@ -72,18 +72,19 @@ if(nrow(mapColNamesFieldR[mapColNamesFieldR$Table.Prefix == "FT" & mapColNamesFi
                              mapColNamesFieldR[(ind+1):nrow(mapColNamesFieldR),])
 
 }
-
+# there is currently no hierarchy where LE directly preceeds SA (without SS) so this is not needed:
+#this was a bug in the RDBES download part
 # Similar fix to above for LEid in the SA table
-if(nrow(mapColNamesFieldR[mapColNamesFieldR$Table.Prefix == "SA" & mapColNamesFieldR$Field.Name == "LEid",]) == 0) {
-  # this is the row after which the new row needs to be added
-  ind <- intersect(which(mapColNamesFieldR$Table.Prefix == "SA"),
-                   which(mapColNamesFieldR$Field.Name == "SSid"))
-
-  mapColNamesFieldR <- rbind(mapColNamesFieldR[1:ind,],
-                             c("SA", "LEid", "LEid", "Integer", "integer"),
-                             mapColNamesFieldR[(ind+1):nrow(mapColNamesFieldR),])
-
-}
+#if(nrow(mapColNamesFieldR[mapColNamesFieldR$Table.Prefix == "SA" & mapColNamesFieldR$Field.Name == "LEid",]) == 0) {
+#  # this is the row after which the new row needs to be added
+#  ind <- intersect(which(mapColNamesFieldR$Table.Prefix == "SA"),
+#                   which(mapColNamesFieldR$Field.Name == "SSid"))
+#
+#  mapColNamesFieldR <- rbind(mapColNamesFieldR[1:ind,],
+#                             c("SA", "LEid", "LEid", "Integer", "integer"),
+#                             mapColNamesFieldR[(ind+1):nrow(mapColNamesFieldR),])
+#
+#}
 
 # Another similar fix to above for FOid in the LE table
 if(nrow(mapColNamesFieldR[mapColNamesFieldR$Table.Prefix == "LE" & mapColNamesFieldR$Field.Name == "FOid",]) == 0) {