From e20c2fe0a3c0e62677c965aca50f6ea4eecb5896 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 28 May 2025 10:42:36 -0700 Subject: [PATCH] Still more forUpdate parameters --- elisa/src/org/labkey/elisa/ElisaAssayProvider.java | 2 +- .../src/org/labkey/elispot/ElispotAssayProvider.java | 6 +++--- .../src/org/labkey/elispot/ElispotDataHandler.java | 4 ++-- .../src/org/labkey/elispot/ElispotManager.java | 2 +- .../src/org/labkey/elispot/ElispotProtocolSchema.java | 2 +- .../org/labkey/elispot/ElispotUploadWizardAction.java | 4 ++-- .../elispot/pipeline/BackgroundSubtractionJob.java | 2 +- .../labkey/elispot/query/ElispotRunAntigenTable.java | 2 +- flow/src/org/labkey/flow/data/FlowAssayProvider.java | 8 +++++++- .../org/labkey/flow/reports/FlowReportManager.java | 2 +- .../src/org/labkey/luminex/LuminexAssayProvider.java | 8 ++++---- .../org/labkey/luminex/LuminexRunDatabaseContext.java | 2 +- .../src/org/labkey/luminex/LuminexRunUploadForm.java | 2 +- .../org/labkey/luminex/LuminexUploadWizardAction.java | 4 ++-- .../src/org/labkey/luminex/query/AnalyteTable.java | 3 +-- .../org/labkey/luminex/query/LuminexDataTable.java | 11 +++++++++-- .../matrix/ExpressionMatrixAssayProvider.java | 2 +- nab/src/org/labkey/nab/NabAssayProvider.java | 2 +- .../labkey/viability/ViabilityAssayRunUploadForm.java | 2 -- .../viability/ViabilityAssayUploadWizardAction.java | 2 +- 20 files changed, 41 insertions(+), 31 deletions(-) diff --git a/elisa/src/org/labkey/elisa/ElisaAssayProvider.java b/elisa/src/org/labkey/elisa/ElisaAssayProvider.java index 045ca06783..290e212e3e 100644 --- a/elisa/src/org/labkey/elisa/ElisaAssayProvider.java +++ b/elisa/src/org/labkey/elisa/ElisaAssayProvider.java @@ -409,7 +409,7 @@ public DataExchangeHandler createDataExchangeHandler() public Domain getConcentrationWellGroupDomain(ExpProtocol protocol) { - return getDomainByPrefix(protocol, ASSAY_DOMAIN_DATA); + return getDomainByPrefix(protocol, ASSAY_DOMAIN_DATA, false); } @Override diff --git a/elispotassay/src/org/labkey/elispot/ElispotAssayProvider.java b/elispotassay/src/org/labkey/elispot/ElispotAssayProvider.java index e6c7e429b7..a15d83a2db 100644 --- a/elispotassay/src/org/labkey/elispot/ElispotAssayProvider.java +++ b/elispotassay/src/org/labkey/elispot/ElispotAssayProvider.java @@ -222,7 +222,7 @@ public AssayTableMetadata getTableMetadata(@NotNull ExpProtocol protocol) } @Override - public Domain getResultsDomain(ExpProtocol protocol) + public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate) { return null; } @@ -350,12 +350,12 @@ public ActionURL getImportURL(Container container, ExpProtocol protocol) public Domain getAntigenWellGroupDomain(ExpProtocol protocol) { - return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANTIGEN_WELLGROUP); + return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false); } public Domain getAnalyteDomain(ExpProtocol protocol) { - return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANALYTE); + return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANALYTE, false); } @Override diff --git a/elispotassay/src/org/labkey/elispot/ElispotDataHandler.java b/elispotassay/src/org/labkey/elispot/ElispotDataHandler.java index ff934acc81..b708b94504 100644 --- a/elispotassay/src/org/labkey/elispot/ElispotDataHandler.java +++ b/elispotassay/src/org/labkey/elispot/ElispotDataHandler.java @@ -265,7 +265,7 @@ public static void populateAntigenDataProperties(ExpRun run, Plate plate, PlateR { Container container = run.getContainer(); - Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP); + Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false); DomainProperty cellWellProp = antigenDomain.getPropertyByName(ElispotAssayProvider.CELLWELL_PROPERTY_NAME); List data = run.getOutputDatas(ElispotDataHandler.ELISPOT_DATA_TYPE); @@ -324,7 +324,7 @@ public static void populateAntigenRunProperties(ExpRun run, Plate plate, PlateRe { Container container = run.getContainer(); - Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP); + Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false); List antigenProps = antigenDomain.getProperties(); DomainProperty cellWellProp = antigenDomain.getPropertyByName(ElispotAssayProvider.CELLWELL_PROPERTY_NAME); diff --git a/elispotassay/src/org/labkey/elispot/ElispotManager.java b/elispotassay/src/org/labkey/elispot/ElispotManager.java index c25c0f30a9..55e252fde4 100644 --- a/elispotassay/src/org/labkey/elispot/ElispotManager.java +++ b/elispotassay/src/org/labkey/elispot/ElispotManager.java @@ -76,7 +76,7 @@ public static TableInfo getTableInfoElispotRunData() @NotNull public static TableInfo getTableInfoElispotAntigen(ExpProtocol protocol) { - Domain domain = AbstractAssayProvider.getDomainByPrefix(protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP); + Domain domain = AbstractAssayProvider.getDomainByPrefix(protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false); if (null != domain) return StorageProvisioner.createTableInfo(domain); throw new IllegalStateException("Domain not found for protocol: " + protocol.getName()); diff --git a/elispotassay/src/org/labkey/elispot/ElispotProtocolSchema.java b/elispotassay/src/org/labkey/elispot/ElispotProtocolSchema.java index 086293b661..0be369c89d 100644 --- a/elispotassay/src/org/labkey/elispot/ElispotProtocolSchema.java +++ b/elispotassay/src/org/labkey/elispot/ElispotProtocolSchema.java @@ -84,7 +84,7 @@ public TableInfo createProviderTable(String name, ContainerFilter cf) { if (name.equalsIgnoreCase(ANTIGEN_TABLE_NAME)) { - Domain domain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP); + Domain domain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false); if (null != domain) return new ElispotRunAntigenTable(this, cf, domain, getProtocol()); } diff --git a/elispotassay/src/org/labkey/elispot/ElispotUploadWizardAction.java b/elispotassay/src/org/labkey/elispot/ElispotUploadWizardAction.java index 4e9302b552..2a5700c7bc 100644 --- a/elispotassay/src/org/labkey/elispot/ElispotUploadWizardAction.java +++ b/elispotassay/src/org/labkey/elispot/ElispotUploadWizardAction.java @@ -168,7 +168,7 @@ public PlateAnalytePropertyHelper createAnalytePropertyHelper(ElispotRunUploadFo @Override protected void addRunActionButtons(ElispotRunUploadForm newRunForm, InsertView insertView, ButtonBar bbar) { - Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP); + Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false); List antigenColumns = antigenDomain.getProperties(); if (antigenColumns.isEmpty()) { @@ -338,7 +338,7 @@ public boolean executeStep(ElispotRunUploadForm form, BindException errors) thro } } - Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(form.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP); + Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(form.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false); List antigenColumns = antigenDomain.getProperties(); if (antigenColumns.isEmpty()) { diff --git a/elispotassay/src/org/labkey/elispot/pipeline/BackgroundSubtractionJob.java b/elispotassay/src/org/labkey/elispot/pipeline/BackgroundSubtractionJob.java index 2203095a27..5985a4c5d6 100644 --- a/elispotassay/src/org/labkey/elispot/pipeline/BackgroundSubtractionJob.java +++ b/elispotassay/src/org/labkey/elispot/pipeline/BackgroundSubtractionJob.java @@ -124,7 +124,7 @@ public void run() { String dataLsid = data.get(0).getLSID(); Map propMap = new HashMap<>(); - Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP); + Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false); DomainProperty cellWellProp = antigenDomain.getPropertyByName(ElispotAssayProvider.CELLWELL_PROPERTY_NAME); DomainProperty antigenNameProp = antigenDomain.getPropertyByName(ElispotAssayProvider.ANTIGENNAME_PROPERTY_NAME); diff --git a/elispotassay/src/org/labkey/elispot/query/ElispotRunAntigenTable.java b/elispotassay/src/org/labkey/elispot/query/ElispotRunAntigenTable.java index 67f4f3655f..e33a70760d 100644 --- a/elispotassay/src/org/labkey/elispot/query/ElispotRunAntigenTable.java +++ b/elispotassay/src/org/labkey/elispot/query/ElispotRunAntigenTable.java @@ -90,7 +90,7 @@ protected ColumnInfo resolveColumn(String name) @Override public TableInfo getLookupTableInfo() { - Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP); + Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false); return new ElispotRunAntigenTable(_userSchema, getLookupContainerFilter(), domain, _protocol); } }; diff --git a/flow/src/org/labkey/flow/data/FlowAssayProvider.java b/flow/src/org/labkey/flow/data/FlowAssayProvider.java index 5b2c30b799..b1e7b16eb5 100644 --- a/flow/src/org/labkey/flow/data/FlowAssayProvider.java +++ b/flow/src/org/labkey/flow/data/FlowAssayProvider.java @@ -198,12 +198,18 @@ public Domain getRunDomain(ExpProtocol protocol) @Override public Domain getBatchDomain(ExpProtocol protocol) + { + return getBatchDomain(protocol, false); + } + + @Override + public Domain getBatchDomain(ExpProtocol protocol, boolean forUpdate) { return null; } @Override - public Domain getResultsDomain(ExpProtocol protocol) + public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate) { return null; } diff --git a/flow/src/org/labkey/flow/reports/FlowReportManager.java b/flow/src/org/labkey/flow/reports/FlowReportManager.java index b461130bc7..dd1009025d 100644 --- a/flow/src/org/labkey/flow/reports/FlowReportManager.java +++ b/flow/src/org/labkey/flow/reports/FlowReportManager.java @@ -202,7 +202,7 @@ public static Domain ensureDomain(FlowReport report, User user, FlowTableType ta domain.setDescription("Domain for " + report.getDescriptor().getDescriptorType() + " reports on flow table " + tableType); domain.save(user); - domain = PropertyService.get().getDomain(domain.getTypeId()); + domain = PropertyService.get().getDomain(domain.getTypeId(), true); for (PropertyDescriptor prop : properties) { diff --git a/luminex/src/org/labkey/luminex/LuminexAssayProvider.java b/luminex/src/org/labkey/luminex/LuminexAssayProvider.java index 642a392681..4215789f7a 100644 --- a/luminex/src/org/labkey/luminex/LuminexAssayProvider.java +++ b/luminex/src/org/labkey/luminex/LuminexAssayProvider.java @@ -163,11 +163,11 @@ public AssayTableMetadata getTableMetadata(@NotNull ExpProtocol protocol) } @Override - public Domain getResultsDomain(ExpProtocol protocol) + public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate) { try { - return getDomainByPrefix(protocol, ASSAY_DOMAIN_CUSTOM_DATA); + return getDomainByPrefix(protocol, ASSAY_DOMAIN_CUSTOM_DATA, forUpdate); } catch (IllegalArgumentException e) { @@ -177,7 +177,7 @@ public Domain getResultsDomain(ExpProtocol protocol) addResultsDomain(protocol); // Clear the cache so we can find the domain we just created protocol.setObjectProperties(null); - return getDomainByPrefix(protocol, ASSAY_DOMAIN_CUSTOM_DATA); + return getDomainByPrefix(protocol, ASSAY_DOMAIN_CUSTOM_DATA, forUpdate); } } @@ -485,7 +485,7 @@ public boolean supportsBackgroundUpload() public static Domain getExcelRunDomain(ExpProtocol protocol) { - return AbstractAssayProvider.getDomainByPrefix(protocol, LuminexAssayProvider.ASSAY_DOMAIN_EXCEL_RUN); + return AbstractAssayProvider.getDomainByPrefix(protocol, LuminexAssayProvider.ASSAY_DOMAIN_EXCEL_RUN, false); } @Override diff --git a/luminex/src/org/labkey/luminex/LuminexRunDatabaseContext.java b/luminex/src/org/labkey/luminex/LuminexRunDatabaseContext.java index b7c13d507f..6a2d212269 100644 --- a/luminex/src/org/labkey/luminex/LuminexRunDatabaseContext.java +++ b/luminex/src/org/labkey/luminex/LuminexRunDatabaseContext.java @@ -79,7 +79,7 @@ public String[] getAnalyteNames() public Map getAnalyteProperties(String analyteName) { Analyte analyte = getAnalyte(analyteName); - Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE); + Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false); return getProperties(domain, OntologyManager.getPropertyObjects(_run.getContainer(), analyte.getLsid())); } diff --git a/luminex/src/org/labkey/luminex/LuminexRunUploadForm.java b/luminex/src/org/labkey/luminex/LuminexRunUploadForm.java index a63ecb37d3..f031f7e668 100644 --- a/luminex/src/org/labkey/luminex/LuminexRunUploadForm.java +++ b/luminex/src/org/labkey/luminex/LuminexRunUploadForm.java @@ -118,7 +118,7 @@ protected Map getAnalytePropertyMapFromRequest(List getAnalyteProperties(String analyteName) { - Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE); + Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false); List domainProperties = analyteDomain.getProperties(); return getAnalytePropertyMapFromRequest(domainProperties, analyteName); } diff --git a/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java b/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java index 0430d0f998..7f71d96e9f 100644 --- a/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java +++ b/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java @@ -109,7 +109,7 @@ public LuminexUploadWizardAction() @Override protected void addRunActionButtons(LuminexRunUploadForm newRunForm, InsertView insertView, ButtonBar bbar) { - Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE); + Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false); List analyteColumns = analyteDomain.getProperties(); if (analyteColumns.isEmpty()) { @@ -157,7 +157,7 @@ private ModelAndView getAnalytesView(String[] analyteNames, final LuminexRunUplo for (String analyte : analyteNames) view.getDataRegion().addHiddenFormField("analyteNames", analyte); - Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE); + Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false); List analyteColumns = analyteDomain.getProperties(); Set initNegativeControlAnalytes = new TreeSet<>(); List negativeBeadDefaultValues = AnalyteDefaultValueService.getAnalyteProperty(Arrays.asList(analyteNames), getContainer(), _protocol, LuminexDataHandler.NEGATIVE_BEAD_COLUMN_NAME); diff --git a/luminex/src/org/labkey/luminex/query/AnalyteTable.java b/luminex/src/org/labkey/luminex/query/AnalyteTable.java index ae7ac3a964..36ca512f83 100644 --- a/luminex/src/org/labkey/luminex/query/AnalyteTable.java +++ b/luminex/src/org/labkey/luminex/query/AnalyteTable.java @@ -41,7 +41,6 @@ import org.labkey.api.security.permissions.ReadPermission; import org.labkey.api.security.permissions.UpdatePermission; import org.labkey.api.assay.AbstractAssayProvider; -import org.labkey.api.assay.AssaySchema; import org.labkey.luminex.LuminexAssayProvider; import org.labkey.luminex.model.Analyte; @@ -115,7 +114,7 @@ public TableInfo getLookupTableInfo() lsidColumn.setShownInUpdateView(false); var colProperty = wrapColumn("Properties", getRealTable().getColumn("LSID")); - Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_userSchema.getProtocol(), LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE); + Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_userSchema.getProtocol(), LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false); Map map = new TreeMap<>(); for(DomainProperty pd : analyteDomain.getProperties()) { diff --git a/luminex/src/org/labkey/luminex/query/LuminexDataTable.java b/luminex/src/org/labkey/luminex/query/LuminexDataTable.java index e12af5a91d..75a7d7796a 100644 --- a/luminex/src/org/labkey/luminex/query/LuminexDataTable.java +++ b/luminex/src/org/labkey/luminex/query/LuminexDataTable.java @@ -282,7 +282,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo) defaultCols.add(FieldKey.fromParts("Titration")); // issue 21253: Conditional show/hide of the Negative Bead column in the Luminex assay results grid - Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE); + Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false); if (analyteDomain != null && analyteDomain.getPropertyByName(LuminexDataHandler.NEGATIVE_CONTROL_COLUMN_NAME) != null) { defaultCols.add(FieldKey.fromParts("Analyte", "NegativeBead")); @@ -395,7 +395,14 @@ private SQLFragment getExclusionsUnionSQL() @NotNull public Domain getDomain() { - return _provider.getResultsDomain(_userSchema.getProtocol()); + return getDomain(false); + } + + @Override + @NotNull + public Domain getDomain(boolean forUpdate) + { + return _provider.getResultsDomain(_userSchema.getProtocol(), forUpdate); } @Override diff --git a/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixAssayProvider.java b/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixAssayProvider.java index 40a041bca0..c5b82d5832 100644 --- a/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixAssayProvider.java +++ b/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixAssayProvider.java @@ -135,7 +135,7 @@ public List getParticipantVisitResolverTypes() } @Override - public Domain getResultsDomain(ExpProtocol protocol) + public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate) { return null; } diff --git a/nab/src/org/labkey/nab/NabAssayProvider.java b/nab/src/org/labkey/nab/NabAssayProvider.java index 7dd69c758e..ac3fcdb17f 100644 --- a/nab/src/org/labkey/nab/NabAssayProvider.java +++ b/nab/src/org/labkey/nab/NabAssayProvider.java @@ -337,7 +337,7 @@ protected Pair> createVirusWellGroupDomain(C public Domain getVirusWellGroupDomain(ExpProtocol protocol) { if (supportsMultiVirusPlate()) - return getDomainByPrefixIfExists(protocol, ASSAY_DOMAIN_VIRUS_WELLGROUP); + return getDomainByPrefixIfExists(protocol, ASSAY_DOMAIN_VIRUS_WELLGROUP, false); else return null; } diff --git a/viability/src/org/labkey/viability/ViabilityAssayRunUploadForm.java b/viability/src/org/labkey/viability/ViabilityAssayRunUploadForm.java index 3ccaa4b176..c85a4e794e 100644 --- a/viability/src/org/labkey/viability/ViabilityAssayRunUploadForm.java +++ b/viability/src/org/labkey/viability/ViabilityAssayRunUploadForm.java @@ -31,11 +31,9 @@ import org.labkey.api.assay.actions.UploadWizardAction; import org.labkey.api.assay.AssayDataCollector; import org.labkey.api.assay.AssayFileWriter; -import org.labkey.api.util.UnexpectedException; import org.labkey.vfs.FileLike; import org.springframework.validation.Errors; -import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/viability/src/org/labkey/viability/ViabilityAssayUploadWizardAction.java b/viability/src/org/labkey/viability/ViabilityAssayUploadWizardAction.java index f801491157..035839aefc 100644 --- a/viability/src/org/labkey/viability/ViabilityAssayUploadWizardAction.java +++ b/viability/src/org/labkey/viability/ViabilityAssayUploadWizardAction.java @@ -173,7 +173,7 @@ protected InsertView _getResultsView(ViabilityAssayRunUploadForm form, boolean e List> rows = errorReshow ? form.getResultProperties(errors) : form.getParsedResultData(); Map> reRunResults = form.getReRunResults(); - Domain resultDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ExpProtocol.ASSAY_DOMAIN_DATA); + Domain resultDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ExpProtocol.ASSAY_DOMAIN_DATA, false); List resultDomainProperties = resultDomain.getProperties(); String lsidCol = "RowID"; InsertView view = createInsertView(ViabilitySchema.getTableInfoResults(), lsidCol, resultDomainProperties, errorReshow, ResultsStepHandler.NAME, form, errors);