From 0085f6b844fbe741324dfd050a7e7d12add9c823 Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Mon, 18 Jul 2011 07:33:44 +0000
Subject: [PATCH] [LMS-2387] - YeastLab fixes
SVN: 22164
---
plasmid/resource/db/plasmids-YeastLab.sql | 2 +-
plasmid/resource/db/plasmids.sql | 2 +-
.../ethz/bsse/cisd/plasmid/dss/PlasmidStorageProcessor.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plasmid/resource/db/plasmids-YeastLab.sql b/plasmid/resource/db/plasmids-YeastLab.sql
index f14bdbfde99..3d289fdcbd2 100644
--- a/plasmid/resource/db/plasmids-YeastLab.sql
+++ b/plasmid/resource/db/plasmids-YeastLab.sql
@@ -2123,7 +2123,7 @@ COPY data_set_type_property_types (id, dsty_id, prty_id, is_mandatory, is_manage
COPY data_set_types (id, code, description, dbin_id, modification_timestamp, main_ds_pattern, main_ds_path) FROM stdin;
1 UNKNOWN \N 1 2010-05-26 17:41:21.272491+02 \N \N
-2 SEQ_FILE \N 1 2010-05-26 17:41:21.272491+02 generated\*.png \N
+2 SEQ_FILE \N 1 2010-05-26 17:41:21.272491+02 generated\*.svg \N
3 RAW_DATA \N 1 2010-05-26 17:41:58.696032+02 \N \N
4 VERIFICATION \N 1 2010-05-26 17:42:07.328466+02 *.* \N
\.
diff --git a/plasmid/resource/db/plasmids.sql b/plasmid/resource/db/plasmids.sql
index ea0e9f85c15..0d87ec321ac 100644
--- a/plasmid/resource/db/plasmids.sql
+++ b/plasmid/resource/db/plasmids.sql
@@ -2078,7 +2078,7 @@ COPY data_set_type_property_types (id, dsty_id, prty_id, is_mandatory, is_manage
COPY data_set_types (id, code, description, dbin_id, modification_timestamp, main_ds_pattern, main_ds_path) FROM stdin;
1 UNKNOWN \N 1 2010-05-26 17:41:21.272491+02 \N \N
-2 SEQ_FILE \N 1 2010-05-26 17:41:21.272491+02 generated\*.png \N
+2 SEQ_FILE \N 1 2010-05-26 17:41:21.272491+02 generated\*.svg \N
3 RAW_DATA \N 1 2010-05-26 17:41:58.696032+02 \N \N
4 VERIFICATION \N 1 2010-05-26 17:42:07.328466+02 *.* \N
\.
diff --git a/plasmid/source/java/ch/ethz/bsse/cisd/plasmid/dss/PlasmidStorageProcessor.java b/plasmid/source/java/ch/ethz/bsse/cisd/plasmid/dss/PlasmidStorageProcessor.java
index 60595fc53f4..2a382965ae4 100644
--- a/plasmid/source/java/ch/ethz/bsse/cisd/plasmid/dss/PlasmidStorageProcessor.java
+++ b/plasmid/source/java/ch/ethz/bsse/cisd/plasmid/dss/PlasmidStorageProcessor.java
@@ -116,19 +116,19 @@ public class PlasmidStorageProcessor extends AbstractDelegatingStorageProcessor
File seqFile = files[0];
String baseFileName = FilenameUtils.getBaseName(seqFile.getName());
- String pngFileName = baseFileName + SVG_FILE_EXTENSION;
+ String svgFileName = baseFileName + SVG_FILE_EXTENSION;
String gbFileName = baseFileName + GB_FILE_EXTENSION;
File generatedDir = new File(answer, GENERATED_DIR);
if (generatedDir.mkdir())
{
- final File pngFileDest = new File(generatedDir, pngFileName);
+ final File svgFileDest = new File(generatedDir, svgFileName);
final File gbFileDest = new File(generatedDir, gbFileName);
operationLog.info("Uploading '" + seqFile.getName()
+ "' to PlasMapper.");
uploadAndCopyGeneratedFile(seqFile, PlasMapperService.GRAPHIC_MAP,
- pngFileDest);
+ svgFileDest);
uploadAndCopyGeneratedFile(seqFile, PlasMapperService.GENEBANK_OUTPUT,
gbFileDest);
} else
--
GitLab