Rename process.bib->process.bibfile and process.internal->process.entry

ices-tools-prod · Apr 4, 2020 · 2e87368 · 2e87368
1 parent b3c2998
commit 2e87368
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -39,8 +39,8 @@ export(os.windows)
 export(parse.repo)
 export(period)
 export(plus)
-export(process.bib)
-export(process.inner)
+export(process.bibfile)
+export(process.entry)
 export(read.taf)
 export(rmdir)
 export(rnd)

diff --git a/NEWS b/NEWS
@@ -20,6 +20,9 @@ icesTAF 3.4-0 (2020-03-27)
   a special value, similar to source = {file}. Warn if source = {owner/repo@ref}
   entry is missing the '@ref' part.
 
+* Renamed internal function process.bib() to process.bibfile() and
+  process.inner() to process.entry().
+
 
 
 

diff --git a/R/process.bib.R → R/process.bibfile.R b/R/process.bib.R → R/process.bibfile.R
@@ -6,7 +6,7 @@
 
 ## Process *.bib file
 
-process.bib <- function(bibfile, clean=TRUE, quiet=FALSE)
+process.bibfile <- function(bibfile, clean=TRUE, quiet=FALSE)
 {
   if(!quiet)
     message("Processing ", bibfile)
@@ -65,7 +65,7 @@ process.bib <- function(bibfile, clean=TRUE, quiet=FALSE)
              file.path(type, key) else type
     mkdir(dir)  # target directory
 
-    process.inner(bib, dir, quiet)
+    process.entry(bib, dir, quiet)
   }
 
   invisible(TRUE)

diff --git a/R/process.inner.R → R/process.entry.R b/R/process.inner.R → R/process.entry.R
@@ -6,7 +6,7 @@
 
 ## Process bib entry
 
-process.inner <- function(bib, dir, quiet)
+process.entry <- function(bib, dir, quiet)
 {
   key <- attr(bib, "key")
 

diff --git a/R/taf.bootstrap.R b/R/taf.bootstrap.R
@@ -93,13 +93,14 @@ taf.bootstrap <- function(software=TRUE, data=TRUE, clean=TRUE, quiet=FALSE,
   ## 1  Process software
   if(software && file.exists("SOFTWARE.bib"))
   {
-    out["SOFTWARE.bib"] <- process.bib("SOFTWARE.bib", clean=clean, quiet=quiet)
+    out["SOFTWARE.bib"] <- process.bibfile("SOFTWARE.bib",
+                                           clean=clean, quiet=quiet)
   }
 
   ## 2  Process data
   if(data && file.exists("DATA.bib"))
   {
-    out["DATA.bib"] <- process.bib("DATA.bib", clean=clean, quiet=quiet)
+    out["DATA.bib"] <- process.bibfile("DATA.bib", clean=clean, quiet=quiet)
   }
 
   ## Remove empty folders

diff --git a/man/icesTAF-internal.Rd b/man/icesTAF-internal.Rd