bug fix in retrieving sequence information

JBEI · Jun 30, 2022 · a350894 · a350894
1 parent 56ec71e
commit a350894
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/jbei/ice/lib/entry/sequence/PartSequence.java b/src/main/java/org/jbei/ice/lib/entry/sequence/PartSequence.java
@@ -627,7 +627,7 @@ private FeaturedDNASequence getFeaturedSequence(Entry entry, boolean canEdit, bo
         }
 
         String potentialFileId = sequence.getSequenceUser();
-        if (!StringUtils.isBlank(potentialFileId)) {
+        if (!StringUtils.isBlank(potentialFileId) && !potentialFileId.contains(" ")) {
             ConfigurationSettings configurationSettings = new ConfigurationSettings();
             String dataDirectoryString = configurationSettings.getPropertyValue(ConfigurationKey.DATA_DIRECTORY);
             Path dataSequencePath = Paths.get(dataDirectoryString, SEQUENCE_FOLDER_NAME, potentialFileId);

diff --git a/src/main/java/org/jbei/ice/lib/entry/sequence/SequenceUtil.java b/src/main/java/org/jbei/ice/lib/entry/sequence/SequenceUtil.java
@@ -271,7 +271,7 @@ public static SequenceType getType(Entry entry) {
         }
 
         String potentialFileId = sequence.getSequenceUser();
-        if (!StringUtils.isBlank(potentialFileId)) {
+        if (!StringUtils.isBlank(potentialFileId) && !potentialFileId.contains(" ")) {
             ConfigurationSettings configurationSettings = new ConfigurationSettings();
             String dataDirectoryString = configurationSettings.getPropertyValue(ConfigurationKey.DATA_DIRECTORY);
             Path dataSequencePath = Paths.get(dataDirectoryString, PartSequence.SEQUENCE_FOLDER_NAME, potentialFileId);

diff --git a/src/main/java/org/jbei/ice/storage/ModelToInfoFactory.java b/src/main/java/org/jbei/ice/storage/ModelToInfoFactory.java
@@ -92,7 +92,7 @@ private static SeedData seedInfo(Entry entry) {
         data.setEcotype(seed.getEcotype());
         data.setSeedParents(seed.getParents());
         if (seed.getHarvestDate() != null) {
-            DateFormat format = new SimpleDateFormat("MM/dd/YYYY");
+            DateFormat format = new SimpleDateFormat("MM/dd/yyyy");
             String dateFormat = format.format(seed.getHarvestDate());
             data.setHarvestDate(dateFormat);
         }
@@ -352,7 +352,7 @@ public static PartData createTipView(Entry entry) {
                 seedData.setEcotype(seed.getEcotype());
                 seedData.setSeedParents(seed.getParents());
                 if (seed.getHarvestDate() != null) {
-                    DateFormat format = new SimpleDateFormat("MM/dd/YYYY");
+                    DateFormat format = new SimpleDateFormat("MM/dd/yyyy");
                     String dateFormat = format.format(seed.getHarvestDate());
                     seedData.setHarvestDate(dateFormat);
                 }