Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
DDA
dda-wizard
Commits
ebf02c64
Commit
ebf02c64
authored
Jun 01, 2022
by
Fischer, Tim
Browse files
Merge branch 'FEATURE-names_for_excel_sheets'
parents
4d45e362
e5661e20
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gesis/dda/publishing/domain/impl/SmartExcelSheetBundlesSetSource.java
View file @
ebf02c64
...
...
@@ -27,15 +27,21 @@ public class SmartExcelSheetBundlesSetSource implements BundlesSetSource {
public
SmartExcelSheetBundlesSetSource
(
Sheet
sheet
)
{
String
sheetName
=
sheet
.
getSheetName
();
this
.
reference
=
"excel-"
+
UUID
.
randomUUID
().
toString
()
+
"@@"
+
sheetName
;
String
sheetType
=
sheet
.
getSheetName
();
if
(
sheetName
.
contains
(
";"
))
{
sheetType
=
sheetName
.
split
(
";"
)[
1
];
this
.
reference
=
sheetName
.
split
(
";"
)[
0
]
+
"##"
+
UUID
.
randomUUID
().
toString
()
+
"@@"
+
sheetType
;
}
else
{
this
.
reference
=
"excel-"
+
UUID
.
randomUUID
().
toString
()
+
"@@"
+
sheetName
;
}
switch
(
sheet
Nam
e
)
{
case
"
journal
article"
:
dcTypeStockMetadatum
=
new
SimpleMetadatum
(
"dc.type.stock"
,
"article"
);
break
;
switch
(
sheet
Typ
e
)
{
case
"article"
:
dcTypeStockMetadatum
=
new
SimpleMetadatum
(
"dc.type.stock"
,
"article"
);
break
;
case
"monograph"
:
dcTypeStockMetadatum
=
new
SimpleMetadatum
(
"dc.type.stock"
,
"monograph"
);
break
;
case
"collection"
:
dcTypeStockMetadatum
=
new
SimpleMetadatum
(
"dc.type.stock"
,
"collection"
);
break
;
case
"incollection"
:
dcTypeStockMetadatum
=
new
SimpleMetadatum
(
"dc.type.stock"
,
"incollection"
);
break
;
case
"recension"
:
dcTypeStockMetadatum
=
new
SimpleMetadatum
(
"dc.type.stock"
,
"recension"
);
break
;
default
:
log
.
warn
(
"sheet has an unrecognized name: {}"
,
sheet
Nam
e
);
default
:
log
.
warn
(
"sheet has an unrecognized name: {}"
,
sheet
Typ
e
);
}
this
.
sheet
=
sheet
;
...
...
src/main/java/org/gesis/dda/wizard/web/rest/TemplateResource.java
View file @
ebf02c64
...
...
@@ -78,8 +78,8 @@ public class TemplateResource {
bundlesSource
.
setOwner
(
userRepository
.
findOneByLogin
(
SecurityUtils
.
getCurrentUserLogin
()).
get
());
bundlesSource
.
setBundlesSourceState
(
BundlesSourceState
.
UNPROCESSED
);
bundlesSource
.
setType
(
BundlesSourceType
.
EXCEL_SPREADSHEET
);
bundlesSource
.
setReference
(
"excel-database-"
+
result
.
getId
());
bundlesSource
.
setData
(
"excel-database-"
+
result
.
getId
());
bundlesSource
.
setReference
(
Long
.
toString
(
result
.
getId
())
)
;
bundlesSource
.
setData
(
Long
.
toString
(
result
.
getId
())
)
;
BundlesSource
resultBundlesSource
=
bundlesSourceRepository
.
save
(
bundlesSource
);
result
.
setBundlesSource
(
resultBundlesSource
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment