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
thirdPartyArchiving
Commits
3c0a7f1c
Commit
3c0a7f1c
authored
Nov 08, 2018
by
Alexandre Morin
Browse files
Merge branch 'hotfix/2.3.1' into 'develop'
Hotfix/2.3.1 See merge request maarch/thirdPartyArchiving!48
parents
05493fb4
51909e82
Changes
2
Hide whitespace changes
Inline
Side-by-side
bundle/medona/Controller/ArchiveTransfer.php
View file @
3c0a7f1c
...
...
@@ -45,7 +45,7 @@ class ArchiveTransfer extends abstractMessage
*
* @todo Remove files from sas when error on reception
*/
public
function
receive
(
$messageFile
,
$attachments
=
array
(),
$schema
=
false
,
$filename
=
false
)
public
function
receive
(
$messageFile
,
$attachments
=
array
(),
$schema
=
null
,
$filename
=
false
)
{
$messageId
=
\
laabs
::
newId
();
$message
=
\
laabs
::
newInstance
(
'medona/message'
);
...
...
@@ -66,6 +66,8 @@ class ArchiveTransfer extends abstractMessage
$this
->
detectSchema
(
$message
);
}
var_dump
(
$message
->
schema
);
exit
();
try
{
$archiveTransferController
=
\
laabs
::
newController
(
$message
->
schema
.
'/ArchiveTransfer'
);
$archiveTransferController
->
receive
(
$message
);
...
...
@@ -262,11 +264,11 @@ class ArchiveTransfer extends abstractMessage
}
}
if
(
!
isset
(
$schema
))
{
if
(
empty
(
$schema
))
{
$schema
=
\
laabs
::
resolveXmlNamespace
(
$messageNamespace
);
}
if
(
!
isset
(
$schema
))
{
if
(
empty
(
$schema
))
{
throw
\
laabs
::
newException
(
'medona/invalidMessageException'
,
"Unknown message schema'.
$messageNamespace
"
,
400
);
}
...
...
bundle/medona/archiveTransferInterface.php
View file @
3c0a7f1c
...
...
@@ -74,7 +74,7 @@ interface archiveTransferInterface
*
* @action medona/ArchiveTransfer/receive
*/
public
function
create
(
$messageFile
,
$attachments
=
array
(),
$schema
=
false
,
$filename
=
null
);
public
function
create
(
$messageFile
,
$attachments
=
array
(),
$schema
=
null
,
$filename
=
null
);
/**
* Validate messages against schema and rules
...
...
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