From 20f15ce688d31499136a7e5943c74b58493262bb Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Mon, 27 Nov 2023 15:11:31 +0100
Subject: [PATCH] BIS-772: Working on PDF export. Made shared samples be
exported to the (shared) folder.
---
.../v3/executor/exporter/ExportExecutor.java | 10 ++--
.../systemtest/asapi/v3/ExportData.java | 50 +++++++++++-------
.../export/export-sample-shared-html.zip | Bin 622 -> 726 bytes
.../export/export-sample-shared-pdf.zip | Bin 0 -> 1452 bytes
4 files changed, 37 insertions(+), 23 deletions(-)
create mode 100644 server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-pdf.zip
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
index 04f31ef510b..1712c388245 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
@@ -154,6 +154,8 @@ public class ExportExecutor implements IExportExecutor
public static final String DATA_DIRECTORY = "data";
+ public static final String SHARED_SAMPLES_DIRECTORY = "(shared)";
+
public static final String HTML_EXTENSION = ".html";
public static final String PDF_EXTENSION = ".pdf";
@@ -400,7 +402,9 @@ public class ExportExecutor implements IExportExecutor
}
} else
{
- putNextDocZipEntry(existingZipEntries, zos, getSpaceCode(entity), null, null, null, null, null, null, null, null);
+ final String spaceCode = getSpaceCode(entity);
+ final String folderName = spaceCode == null && entity instanceof Sample ? SHARED_SAMPLES_DIRECTORY : spaceCode;
+ putNextDocZipEntry(existingZipEntries, zos, folderName, null, null, null, null, null, null, null, null);
zos.closeEntry();
}
}
@@ -612,8 +616,8 @@ public class ExportExecutor implements IExportExecutor
} else
{
final Space space = sample.getSpace();
- putNextDocZipEntry(existingZipEntries, zos, space != null ? space.getCode() : null, null, null, null, null, sample.getCode(),
- getEntityName(sample), null, extension);
+ putNextDocZipEntry(existingZipEntries, zos, space != null ? space.getCode() : SHARED_SAMPLES_DIRECTORY, null, null, null, null,
+ sample.getCode(), getEntityName(sample), null, extension);
}
}
}
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java
index e1003b4b4fe..63ff92beb22 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java
@@ -136,16 +136,16 @@ public class ExportData
true, // withReferredTypes
false // withImportCompatibility
},
- {
- // Sample: /MP:A03
- "export-sample-contained-xlsx.zip",
- EnumSet.of(ExportFormat.XLSX),
- List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
- new AllFields(),
- XlsTextFormat.RICH,
- true, // withReferredTypes
- false // withImportCompatibility
- },
+// {
+// // Sample: /MP:A03
+// "export-sample-contained-xlsx.zip",
+// EnumSet.of(ExportFormat.XLSX),
+// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
+// new AllFields(),
+// XlsTextFormat.RICH,
+// true, // withReferredTypes
+// false // withImportCompatibility
+// },
{
// Data set: "ROOT_CONTAINER"
"export-data-set-xlsx.zip",
@@ -359,16 +359,16 @@ public class ExportData
true, // withReferredTypes
false // withImportCompatibility
},
- {
- // Sample: /MP:A03
- "export-sample-contained-html.zip",
- EnumSet.of(ExportFormat.HTML),
- List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
- new AllFields(),
- XlsTextFormat.RICH,
- true, // withReferredTypes
- false // withImportCompatibility
- },
+// {
+// // Sample: /MP:A03
+// "export-sample-contained-html.zip",
+// EnumSet.of(ExportFormat.HTML),
+// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
+// new AllFields(),
+// XlsTextFormat.RICH,
+// true, // withReferredTypes
+// false // withImportCompatibility
+// },
{
// Data set: "ROOT_CONTAINER"
"export-data-set-html.zip",
@@ -506,6 +506,16 @@ public class ExportData
true, // withReferredTypes
false // withImportCompatibility
},
+ {
+ // Sample: /MP
+ "export-sample-shared-pdf.zip",
+ EnumSet.of(ExportFormat.PDF),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-652"))),
+ new AllFields(),
+ XlsTextFormat.RICH,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
{
// Data set: "ROOT_CONTAINER"
"export-data-set-pdf.zip",
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-html.zip b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-html.zip
index 4d5d4c4e3cd19801ffc2260473c06cbb887a5d98..c76342bb9438259a7005d1aaf23c6fcade233a37 100644
GIT binary patch
delta 259
zcmaFIa*b6uz?+#xgn@&DgJE57MK}WxFijLz_h;Z>V5ljr1`B`$L4X&C3sTbbHHtG5
zi&9fG^&xtJn!$P_mp1t{Faq^6GcbstDcu;_#W?vrqiH=ePzHz5AS)Oc1Q`B0ngD4u
vix`<iz*@0e1=a~9mNdqrYxND#%P7gs3GilR14{8TFazOwAWM)5NH72ZQAaR0
delta 153
zcmcb{`i@07z?+#xgn@&DgJE57MK}WpOcYj^MiBsuGB9uh>4KEBjh$VLeC!;NOPhQe
z7#SFtm>C!*3o@B|F(8aVmILWR023e+XokLTfL=yPZcczVD;r3X2?(=+^jn~T3=9A$
C&KVQ{
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-pdf.zip b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-shared-pdf.zip
new file mode 100644
index 0000000000000000000000000000000000000000..06ee930ca42544209afc87f2e5f3ed87980c2115
GIT binary patch
literal 1452
zcmWIWW@Zs#;Nak3;I6C=XFvihKz2b&nm#i_fHyk_NP-C}8-P;}FI104aYkZMYKkUF
znuXCd`v&L%9T3c0P<Yw&it)pszu%smuhnyAWp4emL`P3rTJP_KQ%xbPwa<@CIx^=^
ziQeB0R~9`w^T&p@*4egL?{CAAFISRSl^1+c(6hE)cV&;r1hZt7x940}cB(q?>UFBF
z<dV`0b7ONm*4F0stZf;anA@>iY;CXD*j~+YnB4U#*lTidw}{Cn?x4>`UPZ-TK*psn
zlRg)lPV6x|R3LeSGv?R5nVLtrE~+U^Kf;uIR{yMapn=P!jHXcK>HG4tywVm0*R?ur
zX`I){#4$T+)+@=Gv$Y~-NW6-iG5c6kP2?0V6TU~j3vO1bI^=C^(rl5R5;Z42Y6=ez
zyYZF+1J_NL)lK#HsyH7!A|#QOH`7wpVg9S#PZ^kxs+wBbtBNjJy@N#}Z0DXB(c&s+
zzvp+&1a5qe+^y7Zzc#1p-(OGjlJ|GACOrC<5tDM^@<a8a<XL9hk1c=iEk5_hi8H5c
z%8&QVp7@+AV&=4%zl+!ZSwDTFUGL&&5qIyWv+vlywOVf4*@_iYiYiWTUuK#U7QSxh
z?6iAa)}<zzsqgkw%m2N9=5(yghu>NMrMG_h@Pl)*{NFcKGjw+aYv!+AA-?%g<!AHh
zrFHXv&dDoVcPlOY<2>`@#&&*Tr)I{AWGy$YzP#37{j}5bS^7WD94pLlx_hbW?^}2K
zEfzlMm3x*vIKENx*R$Q;wnnN&(Z81M;r>+_mGAk2GcT{~XX*L+e<x<Y*!{0KQK0{L
zmvDYc*}Av4jFO{6+<sk||5yL0_PkAROsbX4_HTW);nySG7;ff6b>DUxec+rGvLvpi
zK;iJ~CD*E^CFlGPiDO^kKX=zfPc4sci^JAF4q|WrAN8J3_5GRpsZueo5A58Mv@!G1
zUsY9aJ$b8hdyOj|Zr@&exn`}7%5v@{r*^08Pti!3aaBkEh;itbM{CuYoYvmm7xpxB
zq5OBt6W-c;H*-w*KF#vT`vc!IW(xIdo<I6Hd|TZ0+f`ampK|@r&7SoAZ`j8kuP4uU
zr<;G>dTF^r>cg(qQ>)dzSN=0UWucw1y{hz0*G)G=yQi;b@k-ABU$=8*$>}Fm_f}`A
z#qZT`{r)E{s{G#7tk-;%|DVo}Og|eR^tJQ9^#40f>8f!7O^rwFbY9L-RFySPXbLuP
z_l|ycf{RB~M<Mg#S&xH4z6)914zbTXzEnPDRtVFxCKleEU*-yR2Ol(h*`D%jnb>Qq
zr_YxZyxjeaF*rRfZdX%XMcTaNxI#4_hLddGM!6iP&ikHGKG)T?=!%IRGpjSR9<xP&
zfw8HnS*XY3)^15AW0?pwe!aAev`)peguF(@w3L)K#k8EH7R9v8j2_Ljrj^$(9g>MX
zbKwBf$y!y{&Y6}gT^~4bpE}Pj7B)fR%Ng&};RbD+Vnr6^>iEX==$`4}mEoPMd*<$(
zIl8=OW9ItA%IeOEZEVu(E8}XJ%5ZwagEOl_0)8}}o_S=EP(g>3R1`yZO=x(%xgNO8
z$_rb*!wguAF|jcK`HV~=45%d?tULpibf^GS?%~q`D(4Wu1jq#GfR}pcT9F+BD&-KM
b5XeN)3Mumfyjg*6W?*0j!gWCU1=xuI!*xKg
literal 0
HcmV?d00001
--
GitLab