From 1704171d41391fd5a7882211e32813e61c44ff49 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Wed, 14 Sep 2011 17:54:10 +0000
Subject: [PATCH] flexible library import: send error in the email, make sheet
names case-insensitive, minor improvements
SVN: 22956
---
.../shared/parser/ExcelFileSection.java | 6 ++---
.../parser/MaterialUploadSectionsParser.java | 5 ++--
.../plugin/generic/server/GenericServer.java | 25 ++++++++++++++++---
.../cisd/openbis/public/common-dictionary.js | 2 +-
4 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/ExcelFileSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/ExcelFileSection.java
index 9e9c052d2f8..8f8282d67b6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/ExcelFileSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/ExcelFileSection.java
@@ -112,7 +112,7 @@ public class ExcelFileSection
List<ExcelFileSection> defaultSheetSections = null;
Sheet sheet = null;
- String prefix = excelSheetName + "-";
+ String prefix = excelSheetName;
for (int i = 0; i < wb.getNumberOfSheets(); i++)
{
String sheetName = wb.getSheetName(i);
@@ -120,9 +120,9 @@ public class ExcelFileSection
{
sheet = wb.getSheetAt(i);
defaultSheetSections = extractSectionsFromDefaultSheet(sheet);
- } else if (sheetName.startsWith(prefix))
+ } else if (sheetName.toUpperCase().startsWith(prefix.toUpperCase()))
{
- String sectionName = sheetName.substring(prefix.length());
+ String sectionName = sheetName.substring(prefix.length() + 1);
sheet = wb.getSheetAt(i);
if (SECTION_FILE_DEFAULT.equalsIgnoreCase(sectionName))
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java
index 7008fe4b90d..1d7422bc0d7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java
@@ -111,6 +111,7 @@ public class MaterialUploadSectionsParser
{
final String fileName = multipartFile.getOriginalFilename();
final String loweredFileName = fileName.toLowerCase();
+ String registrationMessage = "Registration/update of %d material(s) is complete.";
if (loweredFileName.endsWith("xls") || loweredFileName.endsWith("xlsx"))
{
List<ExcelFileSection> materialSections = new ArrayList<ExcelFileSection>();
@@ -164,7 +165,7 @@ public class MaterialUploadSectionsParser
}
}
results.add(new BatchRegistrationResult(fileName, String.format(
- "Registration of %d material(s) is complete.", materialCounter)));
+ registrationMessage, materialCounter)));
} else
{
@@ -217,7 +218,7 @@ public class MaterialUploadSectionsParser
}
}
results.add(new BatchRegistrationResult(fileName, String.format(
- "Registration of %d material(s) is complete.", materialCounter)));
+ registrationMessage, materialCounter)));
}
}
return results;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
index dafb53f7661..4c7d343f81e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.plugin.generic.server;
+import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
@@ -799,13 +800,31 @@ public final class GenericServer extends AbstractServer<IGenericServer> implemen
{
public String getName()
{
- return "General Import";
+ return "General Batch Import";
}
public boolean doAction(Writer messageWriter)
{
- genericServer.registerOrUpdateSamplesAndMaterials(sessionToken,
- newSamplesWithType, newMaterialsWithType);
+ try
+ {
+ genericServer.registerOrUpdateSamplesAndMaterials(sessionToken,
+ newSamplesWithType, newMaterialsWithType);
+ } catch (RuntimeException ex)
+ {
+ try
+ {
+ messageWriter.write(getName()
+ + " has failed with a following exception: ");
+ messageWriter.write(ex.getMessage());
+ messageWriter
+ .write("\n\nPlease correct the error or contact your administrator.");
+ } catch (IOException writingEx)
+ {
+ throw new UserFailureException(writingEx.getMessage()
+ + " when trying to throw exception: " + ex.getMessage(), ex);
+ }
+ throw ex;
+ }
return true;
}
});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
index 65351df382f..93a24845333 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
@@ -454,7 +454,7 @@ var common = {
ARCHIVING_MENU_LOCK: "Disable",
ARCHIVING_MENU_UNLOCK: "Enable",
- GENERAL_IMPORT_MENU: "General Import",
+ GENERAL_IMPORT_MENU: "General Batch Import",
menu_modules: "Utilities",
--
GitLab