From 72f71c57223f95fd9f363e97e203c86247409f77 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 15 Jun 2016 11:53:25 +0000
Subject: [PATCH] SSDM-3733 : Starting txt support
SVN: 36689
---
.../1/dss/reporting-plugins/exports-api/exports-api.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/exports-api/exports-api.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/exports-api/exports-api.py
index 3c97471099b..38187e0b5e8 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/exports-api/exports-api.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/exports-api/exports-api.py
@@ -315,10 +315,10 @@ def export(sessionToken, entities, includeRoot, userEmail, mailClient):
if entityObj is not None and entityFilePath is not None:
#JSON
entityJson = String(objectMapper.writeValueAsString(entityObj));
- addFile(tempDirPath + entityFilePath + ".json", entityJson.getBytes(), entityFilePath + ".json", zos);
+ addFile(tempDirPath, entityFilePath, "json", entityJson.getBytes(), zos);
#TEXT
entityTXT = String(getTXT(entityObj));
- addFile(tempDirPath + entityFilePath + ".txt", entityTXT.getBytes(), entityFilePath + ".txt", zos);
+ addFile(tempDirPath, entityFilePath, "txt", entityTXT.getBytes(), zos);
zos.close();
@@ -341,11 +341,11 @@ def getTXT(entityObj):
txtBuilder.append("TXT FILE")
return txtBuilder.toString();
-def addFile(filePath, fileContent, zipEntryName, zos):
- entityFile = File(filePath);
+def addFile(tempDirPath, entityFilePath, extension, fileContent, zos):
+ entityFile = File(tempDirPath + entityFilePath + "." + extension);
entityFile.getParentFile().mkdirs();
IOUtils.write(fileContent, FileOutputStream(entityFile));
- addToZipFile(zipEntryName, entityFile, zos);
+ addToZipFile(entityFilePath + "." + extension, entityFile, zos);
FileUtils.forceDelete(entityFile);
def getFilePath(spaceCode, projCode, expCode, sampCode, dataCode):
--
GitLab