diff DVN-web/src/main/java/edu/harvard/iq/dvn/core/study/StudyFileServiceBean.java @ 4:9b408c9b05ab

Integration with LGServices.
author "jurzua <jurzua@mpiwg-berlin.mpg.de>"
date Thu, 07 May 2015 14:56:46 +0200
parents 2ae72563a29d
children
line wrap: on
line diff
--- a/DVN-web/src/main/java/edu/harvard/iq/dvn/core/study/StudyFileServiceBean.java	Tue Mar 10 15:47:07 2015 +0100
+++ b/DVN-web/src/main/java/edu/harvard/iq/dvn/core/study/StudyFileServiceBean.java	Thu May 07 14:56:46 2015 +0200
@@ -31,6 +31,7 @@
 import edu.harvard.iq.dvn.core.web.util.MD5Checksum;
 import edu.harvard.iq.dvn.ingest.dsb.DSBIngestMessage;
 import edu.harvard.iq.dvn.ingest.dsb.DSBWrapper;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileInputStream;
@@ -41,7 +42,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.annotation.Resource;
 import javax.ejb.EJB;
 import javax.ejb.EJBException;
@@ -58,7 +61,9 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
+
 import org.apache.commons.io.FileUtils;
+
 import java.util.zip.*;
 
 /**
@@ -370,6 +375,7 @@
         List otherFiles = new ArrayList();
 
         Iterator iter = newFiles.iterator();
+        StringBuilder sb = new StringBuilder("\n ******************************* step 1: divide the files, based on subsettable or not\n");
         while (iter.hasNext()) {
             StudyFileEditBean fileBean = (StudyFileEditBean) iter.next();
             // Note that for the "special" OtherFiles we want to utilize the 
@@ -378,14 +384,17 @@
             // - L.A.
             if (fileBean.getStudyFile().isSubsettable() || fileBean.getStudyFile() instanceof SpecialOtherFile) {
                 subsettableFiles.add(fileBean);
+                sb.append("\tsubsettableFiles.add(fileBean): " + fileBean.getOriginalFileName() + "\n");
             } else {
                 otherFiles.add(fileBean);
                 // also add to study, so that it will be flushed for the ids
                 fileBean.getStudyFile().setStudy(study);
                 study.getStudyFiles().add(fileBean.getStudyFile());
+                sb.append("\totherFiles.add(fileBean): " + fileBean.getOriginalFileName() + "\n");
 
             }
         }
+        logger.log(Level.INFO, sb.toString());
 
         if (otherFiles.size()>0) {
              // Only persist the studyVersion we are adding a file that doesn't need to be ingested (non-subsettable)
@@ -404,6 +413,7 @@
         }
 
         // step 2: iterate through nonsubsettable files, moving from temp to new location
+        sb = new StringBuilder("\n ******************************* step 2: iterate through nonsubsettable files, moving from temp to new location *******************************/m");
         File newDir = FileUtil.getStudyFileDir(study);
         iter = otherFiles.iterator();
         while (iter.hasNext()) {
@@ -420,14 +430,19 @@
 
                 em.persist(fileBean.getStudyFile());
                 em.persist(fileBean.getFileMetadata());
-
+                sb.append("\t##### em.persist OK\n");
+                sb.append("\ttempFile: " + tempFile.getAbsolutePath() + "\n");
+                sb.append("\tnewLocationFile: " + newLocationFile.getAbsolutePath() + "\n");
+                
             } catch (IOException ex) {
                 throw new EJBException(ex);
             }
             f.setMd5(md5Checksum.CalculateMD5(f.getFileSystemLocation()));
         }
+        logger.log(Level.INFO, sb.toString());
 
         // step 3: iterate through subsettable files, sending a message via JMS
+        logger.log(Level.INFO, "\n step 3: iterate through subsettable files, sending a message via JMS \n");
         if (subsettableFiles.size() > 0) {
             QueueConnection conn = null;
             QueueSession session = null;
@@ -489,7 +504,7 @@
 
         if (!otherFiles.isEmpty()) {
             studyService.saveStudyVersion(studyVersion, user.getId());
-           
+            logger.log(Level.INFO, "\n ******************************* saveStudyVersion OK!!! \n\n\n ----------------------------------------------------------------------------------------------------");
         }
 
        
@@ -646,7 +661,7 @@
                         } else if (fileBean.getControlCardType().equals("ddi")) {
                             f.setOriginalFileType("application/x-dvn-tabddi-zip");
                         } else {
-                            logger.info("WARNING: unknown control card-based Ingest type? -- "+fileBean.getControlCardType());
+                            logger.log(Level.INFO, "WARNING: unknown control card-based Ingest type? -- "+fileBean.getControlCardType());
                             f.setOriginalFileType(originalFileType);
                         }
                         f.setMd5(md5Checksum.CalculateMD5(tempOriginalFile.getAbsolutePath()));