Author: as
Date: Tue Feb 12 11:08:00 2008
New Revision: 7349
Log:
- Made RSS1 item attribute 'about' be referenced as 'id'.
Modified:
trunk/Feed/src/processors/rss1.php
trunk/Feed/tests/rss1/regression/generate/item/item_about+title+link.in
trunk/Feed/tests/rss1/regression/generate/item/item_about+title.in
trunk/Feed/tests/rss1/regression/generate/item/item_about.in
trunk/Feed/tests/rss1/regression/generate/item/item_multiple.in
trunk/Feed/tests/rss1/regression/generate/modules/content/content_html.in
trunk/Feed/tests/rss1/regression/generate/modules/content/content_multiple.in
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url+link.in
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url.in
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title.in
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about.in
trunk/Feed/tests/rss1/regression/generate/optional/image/image_empty.in
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name+link.in
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name.in
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description.in
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title.in
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about.in
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_empty.in
trunk/Feed/tests/rss1/regression/parse/item/item_description.out
trunk/Feed/tests/rss1/regression/parse/item/item_link.out
trunk/Feed/tests/rss1/regression/parse/item/item_multiple.out
trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.out
trunk/Feed/tests/rss1/regression/parse/item/item_title+link.out
trunk/Feed/tests/rss1/regression/parse/item/item_title.out
trunk/Feed/tests/rss1/regression/parse/modules/content/content_html.out
trunk/Feed/tests/rss1/regression/parse/modules/content/content_html_cdata.out
trunk/Feed/tests/rss1/regression/parse/modules/content/content_multiple.out
Modified: trunk/Feed/src/processors/rss1.php
==============================================================================
--- trunk/Feed/src/processors/rss1.php [iso-8859-1] (original)
+++ trunk/Feed/src/processors/rss1.php [iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -70,6 +70,9 @@
'REQUIRED' => array(
'title', 'link' ),
'OPTIONAL' => array(
'description' ),
),
+
+ 'ITEMS_MAP' => array( 'id' => 'about' ),
+
'MULTI' => 'items' ),
'textinput' => array( '#' => 'string',
@@ -193,7 +196,7 @@
foreach ( $this->get( 'items' ) as $item )
{
- $about = $item->about;
+ $about = $item->id;
$liTag = $this->xml->createElement( 'rdf:li' );
$resourceAttr = $this->xml->createAttribute( 'resource' );
$resourceVal = $this->xml->createTextNode( $about );
@@ -254,7 +257,7 @@
$itemTag = $this->xml->createElement( 'item' );
$this->root->appendChild( $itemTag );
- $data = $element->about;
+ $data = $element->id;
if ( is_null( $data ) )
{
throw new ezcFeedRequiredMetaDataMissingException(
"/{$this->root->nodeName}/item/@about" );
@@ -506,6 +509,13 @@
{
$supportedModules = ezcFeed::getSupportedModules();
$supportedModulesPrefixes = ezcFeed::getSupportedModulesPrefixes();
+
+ foreach ( ezcFeedTools::getAttributes( $xml ) as $key => $value )
+ {
+ $tagName = ezcFeedTools::deNormalizeName( $key,
$this->schema->getItemsMap() );
+ $element->$tagName = $value;
+ }
+
foreach ( $xml->childNodes as $itemChild )
{
if ( $itemChild->nodeType == XML_ELEMENT_NODE )
@@ -538,11 +548,6 @@
}
}
}
-
- foreach ( ezcFeedTools::getAttributes( $xml ) as $key => $value )
- {
- $element->$key = $value;
- }
}
/**
Modified:
trunk/Feed/tests/rss1/regression/generate/item/item_about+title+link.in
==============================================================================
--- trunk/Feed/tests/rss1/regression/generate/item/item_about+title+link.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/generate/item/item_about+title+link.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
);
Modified: trunk/Feed/tests/rss1/regression/generate/item/item_about+title.in
==============================================================================
--- trunk/Feed/tests/rss1/regression/generate/item/item_about+title.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/generate/item/item_about+title.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title' ) ),
);
?>
Modified: trunk/Feed/tests/rss1/regression/generate/item/item_about.in
==============================================================================
--- trunk/Feed/tests/rss1/regression/generate/item/item_about.in [iso-8859-1]
(original)
+++ trunk/Feed/tests/rss1/regression/generate/item/item_about.in [iso-8859-1]
Tue Feb 12 11:08:00 2008
@@ -3,6 +3,6 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about' ) ),
+ 'item' => array( array( 'id' => 'Item about' ) ),
);
?>
Modified: trunk/Feed/tests/rss1/regression/generate/item/item_multiple.in
==============================================================================
--- trunk/Feed/tests/rss1/regression/generate/item/item_multiple.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/generate/item/item_multiple.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,10 +3,10 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about 1',
+ 'item' => array( array( 'id' => 'Item about 1',
'title' => 'Item title 1',
'link' => 'Item link 1' ),
- array( 'about' => 'Item about 2',
+ array( 'id' => 'Item about 2',
'title' => 'Item title 2',
'link' => 'Item link 2' ), ),
);
Modified:
trunk/Feed/tests/rss1/regression/generate/modules/content/content_html.in
==============================================================================
--- trunk/Feed/tests/rss1/regression/generate/modules/content/content_html.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/generate/modules/content/content_html.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link',
'Content' => array( array( 'encoded' =>
'Content encoded & translated into <html> "special" characters' ) ) ), ),
Modified:
trunk/Feed/tests/rss1/regression/generate/modules/content/content_multiple.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/modules/content/content_multiple.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/modules/content/content_multiple.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,11 +3,11 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about 1',
+ 'item' => array( array( 'id' => 'Item about 1',
'title' => 'Item title 1',
'link' => 'Item link 1',
'Content' => array( array( 'encoded' =>
'Content encoded 1' ) ) ),
- array( 'about' => 'Item about 2',
+ array( 'id' => 'Item about 2',
'title' => 'Item title 2',
'link' => 'Item link 2',
'Content' => array( array( 'encoded' =>
'Content encoded 2' ) ) ), ),
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url+link.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url+link.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url+link.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'image' => array( array( 'about' => 'Image about',
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'image' => array( array( 'about' => 'Image about',
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'image' => array( array( 'about' => 'Image about',
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/image/image_about.in
==============================================================================
--- trunk/Feed/tests/rss1/regression/generate/optional/image/image_about.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/generate/optional/image/image_about.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'image' => array( array( 'about' => 'Image about' ) ),
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/image/image_empty.in
==============================================================================
--- trunk/Feed/tests/rss1/regression/generate/optional/image/image_empty.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/generate/optional/image/image_empty.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'image' => array( array() ),
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name+link.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name+link.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name+link.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'textinput' => array( array( 'about' => 'Textinput about',
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'textinput' => array( array( 'about' => 'Textinput about',
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'textinput' => array( array( 'about' => 'Textinput about',
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'textinput' => array( array( 'about' => 'Textinput about',
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'textinput' => array( array( 'about' => 'Textinput about' ) ),
Modified:
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_empty.in
==============================================================================
---
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_empty.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_empty.in
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -3,7 +3,7 @@
'title' => 'Feed title',
'link' => 'Feed link',
'description' => 'Feed description',
- 'item' => array( array( 'about' => 'Item about',
+ 'item' => array( array( 'id' => 'Item about',
'title' => 'Item title',
'link' => 'Item link' ) ),
'textinput' => array( array() ),
Modified: trunk/Feed/tests/rss1/regression/parse/item/item_description.out
==============================================================================
--- trunk/Feed/tests/rss1/regression/parse/item/item_description.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/parse/item/item_description.out
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -7,8 +7,8 @@
$feed->link = 'Feed link';
$item = $feed->add( 'item' );
+$item->id = 'Item link';
$item->description = 'Item description';
-$item->about = 'Item link';
return $feed;
?>
Modified: trunk/Feed/tests/rss1/regression/parse/item/item_link.out
==============================================================================
--- trunk/Feed/tests/rss1/regression/parse/item/item_link.out [iso-8859-1]
(original)
+++ trunk/Feed/tests/rss1/regression/parse/item/item_link.out [iso-8859-1] Tue
Feb 12 11:08:00 2008
@@ -7,8 +7,8 @@
$feed->link = 'Feed link';
$item = $feed->add( 'item' );
+$item->id = 'Item link';
$item->link = 'Item link';
-$item->about = 'Item link';
return $feed;
?>
Modified: trunk/Feed/tests/rss1/regression/parse/item/item_multiple.out
==============================================================================
--- trunk/Feed/tests/rss1/regression/parse/item/item_multiple.out [iso-8859-1]
(original)
+++ trunk/Feed/tests/rss1/regression/parse/item/item_multiple.out [iso-8859-1]
Tue Feb 12 11:08:00 2008
@@ -7,16 +7,16 @@
$feed->link = 'Feed link';
$item = $feed->add( 'item' );
+$item->id = 'Item link 1';
$item->title = 'Item title 1';
$item->link = 'Item link 1';
$item->description = 'Item description 1';
-$item->about = 'Item link 1';
$item = $feed->add( 'item' );
+$item->id = 'Item link 2';
$item->title = 'Item title 2';
$item->link = 'Item link 2';
$item->description = 'Item description 2';
-$item->about = 'Item link 2';
return $feed;
?>
Modified:
trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.out
==============================================================================
--- trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.out
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -7,10 +7,10 @@
$feed->link = 'Feed link';
$item = $feed->add( 'item' );
+$item->id = 'Item link';
$item->title = 'Item title';
$item->link = 'Item link';
$item->description = 'Item description';
-$item->about = 'Item link';
return $feed;
?>
Modified: trunk/Feed/tests/rss1/regression/parse/item/item_title+link.out
==============================================================================
--- trunk/Feed/tests/rss1/regression/parse/item/item_title+link.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/parse/item/item_title+link.out
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -7,9 +7,9 @@
$feed->link = 'Feed link';
$item = $feed->add( 'item' );
+$item->id = 'Item link';
$item->title = 'Item title';
$item->link = 'Item link';
-$item->about = 'Item link';
return $feed;
?>
Modified: trunk/Feed/tests/rss1/regression/parse/item/item_title.out
==============================================================================
--- trunk/Feed/tests/rss1/regression/parse/item/item_title.out [iso-8859-1]
(original)
+++ trunk/Feed/tests/rss1/regression/parse/item/item_title.out [iso-8859-1] Tue
Feb 12 11:08:00 2008
@@ -7,8 +7,8 @@
$feed->link = 'Feed link';
$item = $feed->add( 'item' );
+$item->id = 'Item link';
$item->title = 'Item title';
-$item->about = 'Item link';
return $feed;
?>
Modified:
trunk/Feed/tests/rss1/regression/parse/modules/content/content_html.out
==============================================================================
--- trunk/Feed/tests/rss1/regression/parse/modules/content/content_html.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/parse/modules/content/content_html.out
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -7,10 +7,10 @@
$feed->link = 'Feed link';
$item = $feed->add( 'item' );
+$item->id = 'Item link';
$item->title = 'Item title';
$item->link = 'Item link';
$item->description = 'Item description';
-$item->about = 'Item link';
$module = $item->addModule( 'Content' );
$module->encoded = 'Content \'encoded\' & \'translated\' into <html> "special"
"characters"';
Modified:
trunk/Feed/tests/rss1/regression/parse/modules/content/content_html_cdata.out
==============================================================================
---
trunk/Feed/tests/rss1/regression/parse/modules/content/content_html_cdata.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/rss1/regression/parse/modules/content/content_html_cdata.out
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -7,10 +7,10 @@
$feed->link = 'Feed link';
$item = $feed->add( 'item' );
+$item->id = 'Item link';
$item->title = 'Item title';
$item->link = 'Item link';
$item->description = 'Item description';
-$item->about = 'Item link';
$module = $item->addModule( 'Content' );
$module->encoded = 'Content \'encoded\' & 'translated' into <html>
"special" "characters"';
Modified:
trunk/Feed/tests/rss1/regression/parse/modules/content/content_multiple.out
==============================================================================
--- trunk/Feed/tests/rss1/regression/parse/modules/content/content_multiple.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/rss1/regression/parse/modules/content/content_multiple.out
[iso-8859-1] Tue Feb 12 11:08:00 2008
@@ -7,19 +7,19 @@
$feed->link = 'Feed link';
$item = $feed->add( 'item' );
+$item->id = 'Item link 1';
$item->title = 'Item title 1';
$item->link = 'Item link 1';
$item->description = 'Item description 1';
-$item->about = 'Item link 1';
$module = $item->addModule( 'Content' );
$module->encoded = 'Content encoded 1';
$item = $feed->add( 'item' );
+$item->id = 'Item link 2';
$item->title = 'Item title 2';
$item->link = 'Item link 2';
$item->description = 'Item description 2';
-$item->about = 'Item link 2';
$module = $item->addModule( 'Content' );
$module->encoded = 'Content encoded 2';
--
svn-components mailing list
[EMAIL PROTECTED]
http://lists.ez.no/mailman/listinfo/svn-components
