further changes to formatting of file names from CTIS

NEWS.md

@@ -1,7 +1,7 @@
 # ctrdata 1.17.2.9000
 
 ## Possibly breaking change
-- File names for documents downloaded from `CTIS` now start with the document type (e.g., "SbjctInfaICF - ..." as abbreviation of "Subject information and informed consent form (for publication)" and instead of the previous "parts2auth_...")
+- File names for documents downloaded from `CTIS` now include the document type and use different separators (e.g., "parts2auth - SbjctInfaICF - ..." as abbreviation of "Subject information and informed consent form (for publication)", was previously "parts2auth_...")
 
 ## Improvements 
 - Add retrieval of historic versions of trial records from CTGOV2 (for CTIS, they are automatically retrieved)

R/ctrLoadQueryIntoDbCtis.R

@@ -682,9 +682,10 @@ ctrLoadQueryIntoDbCtis <- function(
       rl <- unlist(sapply(rl$lengths, function(i) c(TRUE, rep(FALSE, i - 1L))))
       dlFiles <- dlFiles[rl, , drop = FALSE]
 
-      # add destination file name
-      dlFiles$filename <- paste0(
-        # type in CTIS dlFiles$part
+      # calculate prefix for document type
+      dlFiles$prefix <- paste0(
+        # type in CTIS 
+        dlFiles$part, " - ", 
         # type of document
         abbreviate(
           tools::toTitleCase(
@@ -693,11 +694,15 @@ ctrLoadQueryIntoDbCtis <- function(
               c(" - Final", ": ", " (SmPC)", "(EU) ",
                 " (for publication)", ":", "\"", "/", "."), 
               "", vectorize_all = FALSE)), 
-          minlength = 12L, named = FALSE), " - ",
+          minlength = 12L, named = FALSE))
+
+      # add destination file name
+      dlFiles$filename <- paste0(
+        dlFiles$prefix, " - ",
         # robustly sanitised file name
         gsub("[^[:alnum:] ._-]", "",  dlFiles$title),
         ".", dlFiles$fileTypeLabel)
-
+      
       #### api_11: urls ####
 
       # calculate url