From: <rd...@us...> - 2007-07-10 13:42:03
|
Revision: 401 http://digir.svn.sourceforge.net/digir/?rev=401&view=rev Author: rdg Date: 2007-07-10 06:41:58 -0700 (Tue, 10 Jul 2007) Log Message: ----------- Elements relatedInformation, hasContact and geo:Point were in wrong order in metadata responses. Modified Paths: -------------- tapirlink/trunk/ChangeLog.txt tapirlink/trunk/classes/TpEntity.php Modified: tapirlink/trunk/ChangeLog.txt =================================================================== --- tapirlink/trunk/ChangeLog.txt 2007-07-10 13:33:58 UTC (rev 400) +++ tapirlink/trunk/ChangeLog.txt 2007-07-10 13:41:58 UTC (rev 401) @@ -18,8 +18,10 @@ * Bugfix: Filter comparisons involving concepts that had an underlying fixed value mapping might not work if the value type was numeric. * Concepts can now be locally mapped to TAPIR environment variables. - * Bugfix: bibliographicCitation element in metadata responses was using a + * Bugfix: Element bibliographicCitation in metadata responses was using a wrong namespace. + * Bugfix: Elements relatedInformation, hasContact and geo:Point were in + wrong order in metadata responses. Release 0.3.1 (2007-04-23) -------------------------- Modified: tapirlink/trunk/classes/TpEntity.php =================================================================== --- tapirlink/trunk/classes/TpEntity.php 2007-07-10 13:33:58 UTC (rev 400) +++ tapirlink/trunk/classes/TpEntity.php 2007-07-10 13:41:58 UTC (rev 401) @@ -361,15 +361,6 @@ $xml .= TpUtils::MakeTag( '', 'address', $this->mAddress, $indent1 ); - // geo:Point - if ( ! empty( $this->mLatitude ) and ! empty( $this->mLongitude ) ) - { - $xml .= TpUtils::OpenTag( TP_GEO_PREFIX, 'Point', $indent1 ); - $xml .= TpUtils::MakeTag( TP_GEO_PREFIX, 'lat', $this->mLatitude, $indent2 ); - $xml .= TpUtils::MakeTag( TP_GEO_PREFIX, 'long', $this->mLongitude, $indent2 ); - $xml .= TpUtils::CloseTag( TP_GEO_PREFIX, 'Point', $indent1 ); - } - if ( ! empty( $this->mRelatedInformation ) ) { $xml .= TpUtils::MakeTag( '', 'relatedInformation', @@ -381,6 +372,15 @@ $xml .= $related_contact->GetXml( $indent1, $indentWith ); } + // geo:Point + if ( ! empty( $this->mLatitude ) and ! empty( $this->mLongitude ) ) + { + $xml .= TpUtils::OpenTag( TP_GEO_PREFIX, 'Point', $indent1 ); + $xml .= TpUtils::MakeTag( TP_GEO_PREFIX, 'lat', $this->mLatitude, $indent2 ); + $xml .= TpUtils::MakeTag( TP_GEO_PREFIX, 'long', $this->mLongitude, $indent2 ); + $xml .= TpUtils::CloseTag( TP_GEO_PREFIX, 'Point', $indent1 ); + } + $xml .= TpUtils::CloseTag( '', 'entity', $offset ); return $xml; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |