From 0f61357173db1c96bae42835664fd543d32c80a3 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Tue, 3 Jul 2007 10:23:21 +0000
Subject: [PATCH] change: naming convention for mass-upload files from
separator :: to =, since the old one created problems with Windows
SVN: 834
---
.../java/ch/systemsx/cisd/dbmigration/IMassUploader.java | 4 ++--
.../ch/systemsx/cisd/dbmigration/PostgreSQLMassUploader.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IMassUploader.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IMassUploader.java
index 243474ebcfb..8199461e930 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IMassUploader.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IMassUploader.java
@@ -21,7 +21,7 @@ import java.io.File;
/**
* Classes that implement this interface encapsulate mass uploading of tabular files to the database. The files to be
* processed by implementations of this class are supposed to be <code>csv</code> files that can be uploaded to
- * exactly one table. They need to follow the naming convention <code>orderSpecifier::tableName.csv</code>. Here the
+ * exactly one table. They need to follow the naming convention <code>orderSpecifier=tableName.csv</code>. Here the
* order specifier ensures that the dependency is right while the table name is the name of the table to upload the data
* to.
*
@@ -34,7 +34,7 @@ public interface IMassUploader
* Upload the data from file <var>massUploadFile</var> to the database.
*
* @param massUploadFile File to upload to the database, following the naming convention
- * <code>orderSpecifier::tableName.csv</code>.
+ * <code>orderSpecifier=tableName.csv</code>.
*/
public void performMassUpload(File massUploadFile);
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/PostgreSQLMassUploader.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/PostgreSQLMassUploader.java
index d5002edd0e0..e18454d44bc 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/PostgreSQLMassUploader.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/PostgreSQLMassUploader.java
@@ -57,7 +57,7 @@ public class PostgreSQLMassUploader implements IMassUploader
try
{
final CopyManager copyManager = getPGConnection().getCopyAPI();
- final String[] splitName = StringUtils.split(massUploadFile.getName(), "::");
+ final String[] splitName = StringUtils.split(massUploadFile.getName(), "=");
assert splitName.length == 2;
final String tableNameWithExtension = splitName[1];
assert tableNameWithExtension.endsWith(".csv");
--
GitLab