implemented a dedicated method in the VersionFileService for looking up

filemetadatas of ingested tabular datafiles only (no longer relying on
the mime type, which was suboptimal). #11405

Author: landreev

src/main/java/edu/harvard/iq/dataverse/DatasetVersionFilesServiceBean.java

@@ -180,6 +180,55 @@ public List<FileMetadata> getFileMetadatas(DatasetVersion datasetVersion, Intege
         }
         return typedQuery.getResultList();
     }
+    
+    /**
+     * Similar to the above, but dedicated for retrieving FileMetadatas of only
+     * tabular datafiles in the specified DatasetVersion. Used in the metadata
+     * export subsystem. 
+     *
+     * @param datasetVersion the DatasetVersion to access
+     * @param limit          for pagination, can be null
+     * @param offset         for pagination, can be null
+     * @param publicFilesOnly  skip restricted, embargoed etc. files 
+     * @return a FileMetadata list from the specified DatasetVersion
+     */
+    public List<FileMetadata> getTabularDataFileMetadatas(DatasetVersion datasetVersion, Integer limit, Integer offset, boolean publicFilesOnly) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<FileMetadata> criteriaQuery = criteriaBuilder.createQuery(FileMetadata.class);
+        
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        Predicate basePredicate = criteriaBuilder.equal(fileMetadataRoot.get("datasetVersion").<String>get("id"), datasetVersion.getId());
+        
+        Root<DataTable> dataTableRoot = criteriaQuery.from(DataTable.class);        
+        Predicate tabularPredicate = criteriaBuilder.equal(dataTableRoot.get("dataFile"), fileMetadataRoot.get("dataFile"));
+        
+        Predicate combinedPredicate;
+        
+        if (publicFilesOnly) {
+            combinedPredicate = criteriaBuilder.and(basePredicate, tabularPredicate);
+        } else {
+            combinedPredicate = criteriaBuilder.and(basePredicate, 
+                    tabularPredicate, 
+                    createSearchCriteriaAccessStatusPredicate(FileSearchCriteria.FileAccessStatus.Public, 
+                            criteriaBuilder, 
+                            fileMetadataRoot));
+        }
+        
+        criteriaQuery
+                .select(fileMetadataRoot)
+                .where(combinedPredicate)
+                .orderBy(criteriaBuilder.asc(fileMetadataRoot.get("label")));
+        
+        TypedQuery<FileMetadata> typedQuery = em.createQuery(criteriaQuery);
+        if (limit != null) {
+            typedQuery.setMaxResults(limit);
+        }
+        if (offset != null) {
+            typedQuery.setFirstResult(offset);
+        }
+        
+        return typedQuery.getResultList();
+    }
 
     /**
      * Returns the total download size of all files for a particular DatasetVersion

src/main/java/edu/harvard/iq/dataverse/export/InternalExportDataProvider.java

@@ -132,21 +132,11 @@ public JsonArray getTabularDataDetails(ExportDataContext... context) throws Expo
             throw new ExportException("EJB DatasetVersionFilesService is not available");
         }
 
-        FileSearchCriteria fileSearchCriteria;
-        try {
-            fileSearchCriteria = new FileSearchCriteria(
-                    MIME_TYPE_INGESTED_FILE,
-                    isOnlyPublicMetadataRequested(context) ? FileSearchCriteria.FileAccessStatus.Public : null,
-                    null,
-                    null,
-                    null
-            );
-        } catch (IllegalArgumentException e) {
-            throw new ExportException("Failed to build a retrieval query for tabular file metadata");
-        }
-
-        fileMetadatas = datasetVersionFilesService.getFileMetadatas(dv, getLength(context), getOffset(context), fileSearchCriteria, DatasetVersionFilesServiceBean.FileOrderCriteria.NameAZ);
-
+        fileMetadatas = datasetVersionFilesService.getTabularDataFileMetadatas(dv, 
+                getLength(context), 
+                getOffset(context),
+                isOnlyPublicMetadataRequested(context));
+        
         for (FileMetadata fileMetadata : fileMetadatas) {
             DataFile dataFile = fileMetadata.getDataFile();
             jab.add(JsonPrinter.jsonDatafileWithDatatableForExport(dataFile, fileMetadata));

src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java

@@ -1683,7 +1683,7 @@ public static void createDataDscrInBatches(XMLStreamWriter xmlw, ExportDataProvi
         try {
             while (inProgress) {
                 JsonArray tabularFileDetails = exportDataProvider.getTabularDataDetails(ExportDataContext.context().withOffset(offset).withLength(DATATABLES_BATCH_SIZE));
-                logger.info("retrieved "+tabularFileDetails.size()+" tabular file data entries");
+                logger.fine("retrieved " + tabularFileDetails.size() + " tabular file data entries");
 
                 for (int i = 0; i < tabularFileDetails.size(); i++) {
                     JsonObject fileJson = tabularFileDetails.getJsonObject(i);
@@ -1730,7 +1730,7 @@ private static void createVariablesForDataFile(XMLStreamWriter xmlw, JsonObject
         }
         JsonObject dataTable = fileJson.getJsonArray("dataTables").getJsonObject(0);
         JsonArray vars = dataTable.getJsonArray("dataVariables");
-        logger.info(vars.size() + " variables retrieved for file " + fileJson.getJsonNumber("id"));
+        logger.fine(vars.size() + " variables retrieved for file " + fileJson.getJsonNumber("id"));
         if (vars != null) {
             for (int j = 0; j < vars.size(); j++) {
                 createVarDDI(xmlw, vars.getJsonObject(j), fileJson.getJsonNumber("id").toString(),
@@ -2003,11 +2003,11 @@ private static void createVarDDI(XMLStreamWriter xmlw, JsonObject dvar, String f
     }
 
  private static int createFileDscrs(XMLStreamWriter xmlw, List<FileDTO> fileDtos) throws XMLStreamException {
-     logger.info(fileDtos.size() + "files passed");
+     logger.fine("total " + fileDtos.size() + " file DTOs to process for fileDscr");
         String dataverseUrl = SystemConfig.getDataverseSiteUrlStatic();
         int counter = 0;
         for (FileDTO fileDTo : fileDtos) {
-            logger.info("processing file "+ fileDTo.getDataFile().getId());
+            logger.fine("processing file " + fileDTo.getDataFile().getId());
             if (isTabularData(fileDTo)) {
                 xmlw.writeStartElement("fileDscr");
 
@@ -2094,7 +2094,7 @@ private static int createFileDscrs(XMLStreamWriter xmlw, List<FileDTO> fileDtos)
                 counter++; 
             }
         }
-        logger.info("produced "+counter+" fileDscr entries; returning");
+        logger.fine("produced " + counter + " fileDscr entries.");
         return counter;
     }