diff --git a/Zend/Gdata/App/Entry.php b/Zend/Gdata/App/Entry.php index cfc27c4..f2ce838 100644 --- a/Zend/Gdata/App/Entry.php +++ b/Zend/Gdata/App/Entry.php @@ -149,42 +149,43 @@ class Zend_Gdata_App_Entry extends Zend_Gdata_App_FeedEntryParent protected function takeChildFromDOM($child) { - $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; - switch ($absoluteNodeName) { - case $this->lookupNamespace('atom') . ':' . 'content': + if( $this->lookupNamespace('atom') == $child->namespaceURI ) { + switch ($child->localName) { + case 'content': $content = new Zend_Gdata_App_Extension_Content(); $content->transferFromDOM($child); $this->_content = $content; - break; - case $this->lookupNamespace('atom') . ':' . 'published': + return; + case 'published': $published = new Zend_Gdata_App_Extension_Published(); $published->transferFromDOM($child); $this->_published = $published; - break; - case $this->lookupNamespace('atom') . ':' . 'source': + return; + case 'source': $source = new Zend_Gdata_App_Extension_Source(); $source->transferFromDOM($child); $this->_source = $source; - break; - case $this->lookupNamespace('atom') . ':' . 'summary': + return; + case 'summary': $summary = new Zend_Gdata_App_Extension_Summary(); $summary->transferFromDOM($child); $this->_summary = $summary; - break; - case $this->lookupNamespace('app') . ':' . 'control': + return; + } + } + elseif ($child->localName == 'control' && $this->lookupNamespace('app') == $child->namespaceURI) { $control = new Zend_Gdata_App_Extension_Control(); $control->transferFromDOM($child); $this->_control = $control; - break; - case $this->lookupNamespace('app') . ':' . 'edited': + return; + } + elseif ($child->localName == 'edited' && $this->lookupNamespace('app') == $child->namespaceURI) { $edited = new Zend_Gdata_App_Extension_Edited(); $edited->transferFromDOM($child); $this->_edited = $edited; - break; - default: - parent::takeChildFromDOM($child); - break; + return; } + parent::takeChildFromDOM($child); } /** diff --git a/Zend/Gdata/App/FeedEntryParent.php b/Zend/Gdata/App/FeedEntryParent.php index 7b33f45..b125125 100755 --- a/Zend/Gdata/App/FeedEntryParent.php +++ b/Zend/Gdata/App/FeedEntryParent.php @@ -232,53 +232,53 @@ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base protected function takeChildFromDOM($child) { - $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; - switch ($absoluteNodeName) { - case $this->lookupNamespace('atom') . ':' . 'author': + if ($this->lookupNamespace('atom') == $child->namespaceURI) + { + switch ($child->localName) { + case 'author': $author = new Zend_Gdata_App_Extension_Author(); $author->transferFromDOM($child); $this->_author[] = $author; - break; - case $this->lookupNamespace('atom') . ':' . 'category': + return; + case 'category': $category = new Zend_Gdata_App_Extension_Category(); $category->transferFromDOM($child); $this->_category[] = $category; - break; - case $this->lookupNamespace('atom') . ':' . 'contributor': + return; + case 'contributor': $contributor = new Zend_Gdata_App_Extension_Contributor(); $contributor->transferFromDOM($child); $this->_contributor[] = $contributor; - break; - case $this->lookupNamespace('atom') . ':' . 'id': + return; + case 'id': $id = new Zend_Gdata_App_Extension_Id(); $id->transferFromDOM($child); $this->_id = $id; - break; - case $this->lookupNamespace('atom') . ':' . 'link': + return; + case 'link': $link = new Zend_Gdata_App_Extension_Link(); $link->transferFromDOM($child); $this->_link[] = $link; - break; - case $this->lookupNamespace('atom') . ':' . 'rights': + return; + case 'rights': $rights = new Zend_Gdata_App_Extension_Rights(); $rights->transferFromDOM($child); $this->_rights = $rights; - break; - case $this->lookupNamespace('atom') . ':' . 'title': + return; + case 'title': $title = new Zend_Gdata_App_Extension_Title(); $title->transferFromDOM($child); $this->_title = $title; - break; - case $this->lookupNamespace('atom') . ':' . 'updated': + return; + case 'updated': $updated = new Zend_Gdata_App_Extension_Updated(); $updated->transferFromDOM($child); $this->_updated = $updated; - break; - default: - parent::takeChildFromDOM($child); - break; + return; } } + parent::takeChildFromDOM($child); + } /** * @return Zend_Gdata_App_Extension_Author diff --git a/Zend/Gdata/Entry.php b/Zend/Gdata/Entry.php index 8fae986..6d9e111 100644 --- a/Zend/Gdata/Entry.php +++ b/Zend/Gdata/Entry.php @@ -67,37 +67,36 @@ class Zend_Gdata_Entry extends Zend_Gdata_App_MediaEntry protected function takeChildFromDOM($child) { - $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; - switch ($absoluteNodeName) { - case $this->lookupNamespace('atom') . ':' . 'content': + if ($this->lookupNamespace('atom')==$child->namespaceURI) { + switch ($child->localName) { + case 'content': $content = new Zend_Gdata_App_Extension_Content(); $content->transferFromDOM($child); $this->_content = $content; - break; - case $this->lookupNamespace('atom') . ':' . 'published': + return; + case 'published': $published = new Zend_Gdata_App_Extension_Published(); $published->transferFromDOM($child); $this->_published = $published; - break; - case $this->lookupNamespace('atom') . ':' . 'source': + return; + case 'source': $source = new Zend_Gdata_App_Extension_Source(); $source->transferFromDOM($child); $this->_source = $source; - break; - case $this->lookupNamespace('atom') . ':' . 'summary': + return; + case 'summary': $summary = new Zend_Gdata_App_Extension_Summary(); $summary->transferFromDOM($child); $this->_summary = $summary; - break; - case $this->lookupNamespace('app') . ':' . 'control': + return; + } + } elseif( $child->localName=='control' && $this->lookupNamespace('app')==$child->namespaceURI) { $control = new Zend_Gdata_App_Extension_Control(); $control->transferFromDOM($child); $this->_control = $control; - break; - default: - parent::takeChildFromDOM($child); - break; + return; } + parent::takeChildFromDOM($child); } /** diff --git a/Zend/Gdata/Media/Extension/MediaGroup.php b/Zend/Gdata/Media/Extension/MediaGroup.php index c75f24e..baee4b9 100755 --- a/Zend/Gdata/Media/Extension/MediaGroup.php +++ b/Zend/Gdata/Media/Extension/MediaGroup.php @@ -255,77 +255,76 @@ class Zend_Gdata_Media_Extension_MediaGroup extends Zend_Gdata_Extension */ protected function takeChildFromDOM($child) { - $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; - switch ($absoluteNodeName) { - case $this->lookupNamespace('media') . ':' . 'content'; + if ($this->lookupNamespace('media') == $child->namespaceURI) { + switch ($child->localName) { + case 'content'; $content = new Zend_Gdata_Media_Extension_MediaContent(); $content->transferFromDOM($child); $this->_content[] = $content; - break; - case $this->lookupNamespace('media') . ':' . 'category'; + return; + case 'category'; $category = new Zend_Gdata_Media_Extension_MediaCategory(); $category->transferFromDOM($child); $this->_category[] = $category; - break; - case $this->lookupNamespace('media') . ':' . 'copyright'; + return; + case 'copyright'; $copyright = new Zend_Gdata_Media_Extension_MediaCopyright(); $copyright->transferFromDOM($child); $this->_copyright = $copyright; - break; - case $this->lookupNamespace('media') . ':' . 'credit'; + return; + case 'credit'; $credit = new Zend_Gdata_Media_Extension_MediaCredit(); $credit->transferFromDOM($child); $this->_credit[] = $credit; - break; - case $this->lookupNamespace('media') . ':' . 'description'; + return; + case 'description'; $description = new Zend_Gdata_Media_Extension_MediaDescription(); $description->transferFromDOM($child); $this->_description = $description; - break; - case $this->lookupNamespace('media') . ':' . 'hash'; + return; + case 'hash'; $hash = new Zend_Gdata_Media_Extension_MediaHash(); $hash->transferFromDOM($child); $this->_hash[] = $hash; - break; - case $this->lookupNamespace('media') . ':' . 'keywords'; + return; + case 'keywords'; $keywords = new Zend_Gdata_Media_Extension_MediaKeywords(); $keywords->transferFromDOM($child); $this->_keywords = $keywords; - break; - case $this->lookupNamespace('media') . ':' . 'player'; + return; + case 'player'; $player = new Zend_Gdata_Media_Extension_MediaPlayer(); $player->transferFromDOM($child); $this->_player[] = $player; - break; - case $this->lookupNamespace('media') . ':' . 'rating'; + return; + case 'rating'; $rating = new Zend_Gdata_Media_Extension_MediaRating(); $rating->transferFromDOM($child); $this->_rating[] = $rating; - break; - case $this->lookupNamespace('media') . ':' . 'restriction'; + return; + case 'restriction'; $restriction = new Zend_Gdata_Media_Extension_MediaRestriction(); $restriction->transferFromDOM($child); $this->_restriction[] = $restriction; - break; - case $this->lookupNamespace('media') . ':' . 'text'; + return; + case 'text'; $text = new Zend_Gdata_Media_Extension_MediaText(); $text->transferFromDOM($child); $this->_mediaText[] = $text; - break; - case $this->lookupNamespace('media') . ':' . 'thumbnail'; + return; + case 'thumbnail'; $thumbnail = new Zend_Gdata_Media_Extension_MediaThumbnail(); $thumbnail->transferFromDOM($child); $this->_thumbnail[] = $thumbnail; - break; - case $this->lookupNamespace('media') . ':' . 'title'; + return; + case 'title'; $title = new Zend_Gdata_Media_Extension_MediaTitle(); $title->transferFromDOM($child); $this->_title = $title; - break; - default: - parent::takeChildFromDOM($child); - break; + return; + } } + parent::takeChildFromDOM($child); } /** diff --git a/Zend/Gdata/Photos/AlbumEntry.php b/Zend/Gdata/Photos/AlbumEntry.php index ab11a90..eccdcab 100755 --- a/Zend/Gdata/Photos/AlbumEntry.php +++ b/Zend/Gdata/Photos/AlbumEntry.php @@ -262,73 +262,74 @@ class Zend_Gdata_Photos_AlbumEntry extends Zend_Gdata_Entry */ protected function takeChildFromDOM($child) { - $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; - - switch ($absoluteNodeName) { - case $this->lookupNamespace('gphoto') . ':' . 'access'; + if ($this->lookupNamespace('gphoto') == $child->namespaceURI) { + switch ($child->localName) { + case 'access'; $access = new Zend_Gdata_Photos_Extension_Access(); $access->transferFromDOM($child); $this->_gphotoAccess = $access; - break; - case $this->lookupNamespace('gphoto') . ':' . 'location'; + return; + case 'location'; $location = new Zend_Gdata_Photos_Extension_Location(); $location->transferFromDOM($child); $this->_gphotoLocation = $location; - break; - case $this->lookupNamespace('gphoto') . ':' . 'name'; + return; + case 'name'; $name = new Zend_Gdata_Photos_Extension_Name(); $name->transferFromDOM($child); $this->_gphotoName = $name; - break; - case $this->lookupNamespace('gphoto') . ':' . 'numphotos'; + return; + case 'numphotos'; $numPhotos = new Zend_Gdata_Photos_Extension_NumPhotos(); $numPhotos->transferFromDOM($child); $this->_gphotoNumPhotos = $numPhotos; - break; - case $this->lookupNamespace('gphoto') . ':' . 'commentCount'; + return; + case 'commentCount'; $commentCount = new Zend_Gdata_Photos_Extension_CommentCount(); $commentCount->transferFromDOM($child); $this->_gphotoCommentCount = $commentCount; - break; - case $this->lookupNamespace('gphoto') . ':' . 'commentingEnabled'; + return; + case 'commentingEnabled'; $commentingEnabled = new Zend_Gdata_Photos_Extension_CommentingEnabled(); $commentingEnabled->transferFromDOM($child); $this->_gphotoCommentingEnabled = $commentingEnabled; - break; - case $this->lookupNamespace('gphoto') . ':' . 'id'; + return; + case 'id'; $id = new Zend_Gdata_Photos_Extension_Id(); $id->transferFromDOM($child); $this->_gphotoId = $id; - break; - case $this->lookupNamespace('gphoto') . ':' . 'user'; + return; + case 'user'; $user = new Zend_Gdata_Photos_Extension_User(); $user->transferFromDOM($child); $this->_gphotoUser = $user; - break; - case $this->lookupNamespace('gphoto') . ':' . 'timestamp'; + return; + case 'timestamp'; $timestamp = new Zend_Gdata_Photos_Extension_Timestamp(); $timestamp->transferFromDOM($child); $this->_gphotoTimestamp = $timestamp; - break; - case $this->lookupNamespace('gphoto') . ':' . 'nickname'; + return; + case 'nickname'; $nickname = new Zend_Gdata_Photos_Extension_Nickname(); $nickname->transferFromDOM($child); $this->_gphotoNickname = $nickname; - break; - case $this->lookupNamespace('georss') . ':' . 'where'; + return; + } + } + elseif ($child->localName == 'where' && $this->lookupNamespace('georss') == $child->namespaceURI) { $geoRssWhere = new Zend_Gdata_Geo_Extension_GeoRssWhere(); $geoRssWhere->transferFromDOM($child); $this->_geoRssWhere = $geoRssWhere; - break; - case $this->lookupNamespace('media') . ':' . 'group'; + return; + } + elseif ($child->localName == 'group' && $this->lookupNamespace('media') == $child->namespaceURI) { $mediaGroup = new Zend_Gdata_Media_Extension_MediaGroup(); $mediaGroup->transferFromDOM($child); $this->_mediaGroup = $mediaGroup; - break; - default: - parent::takeChildFromDOM($child); - break; + return; } + + parent::takeChildFromDOM($child); } /** diff --git a/Zend/Gdata/Photos/PhotoEntry.php b/Zend/Gdata/Photos/PhotoEntry.php index c990a7f..bd4731e 100755 --- a/Zend/Gdata/Photos/PhotoEntry.php +++ b/Zend/Gdata/Photos/PhotoEntry.php @@ -290,79 +290,78 @@ class Zend_Gdata_Photos_PhotoEntry extends Zend_Gdata_Media_Entry */ protected function takeChildFromDOM($child) { - $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; - - switch ($absoluteNodeName) { - case $this->lookupNamespace('gphoto') . ':' . 'albumid'; + if ($this->lookupNamespace('gphoto') == $child->namespaceURI) { + switch ($child->localName) { + case 'albumid'; $albumId = new Zend_Gdata_Photos_Extension_AlbumId(); $albumId->transferFromDOM($child); $this->_gphotoAlbumId = $albumId; - break; - case $this->lookupNamespace('gphoto') . ':' . 'id'; + return; + case 'id'; $id = new Zend_Gdata_Photos_Extension_Id(); $id->transferFromDOM($child); $this->_gphotoId = $id; - break; - case $this->lookupNamespace('gphoto') . ':' . 'version'; + return; + case 'version'; $version = new Zend_Gdata_Photos_Extension_Version(); $version->transferFromDOM($child); $this->_gphotoVersion = $version; - break; - case $this->lookupNamespace('gphoto') . ':' . 'width'; + return; + case 'width'; $width = new Zend_Gdata_Photos_Extension_Width(); $width->transferFromDOM($child); $this->_gphotoWidth = $width; - break; - case $this->lookupNamespace('gphoto') . ':' . 'height'; + return; + case 'height'; $height = new Zend_Gdata_Photos_Extension_Height(); $height->transferFromDOM($child); $this->_gphotoHeight = $height; - break; - case $this->lookupNamespace('gphoto') . ':' . 'size'; + return; + case 'size'; $size = new Zend_Gdata_Photos_Extension_Size(); $size->transferFromDOM($child); $this->_gphotoSize = $size; - break; - case $this->lookupNamespace('gphoto') . ':' . 'client'; + return; + case 'client'; $client = new Zend_Gdata_Photos_Extension_Client(); $client->transferFromDOM($child); $this->_gphotoClient = $client; - break; - case $this->lookupNamespace('gphoto') . ':' . 'checksum'; + return; + case 'checksum'; $checksum = new Zend_Gdata_Photos_Extension_Checksum(); $checksum->transferFromDOM($child); $this->_gphotoChecksum = $checksum; - break; - case $this->lookupNamespace('gphoto') . ':' . 'timestamp'; + return; + case 'timestamp'; $timestamp = new Zend_Gdata_Photos_Extension_Timestamp(); $timestamp->transferFromDOM($child); $this->_gphotoTimestamp = $timestamp; - break; - case $this->lookupNamespace('gphoto') . ':' . 'commentingEnabled'; + return; + case 'commentingEnabled'; $commentingEnabled = new Zend_Gdata_Photos_Extension_CommentingEnabled(); $commentingEnabled->transferFromDOM($child); $this->_gphotoCommentingEnabled = $commentingEnabled; - break; - case $this->lookupNamespace('gphoto') . ':' . 'commentCount'; + return; + case 'commentCount'; $commentCount = new Zend_Gdata_Photos_Extension_CommentCount(); $commentCount->transferFromDOM($child); $this->_gphotoCommentCount = $commentCount; - break; - case $this->lookupNamespace('exif') . ':' . 'tags'; + return; + } + } + elseif ($child->localName == 'tags' && $this->lookupNamespace('exif') == $child->namespaceURI) { $exifTags = new Zend_Gdata_Exif_Extension_Tags(); $exifTags->transferFromDOM($child); $this->_exifTags = $exifTags; - break; - case $this->lookupNamespace('georss') . ':' . 'where'; + return; + } + elseif ($child->localName == 'where' && $this->lookupNamespace('georss') == $child->namespaceURI) { $geoRssWhere = new Zend_Gdata_Geo_Extension_GeoRssWhere(); $geoRssWhere->transferFromDOM($child); $this->_geoRssWhere = $geoRssWhere; - break; - default: - parent::takeChildFromDOM($child); - break; - + return; } + parent::takeChildFromDOM($child); } /** diff --git a/Zend/Gdata/Photos/PhotoFeed.php b/Zend/Gdata/Photos/PhotoFeed.php index 440ef81..4f78b56 100755 --- a/Zend/Gdata/Photos/PhotoFeed.php +++ b/Zend/Gdata/Photos/PhotoFeed.php @@ -191,70 +191,72 @@ class Zend_Gdata_Photos_PhotoFeed extends Zend_Gdata_Feed protected function takeChildFromDOM($child) { - $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; - - switch ($absoluteNodeName) { - case $this->lookupNamespace('gphoto') . ':' . 'id'; + if ($this->lookupNamespace('gphoto') == $child->namespaceURI) { + switch ($child->localName) { + case 'id'; $id = new Zend_Gdata_Photos_Extension_Id(); $id->transferFromDOM($child); $this->_gphotoId = $id; - break; - case $this->lookupNamespace('gphoto') . ':' . 'version'; + return; + case 'version'; $version = new Zend_Gdata_Photos_Extension_Version(); $version->transferFromDOM($child); $this->_gphotoVersion = $version; - break; - case $this->lookupNamespace('gphoto') . ':' . 'albumid'; + return; + case 'albumid'; $albumid = new Zend_Gdata_Photos_Extension_AlbumId(); $albumid->transferFromDOM($child); $this->_gphotoAlbumId = $albumid; - break; - case $this->lookupNamespace('gphoto') . ':' . 'width'; + return; + case 'width'; $width = new Zend_Gdata_Photos_Extension_Width(); $width->transferFromDOM($child); $this->_gphotoWidth = $width; - break; - case $this->lookupNamespace('gphoto') . ':' . 'height'; + return; + case 'height'; $height = new Zend_Gdata_Photos_Extension_Height(); $height->transferFromDOM($child); $this->_gphotoHeight = $height; - break; - case $this->lookupNamespace('gphoto') . ':' . 'size'; + return; + case 'size'; $size = new Zend_Gdata_Photos_Extension_Size(); $size->transferFromDOM($child); $this->_gphotoSize = $size; - break; - case $this->lookupNamespace('gphoto') . ':' . 'client'; + return; + case 'client'; $client = new Zend_Gdata_Photos_Extension_Client(); $client->transferFromDOM($child); $this->_gphotoClient = $client; - break; - case $this->lookupNamespace('gphoto') . ':' . 'checksum'; + return; + case 'checksum'; $checksum = new Zend_Gdata_Photos_Extension_Checksum(); $checksum->transferFromDOM($child); $this->_gphotoChecksum = $checksum; - break; - case $this->lookupNamespace('gphoto') . ':' . 'timestamp'; + return; + case 'timestamp'; $timestamp = new Zend_Gdata_Photos_Extension_Timestamp(); $timestamp->transferFromDOM($child); $this->_gphotoTimestamp = $timestamp; - break; - case $this->lookupNamespace('gphoto') . ':' . 'commentingEnabled'; + return; + case 'commentingEnabled'; $commentingEnabled = new Zend_Gdata_Photos_Extension_CommentingEnabled(); $commentingEnabled->transferFromDOM($child); $this->_gphotoCommentingEnabled = $commentingEnabled; - break; - case $this->lookupNamespace('gphoto') . ':' . 'commentCount'; + return; + case 'commentCount'; $commentCount = new Zend_Gdata_Photos_Extension_CommentCount(); $commentCount->transferFromDOM($child); $this->_gphotoCommentCount = $commentCount; - break; - case $this->lookupNamespace('media') . ':' . 'group'; + return; + } + } + elseif ($child->localName == 'group' && $this->lookupNamespace('media') == $child->namespaceURI) { $mediaGroup = new Zend_Gdata_Media_Extension_MediaGroup(); $mediaGroup->transferFromDOM($child); $this->_mediaGroup = $mediaGroup; - break; - case $this->lookupNamespace('atom') . ':' . 'entry': + return; + } + elseif ($child->localName == 'entry' && $this->lookupNamespace('atom') == $child->namespaceURI) { $entryClassName = $this->_entryClassName; $tmpEntry = new Zend_Gdata_App_Entry($child); $categories = $tmpEntry->getCategory(); @@ -272,11 +274,9 @@ class Zend_Gdata_Photos_PhotoFeed extends Zend_Gdata_Feed $newEntry = new $entryClassName($child); $newEntry->setHttpClient($this->getHttpClient()); $this->_entry[] = $newEntry; - break; - default: - parent::takeChildFromDOM($child); - break; + return; } + parent::takeChildFromDOM($child); } /**