Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
maarchRM
Commits
534e4dab
Verified
Commit
534e4dab
authored
Feb 25, 2020
by
Cyril Vazquez
Browse files
Avoid using stored binary for conversion, always copy to temp file with original name
parent
7aab5292
Pipeline
#6997
canceled with stages
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/bundle/digitalResource/Controller/digitalResource.php
View file @
534e4dab
...
...
@@ -672,34 +672,27 @@ class digitalResource
}
$handler
=
$digitalResource
->
getHandler
();
$metadata
=
stream_get_meta_data
(
$handler
);
if
(
$metadata
[
'wrapper_type'
]
==
'plainfile'
)
{
$srcfile
=
$metadata
[
'uri'
];
}
else
{
$tempdir
=
str_replace
(
"/"
,
DIRECTORY_SEPARATOR
,
\
laabs\tempdir
());
if
(
isset
(
$digitalResource
->
fileName
))
{
$srcfile
=
$tempdir
.
DIRECTORY_SEPARATOR
.
$digitalResource
->
fileName
;
}
else
{
$srcfile
=
$tempdir
.
DIRECTORY_SEPARATOR
.
$digitalResource
->
resId
;
}
$tempdir
=
str_replace
(
"/"
,
DIRECTORY_SEPARATOR
,
\
laabs\tempdir
());
$tgtfp
=
fopen
(
$srcfile
,
'w'
);
stream_copy_to_stream
(
$handler
,
$tgtfp
)
;
rewind
(
$handler
);
fclose
(
$tgtfp
)
;
if
(
isset
(
$digitalResource
->
fileName
))
{
$srcfile
=
$tempdir
.
DIRECTORY_SEPARATOR
.
$digitalResource
->
fileName
;
}
else
{
$srcfile
=
$tempdir
.
DIRECTORY_SEPARATOR
.
$digitalResource
->
resId
;
}
$tgtfp
=
fopen
(
$srcfile
,
'w'
);
stream_copy_to_stream
(
$handler
,
$tgtfp
);
rewind
(
$handler
);
fclose
(
$tgtfp
);
$conversionRule
=
$this
->
sdoFactory
->
read
(
"digitalResource/conversionRule"
,
array
(
'puid'
=>
$digitalResource
->
puid
));
$converter
=
\
laabs
::
newService
(
$conversionRule
->
conversionService
);
$tgtfile
=
$converter
->
convert
(
$srcfile
,
$outputFormats
[
$conversionRule
->
targetPuid
]);
// Is tempdir was set, delete temp file
if
(
isset
(
$tempdir
))
{
unlink
(
$srcfile
);
}
unlink
(
$srcfile
);
if
(
!
file_exists
(
$tgtfile
))
{
return
false
;
...
...
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