Changeset 4522

Timestamp:

Sep 11, 2013, 1:03:48 PM (10 years ago)

Author:

Fredrik Levander

Message:

Fixes #817.

Location:

trunk

Files:

• client/servlet/src/locale/en/dictionary (modified) (1 diff)
• client/servlet/src/org/proteios/action/file/UseSpectrumFileForMsInspectSearchExtension.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/msInspect/RunMsInspect.java (modified) (5 diffs)
• plugin/src/org/proteios/plugins/RunMsInspectPlugin.java (modified) (5 diffs)

trunk/client/servlet/src/locale/en/dictionary

@@ -465 +465 @@
 MsInspectOptions=msInspect options
 MsInspectFeatureDetection=msInspect Feature Detection
+MsInspectFilterResults=Filter results
 MsInspectImportResultsInPipeline=Import results
 MsInspectStrategySelect=Strategy

trunk/client/servlet/src/org/proteios/action/file/UseSpectrumFileForMsInspectSearchExtension.java

@@ -146 +146 @@
     fs.setOpen(false);
     form.addFieldset(fs);
+    Checkbox<VBoolean> filterCB = new Checkbox<VBoolean>(RunMsInspect.VMSINSPECTFILTER);
+    filterCB.setLabel("MsInspectFilterResults");
+    filterCB.setValue("true");
+    filterCB.setHelp("Check to filter generated feature list using default filter");
+    filterCB.isChecked(false);
+    fs.add(filterCB);
     // Select box variables
     VString validStringParam = null;

trunk/client/servlet/src/org/proteios/action/msInspect/RunMsInspect.java

@@ -72 +72 @@
   public static final VBoolean VMSINSPECTIMPORTRESULTS = new VBoolean(
       "active.msinspectimportresults", false);
+  public static final VBoolean VMSINSPECTFILTER = new VBoolean(
+      "active.msinspectfilter", false);
   
   @Override
@@ -131 +133 @@
       // Default is to not import results
       importResultsFlag = false;
+    }
+    Boolean filterFlag = getValidBoolean(RunMsInspect.VMSINSPECTFILTER);
+    log.debug("filterFlag from request = " + filterFlag);
+    if (filterFlag == null)
+    {
+      // Default is to not to filter
+      filterFlag = false;
     }
     log.debug("importResultsFlag = " + importResultsFlag);
@@ -201 +210 @@
         activeProject,
         strategy,
+        filterFlag,
         blockerJob);
       log.debug("msInspectJob.getId() = " + msInspectJob.getId());
@@ -268 +278 @@
       Project activeProject,
       String strategy,
+      Boolean filter,
       Job blockerJob)
   {
@@ -310 +321 @@
     BooleanParameterType uploadOutputFileFlagParam = new BooleanParameterType();
     job.setParameterValue("uploadOutputFileFlag", uploadOutputFileFlagParam, uploadOutputFileFlag);
+    //
+    job.setParameterValue("filter", new BooleanParameterType(),filter);
     //
     StringParameterType timeStampParam = new StringParameterType();

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

@@ -277 +277 @@
     String timeStampStr;
     String strategy;
+    Boolean filter;
 
     msInspectInstallPath = (String) job.getValue("msInspectInstallPath");
@@ -285 +286 @@
     dirId = (Integer) job.getValue("dirId");
     uploadOutputFileFlag = (Boolean) job.getValue("uploadOutputFileFlag");
+    filter = (Boolean) job.getValue("filter");
     timeStampStr = (String) job.getValue("timeStampStr");
     strategy = (String) job.getValue("strategy");
@@ -291 +293 @@
     msInspectSearchLocal(request, response, progress, tmpDir,
       msInspectInstallPath, msInspectProgramName, msInspectMemoryInMegaBytes,
-      spectrumFileId, dirId, uploadOutputFileFlag, timeStampStr, strategy);
+      spectrumFileId, dirId, uploadOutputFileFlag, timeStampStr, strategy, filter);
     done();
   }
@@ -332 +334 @@
       String msInspectInstallPath, String msInspectProgramName, Integer msInspectMemoryInMegaBytes,
       Integer spectrumFileId, Integer dirId,
-      Boolean uploadOutputFileFlag, String timeStampStr, String strategy)
+      Boolean uploadOutputFileFlag, String timeStampStr, String strategy, Boolean filter)
   {
     log.debug("msInspectInstallPath = \"" + msInspectInstallPath + "\"");
@@ -436 +438 @@
         String strategyOption = new String("--strategy=" + strategy);
         cmdList.add(strategyOption);
+      }
+      // Default is not to filter the feature list
+      log.debug("Filter flag:"+filter);
+      if (filter==null || filter.equals(false))
+      {
+        cmdList.add("--nofilter");
       }
       cmdList.add("--outdir=" + msInspectOutputDirPath);