Skip to content
Snippets Groups Projects
Commit d7a6b717 authored by Alexandre Morin's avatar Alexandre Morin Committed by Giovannoni Laurent
Browse files

Module export Seda

parent 628e3a3b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules/export_seda/ArchiveTransfer.php
+ 156
− 74
View file @ d7a6b717
...@@ -31,16 +31,18 @@ class ArchiveTransfer { ...@@ -31,16 +31,18 @@ class ArchiveTransfer {
$this->db = new Database(); $this->db = new Database();
} }
public function receive($listResId, $transferringAgency = "", $archivalAgency = "") { public function receive($listResId) {
if (!$listResId) { if (!$listResId) {
return false; return false;
} }
$messageObject = new stdClass(); $messageObject = new stdClass();
$messageObject = $this->initMessage($messageObject, $transferringAgency, $archivalAgency); $messageObject = $this->initMessage($messageObject);
$result = [];
foreach ($listResId as $resId) { foreach ($listResId as $resId) {
$result .= $resId.'#';
$letterbox = $this->getCourrier($resId); $letterbox = $this->getCourrier($resId);
if ($letterbox->filename) { if ($letterbox->filename) {
...@@ -51,11 +53,15 @@ class ArchiveTransfer { ...@@ -51,11 +53,15 @@ class ArchiveTransfer {
} }
} }
//TODO $res = $this->insertMessage($messageObject);
//$messageObject->dataObjectPackage->managementMetadata
if ($res) {
$this->sendXml($messageObject);
} else {
return $res;
}
$this->insertMessage($messageObject); return $result;
return $messageObject;
} }
public function sendXml($messageObject) public function sendXml($messageObject)
...@@ -67,12 +73,35 @@ class ArchiveTransfer { ...@@ -67,12 +73,35 @@ class ArchiveTransfer {
$DOMTemplateProcessor->merge(); $DOMTemplateProcessor->merge();
$DOMTemplateProcessor->removeEmptyNodes(); $DOMTemplateProcessor->removeEmptyNodes();
file_put_contents(__DIR__.DIRECTORY_SEPARATOR.'seda2'.DIRECTORY_SEPARATOR.$messageObject->messageIdentifier->value.'.xml', $DOMTemplate->saveXML()); if (!is_dir(__DIR__.DIRECTORY_SEPARATOR.'seda2')) {
mkdir(__DIR__.DIRECTORY_SEPARATOR.'seda2', 0777, true);
}
$messageId = $messageObject->messageIdentifier->value;
if (!is_dir(__DIR__.DIRECTORY_SEPARATOR.'seda2'.DIRECTORY_SEPARATOR.$messageId)) {
mkdir(__DIR__.DIRECTORY_SEPARATOR.'seda2'.DIRECTORY_SEPARATOR.$messageId, 0777, true);
}
file_put_contents(__DIR__.DIRECTORY_SEPARATOR.'seda2'.DIRECTORY_SEPARATOR.$messageId.DIRECTORY_SEPARATOR.$messageId.'.xml', $DOMTemplate->saveXML());
$this->sendAttachment($messageObject);
return $xml; return $xml;
} }
private function initMessage($messageObject, $transferringAgency =null, $archivalAgency = null) private function sendAttachment($messageObject)
{
$messageId = $messageObject->messageIdentifier->value;
foreach ($messageObject->dataObjectPackage->binaryDataObject as $binaryDataObject) {
$basename = basename($binaryDataObject->uri);
$dest = __DIR__.DIRECTORY_SEPARATOR.'seda2'.DIRECTORY_SEPARATOR.$messageId.DIRECTORY_SEPARATOR.$basename;
copy($binaryDataObject->uri, $dest);
}
}
private function initMessage($messageObject)
{ {
$messageObject->date = date('Y-m-d h:i:s'); $messageObject->date = date('Y-m-d h:i:s');
$messageObject->messageIdentifier = new stdClass(); $messageObject->messageIdentifier = new stdClass();
...@@ -81,31 +110,20 @@ class ArchiveTransfer { ...@@ -81,31 +110,20 @@ class ArchiveTransfer {
$messageObject->transferringAgency = new stdClass(); $messageObject->transferringAgency = new stdClass();
$messageObject->transferringAgency->identifier = new stdClass(); $messageObject->transferringAgency->identifier = new stdClass();
if ($transferringAgency) {
$messageObject->transferringAgency->identifier->value = $transferringAgency;
}else {
foreach ($_SESSION['user']['entities'] as $entitie) {
if ($entitie['ENTITY_TYPE'] == "Service") {
$entitie = $this->getEntitie($entitie['ENTITY_ID']);
if ($entitie) {
$messageObject->transferringAgency->identifier->value = $entitie->business_id;
} else {
// TODO return error;
}
}
}
}
$messageObject->archivalAgreement = new stdClass();
$messageObject->archivalAgreement->value = "A COMPLETER";
$messageObject->archivalAgency = new stdClass(); $messageObject->archivalAgency = new stdClass();
$messageObject->archivalAgency->identifier = new stdClass(); $messageObject->archivalAgency->identifier = new stdClass();
if ($archivalAgency) { $messageObject->archivalAgreement = new stdClass();
$messageObject->archivalAgency->identifier->value = $archivalAgency;
} else { foreach ($_SESSION['user']['entities'] as $entitie) {
$messageObject->archivalAgency->identifier->value = "A COMPLETER"; $entitie = $this->getEntitie($entitie['ENTITY_ID']);
if ($entitie) {
$messageObject->transferringAgency->identifier->value = $entitie->business_id;
$messageObject->archivalAgency->identifier->value = $entitie->archival_agency;
$messageObject->archivalAgreement->value = $entitie->archival_agreement;
} else {
// TODO return error;
}
} }
$messageObject->dataObjectPackage = new stdClass(); $messageObject->dataObjectPackage = new stdClass();
...@@ -117,70 +135,96 @@ class ArchiveTransfer { ...@@ -117,70 +135,96 @@ class ArchiveTransfer {
return $messageObject; return $messageObject;
} }
private function getArchiveUnit($letterbox) private function getArchiveUnit($letterbox)
{ {
$messageArchiveUnit = new stdClass(); $messageArchiveUnit = new stdClass();
$messageArchiveUnit->content = new stdClass(); $messageArchiveUnit->content = $this->getContent($letterbox);
$messageArchiveUnit->content->receivedDate = $letterbox->admission_date;
$messageArchiveUnit->content->sentDate = $letterbox->doc_date; $messageArchiveUnit->management = $this->getManagement($letterbox);
$messageArchiveUnit->content->receivedDate = $letterbox->admission_date;
$messageArchiveUnit->content->receivedDate = $letterbox->admission_date; if ($dataObjectReferenceId) {
$messageArchiveUnit->dataObjectReference = new stdClass();
$messageArchiveUnit->dataObjectReference->dataObjectReferenceId = $letterbox->res_id;
}
return $messageArchiveUnit;
}
private function getContent($letterbox)
{
$content = new stdClass();
$content->receivedDate = $letterbox->admission_date;
$content->sentDate = $letterbox->doc_date;
$content->receivedDate = $letterbox->admission_date;
$content->receivedDate = $letterbox->admission_date;
$messageArchiveUnit->content->addressee = []; $content->addressee = [];
$messageArchiveUnit->content->keyword = []; $content->keyword = [];
if ($letterbox->exp_contact_id) { if ($letterbox->exp_contact_id) {
$contact = $this->getContact($letterbox->exp_contact_id); $contact = $this->getContact($letterbox->exp_contact_id);
$entitie = $this->getEntitie($letterbox->destination); $entitie = $this->getEntitie($letterbox->destination);
$messageArchiveUnit->content->keyword[] = $this->getKeyword($contact); $content->keyword[] = $this->getKeyword($contact);
$messageArchiveUnit->content->addressee[] = $this->getAddresse($entitie,"entitie"); $content->addressee[] = $this->getAddresse($entitie,"entitie");
} else if ($letterbox->dest_contact_id) { } else if ($letterbox->dest_contact_id) {
$contact = $this->getContact($letterbox->dest_contact_id); $contact = $this->getContact($letterbox->dest_contact_id);
$entitie = $this->getEntitie($letterbox->destination); $entitie = $this->getEntitie($letterbox->destination);
$messageArchiveUnit->content->addressee[] = $this->getAddresse($contact); $content->addressee[] = $this->getAddresse($contact);
$messageArchiveUnit->content->keyword[] = $this->getKeyword($entitie,"entitie"); $content->keyword[] = $this->getKeyword($entitie,"entitie");
} else if ($letterbox->exp_user_id) { } else if ($letterbox->exp_user_id) {
$user = $this->getUserInformation($letterbox->exp_user_id); $user = $this->getUserInformation($letterbox->exp_user_id);
$entitie = $this->getEntitie($letterbox->initiator); $entitie = $this->getEntitie($letterbox->initiator);
//$entitie = $this->getEntitie($letterbox->destination); //$entitie = $this->getEntitie($letterbox->destination);
$messageArchiveUnit->content->keyword[] = $this->getKeyword($user); $content->keyword[] = $this->getKeyword($user);
$messageArchiveUnit->content->addressee[] = $this->getAddresse($entitie,"entitie"); $content->addressee[] = $this->getAddresse($entitie,"entitie");
} }
$messageArchiveUnit->content->source = $_SESSION['mail_nature'][$letterbox->nature_id]; $content->source = $_SESSION['mail_nature'][$letterbox->nature_id];
$messageArchiveUnit->content->documentType = $letterbox->type_label; $content->documentType = $letterbox->type_label;
$messageArchiveUnit->content->originatingAgencyArchiveIdentifier = $letterbox->alt_identifier; $content->originatingAgencyArchiveIdentifier = $letterbox->alt_identifier;
$messageArchiveUnit->content->originatingSystemId = $letterbox->res_id; $content->originatingSystemId = $letterbox->res_id;
$messageArchiveUnit->content->title = []; $content->title = [];
$messageArchiveUnit->content->title[] = $letterbox->subject; $content->title[] = $letterbox->subject;
$messageArchiveUnit->content->description = []; $content->description = [];
$messageArchiveUnit->content->description[] = " "; $content->description[] = " ";
$messageArchiveUnit->content->endDate = $letterbox->process_limit_date; $content->endDate = $letterbox->process_limit_date;
$notes = $this->getNotes($letterbox->res_id); $notes = $this->getNotes($letterbox->res_id);
$messageArchiveUnit->content->custodialHistory = new stdClass(); $content->custodialHistory = new stdClass();
$messageArchiveUnit->content->custodialHistory->custodialHistoryItem = []; $content->custodialHistory->custodialHistoryItem = [];
foreach ($notes as $note) { foreach ($notes as $note) {
$messageArchiveUnit->content->custodialHistory->custodialHistoryItem[] = $this->getCustodialHistoryItem($note); $content->custodialHistory->custodialHistoryItem[] = $this->getCustodialHistoryItem($note);
} }
if ($dataObjectReferenceId) { return $content;
$messageArchiveUnit->dataObjectReference = new stdClass(); }
$messageArchiveUnit->dataObjectReference->dataObjectReferenceId = $letterbox->res_id;
}
return $messageArchiveUnit; private function getManagement($letterbox) {
$management = new stdClass();
$docTypes = $this->getDocTypes($letterbox->type_id);
$management->appraisalRule = new stdClass();
$management->appraisalRule->rule = new stdClass();
$management->appraisalRule->rule->value = $docTypes->retention_rule;
$management->appraisalRule->finalAction = $docTypes->retention_final_disposition;
return $management;
} }
private function getBinaryDataObject($letterbox) private function getBinaryDataObject($letterbox)
{ {
$docServers = $this->getDocServer($letterbox->docserver_id);
$binaryDataObject = new stdClass(); $binaryDataObject = new stdClass();
$binaryDataObject->id = $letterbox->res_id; $binaryDataObject->id = $letterbox->res_id;
$binaryDataObject->messageDigest = new stdClass(); $binaryDataObject->messageDigest = new stdClass();
...@@ -192,7 +236,7 @@ class ArchiveTransfer { ...@@ -192,7 +236,7 @@ class ArchiveTransfer {
$uri = str_replace("##", DIRECTORY_SEPARATOR, $letterbox->path); $uri = str_replace("##", DIRECTORY_SEPARATOR, $letterbox->path);
$uri = str_replace("#", DIRECTORY_SEPARATOR, $uri); $uri = str_replace("#", DIRECTORY_SEPARATOR, $uri);
$uri .= $letterbox->filename; $uri .= $letterbox->filename;
$binaryDataObject->uri = $uri; $binaryDataObject->uri = $docServers->path_template.$uri;
return $binaryDataObject; return $binaryDataObject;
} }
...@@ -259,6 +303,21 @@ class ArchiveTransfer { ...@@ -259,6 +303,21 @@ class ArchiveTransfer {
return $letterbox; return $letterbox;
} }
private function getDocTypes($typeId)
{
$queryParams = [];
$queryParams[] = $typeId;
$query = "SELECT * FROM doctypes WHERE type_id = ?";
$smtp = $this->db->query($query,$queryParams);
$docTypes = $smtp->fetchObject();
return $docTypes;
}
private function getUserInformation($userId) private function getUserInformation($userId)
{ {
$queryParams = []; $queryParams = [];
...@@ -322,6 +381,21 @@ class ArchiveTransfer { ...@@ -322,6 +381,21 @@ class ArchiveTransfer {
return $contact; return $contact;
} }
private function getDocServer($docServerId)
{
$queryParams = [];
$queryParams[] = $docServerId;
$query = "SELECT * FROM docservers WHERE docserver_id = ?";
$smtp = $this->db->query($query,$queryParams);
$docServers = $smtp->fetchObject();
return $docServers;
}
private function insertMessage($messageObject) private function insertMessage($messageObject)
{ {
$queryParams = []; $queryParams = [];
...@@ -336,9 +410,9 @@ class ArchiveTransfer { ...@@ -336,9 +410,9 @@ class ArchiveTransfer {
date, date,
reference, reference,
account_id , account_id ,
sender_org_identifier_id, sender_org_identifier,
sender_org_name, sender_org_name,
recipient_org_identifier_id, recipient_org_identifier,
recipient_org_name, recipient_org_name,
archival_agreement_reference, archival_agreement_reference,
reply_code, reply_code,
...@@ -373,20 +447,28 @@ class ArchiveTransfer { ...@@ -373,20 +447,28 @@ class ArchiveTransfer {
$this->insertUnitIdentifier($messageId, "res_letterbox", $binaryDataObject->id); $this->insertUnitIdentifier($messageId, "res_letterbox", $binaryDataObject->id);
} }
} catch (Exception $e) { } catch (Exception $e) {
// return error var_dump($e);
return false;
} }
}
private function insertUnitIdentifier($messageId, $tableName, $resId) { return true;
$query = ("INSERT INTO unit_identifier VALUES (?,?,?)"); }
$queryParams = [];
$queryParams[] = $messageId; private function insertUnitIdentifier($messageId, $tableName, $resId)
$queryParams[] = $tableName; {
$queryParams[] = $resId; try {
$query = ("INSERT INTO unit_identifier VALUES (?,?,?)");
$queryParams = [];
$res = $this->db->query($query,$queryParams); $queryParams[] = $messageId;
$queryParams[] = $tableName;
$queryParams[] = $resId;
return $res; $res = $this->db->query($query,$queryParams);
} catch (Exception $e) {
return false;
}
return true;
} }
} }
\ No newline at end of file
modules/export_seda/export_seda.php
+ 11
− 11
View file @ d7a6b717
...@@ -28,12 +28,19 @@ $etapes = array('export'); ...@@ -28,12 +28,19 @@ $etapes = array('export');
function manage_export($arr_id, $history, $id_action, $label_action, $status) function manage_export($arr_id, $history, $id_action, $label_action, $status)
{ {
// récupérer l'entité racine du courrier require_once('modules/export_seda/ArchiveTransfer.php');
// récupérer transferring_agency et archival_agreement
// récupérer la duration et retention_rule du type de doc du courrier $archiveTransfer = new ArchiveTransfer();
// appel fonction de transfert et génération bdx
// récupérer l'entité racine du courrier *
// récupérer archival_agency et archival_agreement *
// récupérer la retention_final_disposition et retention_rule du type de doc du courrier *
// appel fonction de transfert et génération bdx *
$result = $archiveTransfer->receive($arr_id);
// historisation du transfert // historisation du transfert
...@@ -41,13 +48,6 @@ function manage_export($arr_id, $history, $id_action, $label_action, $status) ...@@ -41,13 +48,6 @@ function manage_export($arr_id, $history, $id_action, $label_action, $status)
// ensuite il y a aura une suppression logique des documents et des contacts (si plus de courriers associés) // ensuite il y a aura une suppression logique des documents et des contacts (si plus de courriers associés)
for($i=0; $i<count($arr_id);$i++)
{
$result .= $arr_id[$i].'#';
//$db->query("UPDATE ".$ext_table. " SET closing_date = CURRENT_TIMESTAMP WHERE res_id = ?", array($arr_id[$i]));
}
return array('result' => $result, 'history_msg' => ''); return array('result' => $result, 'history_msg' => '');
} }
modules/export_seda/resources/AbstractRule.xml
+ 2
− 2
View file @ d7a6b717
<?merge $abstractRule.rule ?><Rule><?merge .value ?></Rule> <?merge $abstractRule.rule.bool() ?><Rule><?merge $abstractRule.rule.value ?></Rule>
<?merge $abstractRule.startDate ?><StartDate><?merge . ?></StartDate> <?merge $abstractRule.startDate.bool() ?><StartDate><?merge $abstractRule.startDate.value ?></StartDate>
<PreventInheritance><?merge $abstractRule.preventInheritance ?></PreventInheritance> <PreventInheritance><?merge $abstractRule.preventInheritance ?></PreventInheritance>
<RefNonRuleId><?merge $abstractRule.refNonRuleId ?></RefNonRuleId> <RefNonRuleId><?merge $abstractRule.refNonRuleId ?></RefNonRuleId>
\ No newline at end of file
modules/export_seda/resources/ArchiveUnit.xml
+ 10
− 1
View file @ d7a6b717
...@@ -4,28 +4,34 @@ ...@@ -4,28 +4,34 @@
<ArchiveUnitProfile schemeID="[?merge .archiveUnitProfile.schemeID ?]" schemeName="[?merge .archiveUnitProfile.schemeName ?]" schemeAgencyID="[?merge .archiveUnitProfile.schemeAgencyID ?]" schemeAgencyName="[?merge .archiveUnitProfile.schemeAgencyName ?]" schemeVersionID="[?merge .archiveUnitProfile.schemeVersionID ?]" schemeDataURI="[?merge .archiveUnitProfile.schemeDataURI ?]" schemeURI="[?merge .archiveUnitProfile.schemeURI ?]"><?merge .archiveUnitProfile ?></ArchiveUnitProfile> <ArchiveUnitProfile schemeID="[?merge .archiveUnitProfile.schemeID ?]" schemeName="[?merge .archiveUnitProfile.schemeName ?]" schemeAgencyID="[?merge .archiveUnitProfile.schemeAgencyID ?]" schemeAgencyName="[?merge .archiveUnitProfile.schemeAgencyName ?]" schemeVersionID="[?merge .archiveUnitProfile.schemeVersionID ?]" schemeDataURI="[?merge .archiveUnitProfile.schemeDataURI ?]" schemeURI="[?merge .archiveUnitProfile.schemeURI ?]"><?merge .archiveUnitProfile ?></ArchiveUnitProfile>
<?merge .management.bool() ?> <?merge .management.bool() ?>
<Management> <Management>
<?merge .management.storageRule.bool() ?>
<StorageRule> <StorageRule>
<?merge .management.storageRule $abstractRule ?> <?merge .management.storageRule $abstractRule ?>
<?xinclude /resources/AbstractRule.xml ?> <?xinclude /resources/AbstractRule.xml ?>
<FinalAction><?merge .management.storageRule.finalAction ?></FinalAction> <FinalAction><?merge .management.storageRule.finalAction ?></FinalAction>
</StorageRule> </StorageRule>
<?merge .management.appraisalRule.bool() ?>
<AppraisalRule> <AppraisalRule>
<?merge .management.appraisalRule $abstractRule ?> <?merge .management.appraisalRule $abstractRule ?>
<?xinclude /resources/AbstractRule.xml ?> <?xinclude /resources/AbstractRule.xml ?>
<FinalAction><?merge .management.appraisalRule.finalAction ?></FinalAction> <FinalAction><?merge .management.appraisalRule.finalAction ?></FinalAction>
</AppraisalRule> </AppraisalRule>
<?merge .management.accessRule.bool() ?>
<AccessRule> <AccessRule>
<?merge .management.accessRule $abstractRule ?> <?merge .management.accessRule $abstractRule ?>
<?xinclude /resources/AbstractRule.xml ?> <?xinclude /resources/AbstractRule.xml ?>
</AccessRule> </AccessRule>
<?merge .management.disseminationRule.bool() ?>
<DisseminationRule> <DisseminationRule>
<?merge .management.disseminationRule $abstractRule ?> <?merge .management.disseminationRule $abstractRule ?>
<?xinclude /resources/AbstractRule.xml ?> <?xinclude /resources/AbstractRule.xml ?>
</DisseminationRule> </DisseminationRule>
<?merge .management.reuseRule.bool() ?>
<ReuseRule> <ReuseRule>
<?merge .management.reuseRule $abstractRule ?> <?merge .management.reuseRule $abstractRule ?>
<?xinclude /resources/AbstractRule.xml ?> <?xinclude /resources/AbstractRule.xml ?>
</ReuseRule> </ReuseRule>
<?merge .management.classificationRule.bool() ?>
<ClassificationRule> <ClassificationRule>
<?merge .management.classificationRule $abstractRule ?> <?merge .management.classificationRule $abstractRule ?>
<?xinclude /resources/AbstractRule.xml ?> <?xinclude /resources/AbstractRule.xml ?>
...@@ -34,9 +40,11 @@ ...@@ -34,9 +40,11 @@
<ClassificationReassessingDate><?merge .management.classificationRule.classificationReassessingDate ?></ClassificationReassessingDate> <ClassificationReassessingDate><?merge .management.classificationRule.classificationReassessingDate ?></ClassificationReassessingDate>
<NeedReassessingAuthorization><?merge .management.classificationRule.needReassessingAuthorization ?></NeedReassessingAuthorization> <NeedReassessingAuthorization><?merge .management.classificationRule.needReassessingAuthorization ?></NeedReassessingAuthorization>
</ClassificationRule> </ClassificationRule>
<?merge .management.needAuthorization.bool() ?>
<NeedAuthorization> <NeedAuthorization>
<?merge .management.needAuthorization ?> <?merge .management.needAuthorization ?>
</NeedAuthorization> </NeedAuthorization>
<?merge .management.otherManagementAbstract.bool() ?>
<OtherManagementAbstract> <OtherManagementAbstract>
<?merge .management.otherManagementAbstract ?> <?merge .management.otherManagementAbstract ?>
</OtherManagementAbstract> </OtherManagementAbstract>
...@@ -48,7 +56,8 @@ ...@@ -48,7 +56,8 @@
<?merge .content.filePlanPosition ?><FilePlanPosition schemeID="[?merge .schemeID @schemeID ?]" schemeName="[?merge .schemeName @schemeName ?]" schemeAgencyID="[?merge .schemeAgencyID @schemeAgencyID ?]" schemeAgencyName="[?merge .schemeAgencyName @schemeAgencyName ?]" schemeVersionID="[?merge .schemeVersionID @schemeVersionID ?]" schemeDataURI="[?merge .schemeDataURI @schemeDataURI ?]" schemeURI="[?merge .schemeURI @schemeURI ?]"><?merge .value ?></FilePlanPosition> <?merge .content.filePlanPosition ?><FilePlanPosition schemeID="[?merge .schemeID @schemeID ?]" schemeName="[?merge .schemeName @schemeName ?]" schemeAgencyID="[?merge .schemeAgencyID @schemeAgencyID ?]" schemeAgencyName="[?merge .schemeAgencyName @schemeAgencyName ?]" schemeVersionID="[?merge .schemeVersionID @schemeVersionID ?]" schemeDataURI="[?merge .schemeDataURI @schemeDataURI ?]" schemeURI="[?merge .schemeURI @schemeURI ?]"><?merge .value ?></FilePlanPosition>
<OriginatingAgencyArchiveIdentifier><?merge .content.originatingAgencyArchiveIdentifier ?></OriginatingAgencyArchiveIdentifier> <OriginatingAgencyArchiveIdentifier><?merge .content.originatingAgencyArchiveIdentifier ?></OriginatingAgencyArchiveIdentifier>
<?merge .content.description.bool() ?><Description><?merge .content.description ?></Description> <?merge .content.description.bool() ?><Description><?merge .content.description ?></Description>
<?merge .content.custodialHistory.bool() ?><CustodialHistory> <?merge .content.custodialHistory.bool() ?>
<CustodialHistory>
<?merge .content.custodialHistory.custodialHistoryItem ?> <?merge .content.custodialHistory.custodialHistoryItem ?>
<CustodialHistoryItem when="[?merge .when ?]"><?merge .value ?></CustodialHistoryItem> <CustodialHistoryItem when="[?merge .when ?]"><?merge .value ?></CustodialHistoryItem>
</CustodialHistory> </CustodialHistory>
......
modules/export_seda/resources/DataObjectPackage.xml
+ 1
− 1
View file @ d7a6b717
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<Filename><?merge .fileInfo.filename ?></Filename> <Filename><?merge .fileInfo.filename ?></Filename>
</FileInfo> </FileInfo>
</BinaryDataObject> </BinaryDataObject>
<?merge $dataObjectPackage.physicalDataObject ?> <?merge $dataObjectPackage.physicalDataObject.bool() ?>
<PhysicalDataObject> <PhysicalDataObject>
<?merge .bool() ?> <?merge .bool() ?>
<PhysicalId schemeID="[?merge .physicalId.schemeID ?]" schemeName="[?merge .physicalId.schemeName ?]" schemeAgencyID="[?merge .physicalId.schemeAgencyID ?]" schemeAgencyName="[?merge .physicalId.schemeAgencyName ?]" schemeVersionID="[?merge .physicalId.schemeVersionID ?]" schemeDataURI="[?merge .physicalId.schemeDataURI ?]" schemeURI="[?merge .physicalId.schemeURI ?]"><?merge .physicalId.value ?></PhysicalId> <PhysicalId schemeID="[?merge .physicalId.schemeID ?]" schemeName="[?merge .physicalId.schemeName ?]" schemeAgencyID="[?merge .physicalId.schemeAgencyID ?]" schemeAgencyName="[?merge .physicalId.schemeAgencyName ?]" schemeVersionID="[?merge .physicalId.schemeVersionID ?]" schemeDataURI="[?merge .physicalId.schemeDataURI ?]" schemeURI="[?merge .physicalId.schemeURI ?]"><?merge .physicalId.value ?></PhysicalId>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment