From b7094b9b3acd80c96595ff151404a12eaa5f7e6e Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 14 Oct 2010 16:33:51 +0000
Subject: [PATCH] LMS-1835 Changed storage processor to not use the HDF5
format.
SVN: 18315
---
.../etlserver/hdf5/Hdf5StorageProcessor.java | 2 +-
...icalStructureDuplicatorFileToHdf5Test.java | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java
index 2fb1a72b9c0..393d5d47e9e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java
@@ -116,7 +116,7 @@ public class Hdf5StorageProcessor extends AbstractStorageProcessor
*/
public StorageFormat getStorageFormat()
{
- return StorageFormat.HDF5;
+ return StorageFormat.PROPRIETARY;
}
/**
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
index ae026fb7fab..6e604d6d73f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
@@ -85,6 +85,25 @@ public class HierarchicalStructureDuplicatorFileToHdf5Test extends AbstractFileS
verifyDuplicate(sourceFolder);
}
+ /**
+ * Convert a portion of the files, then re-convert.
+ */
+ @Test
+ public void testAbortAndContinue()
+ {
+ File sourceFile = getTestData("basic-file-structure/file0.txt");
+ HierarchicalStructureDuplicatorFileToHdf5 duplicator1 =
+ new HierarchicalStructureDuplicatorFileToHdf5(sourceFile, createWriter(true));
+ duplicator1.makeDuplicate();
+
+ File sourceFolder = getTestData("basic-file-structure");
+ HierarchicalStructureDuplicatorFileToHdf5 duplicator2 =
+ new HierarchicalStructureDuplicatorFileToHdf5(sourceFolder, createWriter(true));
+ duplicator2.makeDuplicate();
+
+ verifyDuplicate(sourceFolder);
+ }
+
/**
* Symbolic links are not supported
*/
--
GitLab