Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
d55a8a19
Commit
d55a8a19
authored
14 years ago
by
kohleman
Browse files
Options
Downloads
Patches
Plain Diff
just take the first GERALD die which you found, just a bit more robust
SVN: 18343
parent
3b6207bb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/IlluminaSummaryReportingPlugin.java
+17
-24
17 additions, 24 deletions
.../cisd/dsu/dss/plugins/IlluminaSummaryReportingPlugin.java
with
17 additions
and
24 deletions
deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/IlluminaSummaryReportingPlugin.java
+
17
−
24
View file @
d55a8a19
...
@@ -61,7 +61,7 @@ public class IlluminaSummaryReportingPlugin extends AbstractTableModelReportingP
...
@@ -61,7 +61,7 @@ public class IlluminaSummaryReportingPlugin extends AbstractTableModelReportingP
private
static
final
String
[]
PROPERTIES
=
private
static
final
String
[]
PROPERTIES
=
{
"GENOME_ANALYZER"
,
"END_TYPE"
,
"ILLUMINA_PIPELINE_VERSION"
,
{
"GENOME_ANALYZER"
,
"END_TYPE"
,
"ILLUMINA_PIPELINE_VERSION"
,
"CYCLES_REQUESTED_BY_CUSTOMER"
};
"CYCLES_REQUESTED_BY_CUSTOMER"
};
public
IlluminaSummaryReportingPlugin
(
Properties
properties
,
File
storeRoot
)
public
IlluminaSummaryReportingPlugin
(
Properties
properties
,
File
storeRoot
)
{
{
...
@@ -94,27 +94,20 @@ public class IlluminaSummaryReportingPlugin extends AbstractTableModelReportingP
...
@@ -94,27 +94,20 @@ public class IlluminaSummaryReportingPlugin extends AbstractTableModelReportingP
// set the directory containing the Summary.xml
// set the directory containing the Summary.xml
File
childDirectory
=
File
childDirectory
=
new
File
(
originalData
,
dataset
.
getSampleCode
()
new
File
(
originalData
,
dataset
.
getSampleCode
()
+
DATA_INTENSITIES_BASE_CALLS_PATH
);
+
DATA_INTENSITIES_BASE_CALLS_PATH
);
File
[]
files
=
childDirectory
.
listFiles
(
new
FileFilter
()
File
[]
files
=
childDirectory
.
listFiles
(
new
FileFilter
()
{
public
boolean
accept
(
File
file
)
{
{
return
file
.
isDirectory
()
&&
file
.
getName
().
startsWith
(
GERALD_DIR
);
public
boolean
accept
(
File
file
)
}
{
});
return
file
.
isDirectory
()
&&
file
.
getName
().
startsWith
(
GERALD_DIR
);
}
System
.
out
.
println
(
files
[
0
]);
});
if
(
files
.
length
==
1
)
{
// just take the first GERALD folder which was found
File
geraldDir
=
files
[
0
];
File
geraldDir
=
files
[
0
];
File
summaryFile
=
new
File
(
geraldDir
,
SUMMARY_FILE_NAME
);
File
summaryFile
=
new
File
(
geraldDir
,
SUMMARY_FILE_NAME
);
describe
(
builder
,
dataset
,
summaryFile
);
describe
(
builder
,
dataset
,
summaryFile
);
}
else
{
// throw new EnvironmentFailureException(String.format("More than one ..."));
// removed because it doesn't help, so just do nothing
}
}
}
return
builder
.
getTableModel
();
return
builder
.
getTableModel
();
}
}
...
@@ -194,10 +187,10 @@ public class IlluminaSummaryReportingPlugin extends AbstractTableModelReportingP
...
@@ -194,10 +187,10 @@ public class IlluminaSummaryReportingPlugin extends AbstractTableModelReportingP
String
sampleCode
=
dataset
.
getSampleCode
();
String
sampleCode
=
dataset
.
getSampleCode
();
String
databaseInstanceCode
=
dataset
.
getDatabaseInstanceCode
();
String
databaseInstanceCode
=
dataset
.
getDatabaseInstanceCode
();
SampleIdentifier
sampleIdentifier
=
SampleIdentifier
sampleIdentifier
=
new
SampleIdentifier
(
new
SpaceIdentifier
(
databaseInstanceCode
,
spaceCode
),
new
SampleIdentifier
(
new
SpaceIdentifier
(
databaseInstanceCode
,
spaceCode
),
sampleCode
);
sampleCode
);
Sample
sampleOrNull
=
Sample
sampleOrNull
=
ServiceProvider
.
getOpenBISService
().
tryGetSampleWithExperiment
(
sampleIdentifier
);
ServiceProvider
.
getOpenBISService
().
tryGetSampleWithExperiment
(
sampleIdentifier
);
if
(
sampleOrNull
==
null
)
if
(
sampleOrNull
==
null
)
{
{
throw
new
EnvironmentFailureException
(
String
.
format
(
throw
new
EnvironmentFailureException
(
String
.
format
(
...
@@ -220,7 +213,7 @@ public class IlluminaSummaryReportingPlugin extends AbstractTableModelReportingP
...
@@ -220,7 +213,7 @@ public class IlluminaSummaryReportingPlugin extends AbstractTableModelReportingP
{
{
// we use one instance
// we use one instance
private
static
JaxbXmlParser
<
IlluminaSummary
>
PARSER_INSTANCE
=
private
static
JaxbXmlParser
<
IlluminaSummary
>
PARSER_INSTANCE
=
new
JaxbXmlParser
<
IlluminaSummary
>(
IlluminaSummary
.
class
,
false
);
new
JaxbXmlParser
<
IlluminaSummary
>(
IlluminaSummary
.
class
,
false
);
public
static
IlluminaSummary
readSummaryXML
(
File
summaryXml
)
public
static
IlluminaSummary
readSummaryXML
(
File
summaryXml
)
{
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment