fixed getRecord/Collection as xml. removed old obtainIdentifiers function and fixed count call
This commit is contained in:
parent
db10d4a00e
commit
eb8b3915fa
@ -88,7 +88,7 @@ class Doctrine_Lib
|
|||||||
public static function getCollectionAsXml(Doctrine_Collection $collection, SimpleXMLElement $incomming_xml = null) {
|
public static function getCollectionAsXml(Doctrine_Collection $collection, SimpleXMLElement $incomming_xml = null) {
|
||||||
|
|
||||||
$collectionName = Doctrine_Lib::plurelize($collection->getTable()->tableName);
|
$collectionName = Doctrine_Lib::plurelize($collection->getTable()->tableName);
|
||||||
if ( $collection->count != 0) {
|
if ( $collection->count() != 0) {
|
||||||
$record = $collection[0];
|
$record = $collection[0];
|
||||||
$xml_options = $record->option("xml");
|
$xml_options = $record->option("xml");
|
||||||
if ( isset($xml_options["collection_name"])) {
|
if ( isset($xml_options["collection_name"])) {
|
||||||
@ -135,10 +135,7 @@ class Doctrine_Lib
|
|||||||
$xml = new SimpleXMLElement($new_xml_string);
|
$xml = new SimpleXMLElement($new_xml_string);
|
||||||
} else {
|
} else {
|
||||||
$xml = $incomming_xml->addChild($recordname);
|
$xml = $incomming_xml->addChild($recordname);
|
||||||
}
|
}
|
||||||
foreach($record->obtainIdentifier() as $pk_field => $pk_value) {
|
|
||||||
$xml->addChild($pk_field,$pk_value);
|
|
||||||
}
|
|
||||||
$xml_options = $record->option("xml");
|
$xml_options = $record->option("xml");
|
||||||
if ( isset($xml_options["record_name"])) {
|
if ( isset($xml_options["record_name"])) {
|
||||||
$recordname = $xml_options["record_name"];
|
$recordname = $xml_options["record_name"];
|
||||||
@ -263,4 +260,4 @@ class Doctrine_Lib
|
|||||||
$r[] = "</pre>";
|
$r[] = "</pre>";
|
||||||
return implode("\n",$r);
|
return implode("\n",$r);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user