Changeset 4078

Timestamp:

Dec 16, 2010, 12:24:22 PM (12 years ago)

Author:

olle

Message:

Refs #668. Class/file plugins/RunMsInspectPlugin.java in plugin/ updated to only delete an msInspect result file in the temp folder if uploading it to Proteios SE was successful:

1. Private method void msInspectSearchLocal(Request request, Response response, ...) updated to only delete an msInspect result file in the temp folder if uploading it to Proteios SE was successful. An instruction to upload the result file manually is now also added to the job message if uploading the file to Proteios SE failed.

File:

• trunk/plugin/src/org/proteios/plugins/RunMsInspectPlugin.java (modified) (4 diffs)

trunk/plugin/src/org/proteios/plugins/RunMsInspectPlugin.java

@@ -540 +540 @@
       doneMessage = doneMessage + "\n" + "msInspect output file: " + msInspectOutputPath;
       // Optional upload of msInspect output file
+      boolean outputFileUploaded = false;
       if (uploadOutputFileFlag != null && uploadOutputFileFlag)
       {
@@ -552 +553 @@
             uploadMsInspectOutputFile(tmpDir,
               msInspectOutputFilename, filenameOfUploadedFile, dirId, description);
+            outputFileUploaded = true;
             doneMessage = doneMessage + "\n" + "Output file uploaded: " + filenameOfUploadedFile;
           }
@@ -557 +559 @@
           {
             doneMessage = doneMessage + "\n" + "Output file upload error: " + e;
+            doneMessage = doneMessage + "\n" + "Upload output file manually: " + msInspectOutputPath;
           }
         }
@@ -568 +571 @@
       if (uploadOutputFileFlag != null && uploadOutputFileFlag)
       {
-        if (outputFileFound)
+        if (outputFileUploaded)
         {
           deleteResultFile = true;