diff --git a/mcc/resources/queries/mcc/userRequests/Pending Requests.qview.xml b/mcc/resources/queries/mcc/userRequests/Pending Requests.qview.xml
new file mode 100644
index 000000000..b849a22a8
--- /dev/null
+++ b/mcc/resources/queries/mcc/userRequests/Pending Requests.qview.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/primeseq/src/org/labkey/primeseq/pipeline/MhcMigrationPipelineJob.java b/primeseq/src/org/labkey/primeseq/pipeline/MhcMigrationPipelineJob.java
index dfd668352..b535c27d5 100644
--- a/primeseq/src/org/labkey/primeseq/pipeline/MhcMigrationPipelineJob.java
+++ b/primeseq/src/org/labkey/primeseq/pipeline/MhcMigrationPipelineJob.java
@@ -1,8 +1,6 @@
package org.labkey.primeseq.pipeline;
import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.labkey.api.collections.CaseInsensitiveHashMap;
import org.labkey.api.data.CompareType;
import org.labkey.api.data.Container;
@@ -10,6 +8,7 @@
import org.labkey.api.data.DbSchema;
import org.labkey.api.data.DbSchemaType;
import org.labkey.api.data.DbScope;
+import org.labkey.api.data.Results;
import org.labkey.api.data.SimpleFilter;
import org.labkey.api.data.Sort;
import org.labkey.api.data.Table;
@@ -58,6 +57,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URI;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -68,8 +68,6 @@
public class MhcMigrationPipelineJob extends PipelineJob
{
- private static final Logger _log = LogManager.getLogger(MhcMigrationPipelineJob.class);
-
private String remoteServerFolder;
private String remoteConnectionName;
@@ -123,7 +121,7 @@ public ActionURL getStatusHref()
@Override
public String getDescription()
{
- return "Find Orphan Sequence Files";
+ return "Migrate MHC Data";
}
@Override
@@ -184,7 +182,7 @@ private MhcMigrationPipelineJob getPipelineJob()
private Connection getConnection()
{
- DataIntegrationService.RemoteConnection rc = DataIntegrationService.get().getRemoteConnection(getPipelineJob().remoteConnectionName, getPipelineJob().targetContainer, _log);
+ DataIntegrationService.RemoteConnection rc = DataIntegrationService.get().getRemoteConnection(getPipelineJob().remoteConnectionName, getPipelineJob().targetContainer, getJob().getLogger());
return(rc.connection);
}
@@ -207,9 +205,11 @@ public RecordedActionSet run() throws PipelineJobException
createAnalyses();
createOutputFiles();
+ createAlignmentSummary();
+
//TODO:
//samples
- //alignment_summary
+
//alignment_summary_junction
//quality_metrics
//subjects
@@ -227,6 +227,75 @@ public RecordedActionSet run() throws PipelineJobException
return new RecordedActionSet();
}
+ private void createAlignmentSummary() throws PipelineJobException
+ {
+ try
+ {
+ TableInfo alignmentSummary = DbSchema.get("sequenceanalysis", DbSchemaType.Module).getTable("alignment_summary");
+ TableInfo alignmentSummaryJunction = DbSchema.get("sequenceanalysis", DbSchemaType.Module).getTable("alignment_summary_junction");
+
+ SelectRowsCommand sr = new SelectRowsCommand("sequenceanalysis", "alignment_summary");
+ sr.setColumns(Arrays.asList("rowid", "analysis_id", "file_id", "total", "total_forward", "total_reverse", "valid_pairs", "workbook/workbookId"));
+
+ SelectRowsResponse srr = sr.execute(getConnection(), getPipelineJob().remoteServerFolder);
+
+ Map alignmentSummaryMap = new HashMap<>();
+ srr.getRowset().forEach(rs -> {
+ CaseInsensitiveHashMap