This commit is contained in:
Romain Neutron
2012-02-07 17:02:38 +01:00
parent dfa39b8f1e
commit d0642b40ce

View File

@@ -758,7 +758,6 @@ class set_export extends set_abstract
return false; return false;
} }
if (isset($list['complete']) && $list['complete'] === true) if (isset($list['complete']) && $list['complete'] === true)
return; return;
@@ -886,39 +885,30 @@ class set_export extends set_abstract
$buffer = array(); $buffer = array();
if ($sxe = simplexml_load_string($desc)) foreach ($record->get_caption()->get_fields() as $field)
{ {
$z = $sxe->xpath('/record/description'); if (($rights || !isset($restrict[$field->get_name()])))
if ($z && is_array($z))
{ {
foreach ($z[0] as $ki => $vi)
{
if (($rights || !isset($restrict[$ki])))
{
switch ($format) switch ($format)
{ {
case 'yaml': case 'yaml':
case 'yml': case 'yml':
$vi = trim($vi); $vi = $field->get_value();
if (ctype_digit($vi)) if (ctype_digit($vi))
$vi = (int) $vi; $vi = (int) $vi;
$buffer[trim($ki)] = $vi; $buffer[$field->get_name()] = $vi;
break; break;
case 'xml': case 'xml':
default: default:
$dom_el = $dom->createElement($ki); $dom_el = $dom->createElement($field->get_name());
$dom_el->appendChild($dom->createTextNode(trim($vi))); $dom_el->appendChild($dom->createTextNode($field->get_value(true)));
$dom_desc->appendChild($dom_el); $dom_desc->appendChild($dom_el);
break; break;
} }
} }
} }
}
}
$buffer = array('record' => array('description' => $buffer)); $buffer = array('record' => array('description' => $buffer));