[LMS-2401] bugfix: swapped order of analysis protocol and assay in the name of AnalysisProcedure

SVN: 22257

sanofi/sourceTest/java/ch/systemsx/cisd/sanofi/dss/test/SanofiDropboxJythonTest.java

@@ -404,7 +404,7 @@ public class SanofiDropboxJythonTest extends AbstractJythonDataSetHandlerTest
         NewExternalData analysisDataSet = dataSetsRegistered.get(2);
         assertEquals(ANALYSIS_DATA_SET_CODE, analysisDataSet.getCode());
         assertEquals(ANALYSIS_DATA_SET_TYPE, analysisDataSet.getDataSetType());
-        assertEquals("NRF2ProdAnalysis_1.1_MatlabGeneral_1.1",
+        assertEquals("MatlabGeneral_1.1_NRF2ProdAnalysis_1.1",
                 extractAnalysisProcedureCode(analysisDataSet));
 
 

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/custom/geexplorer/GEExplorerImageAnalysisResultParser.java

@@ -241,12 +241,12 @@ public class GEExplorerImageAnalysisResultParser extends DefaultHandler
 
     public String getAnalysisProcedureName()
     {
-        if (StringUtils.isEmpty(assayWithVersion))
+        if (StringUtils.isEmpty(analysisProtocolWithVersion))
         {
-            return analysisProtocolWithVersion;
+            return assayWithVersion;
         } else
         {
-            return analysisProtocolWithVersion + "_" + assayWithVersion;
+            return assayWithVersion + "_" + analysisProtocolWithVersion;
         }
     }