diff --git a/livesupport/modules/core/etc/audioClip.xml b/livesupport/modules/core/etc/audioClip.xml index cd28638a0..493430e07 100644 --- a/livesupport/modules/core/etc/audioClip.xml +++ b/livesupport/modules/core/etc/audioClip.xml @@ -2,11 +2,11 @@ File Title txt Alternative File Title ín sőmé %$#@* LÁNGŰAGÉ @@ -17,20 +17,9 @@ 2004-05-23 2004-05-24 2004-05-25 - Sound - audio/mpeg 00:18:30.000000 online - streamonthefly: - http://some.url.mdlf.org/ Spatial Coverage Temporal Covarage - Episode Title txt - Episode sequence - - Editor - John X - 123456789 - diff --git a/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h b/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h index a191178d5..b4aa23801 100644 --- a/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h +++ b/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.24 $ + Version : $Revision: 1.25 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h,v $ ------------------------------------------------------------------------------*/ @@ -82,11 +82,11 @@ using namespace boost::posix_time; * playlength="00:18:30.000000" * uri="file:var/test1.mp3" > * <metadata - * xmlns="http://www.streamonthefly.org/" - * xmlns:dc="http://purl.org/dc/elements/1.1/" - * xmlns:dcterms="http://purl.org/dc/terms/" - * xmlns:xbmf="http://www.streamonthefly.org/xbmf" - * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > + * xmlns="http://mdlf.org/livesupport/elements/1.0/" + * xmlns:ls="http://mdlf.org/livesupport/elements/1.0/" + * xmlns:dc="http://purl.org/dc/elements/1.1/" + * xmlns:dcterms="http://purl.org/dc/terms/" + * xmlns:xml="http://www.w3.org/XML/1998/namespace" > * <dc:title >File Title txt</dc:title> * <dcterms:extent >00:02:30.000000</dcterms:extent> * ... @@ -130,7 +130,7 @@ using namespace boost::posix_time; * * * @author $Author: fgerlits $ - * @version $Revision: 1.24 $ + * @version $Revision: 1.25 $ */ class AudioClip : public Configurable, public Playable diff --git a/livesupport/modules/core/include/LiveSupport/Core/Playlist.h b/livesupport/modules/core/include/LiveSupport/Core/Playlist.h index c1ea6eac7..ef5a7144d 100644 --- a/livesupport/modules/core/include/LiveSupport/Core/Playlist.h +++ b/livesupport/modules/core/include/LiveSupport/Core/Playlist.h @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.34 $ + Version : $Revision: 1.35 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/Playlist.h,v $ ------------------------------------------------------------------------------*/ @@ -81,11 +81,11 @@ using namespace boost::posix_time; * ... * <playlistElement> ... </playlistElement> * <metadata - * xmlns="http://www.streamonthefly.org/" - * xmlns:dc="http://purl.org/dc/elements/1.1/" - * xmlns:dcterms="http://purl.org/dc/terms/" - * xmlns:xbmf="http://www.streamonthefly.org/xbmf" - * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > + * xmlns="http://mdlf.org/livesupport/elements/1.0/" + * xmlns:ls="http://mdlf.org/livesupport/elements/1.0/" + * xmlns:dc="http://purl.org/dc/elements/1.1/" + * xmlns:dcterms="http://purl.org/dc/terms/" + * xmlns:xml="http://www.w3.org/XML/1998/namespace" > * <dc:title >File Title txt</dc:title> * <dcterms:extent >00:02:30.000000</dcterms:extent> * ... @@ -128,7 +128,7 @@ using namespace boost::posix_time; * * * @author $Author: fgerlits $ - * @version $Revision: 1.34 $ + * @version $Revision: 1.35 $ */ class Playlist : public Configurable, public Playable diff --git a/livesupport/modules/core/src/AudioClip.cxx b/livesupport/modules/core/src/AudioClip.cxx index cf7c36d82..714fa6ea7 100644 --- a/livesupport/modules/core/src/AudioClip.cxx +++ b/livesupport/modules/core/src/AudioClip.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.24 $ + Version : $Revision: 1.25 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/AudioClip.cxx,v $ ------------------------------------------------------------------------------*/ @@ -92,11 +92,6 @@ static const std::string extentElementPrefix = "dcterms"; */ static const std::string extentElementName = "extent"; -/** - * The URI identifier for the "dcterms" prefix. - */ -static const std::string extentElementUri = "http://purl.org/dc/terms/"; - /** * The prefix of the title metadata element. */ @@ -107,29 +102,46 @@ static const std::string titleElementPrefix = "dc"; */ static const std::string titleElementName = "title"; -/** - * The URI identifier for the "dc" prefix. - */ -static const std::string titleElementUri - = "http://purl.org/dc/elements/1.1/"; - -/** - * The URI identifier for the default XML namespace. - */ -static const std::string defaultPrefixUri - ="http://www.streamonthefly.org/"; - /** * The prefix for the Live Support extension elements. */ static const std::string liveSupportNamespacePrefix = "ls"; +/** + * The prefix for the "xml:" prefix elements. + */ +static const std::string xmlNamespacePrefix = "xml"; + +/** + * The URI identifier for the default namespace + */ +static const std::string defaultNamespaceUri + = "http://mdlf.org/livesupport/elements/1.0/"; + /** * The URI identifier for the "ls" prefix. */ static const std::string liveSupportNamespaceUri = "http://mdlf.org/livesupport/elements/1.0/"; +/** + * The URI identifier for the "dc" prefix + */ +static const std::string dcNamespaceUri + = "http://purl.org/dc/elements/1.1/"; + +/** + * The URI identifier for the "dcterms" prefix + */ +static const std::string dctermsNamespaceUri + = "http://purl.org/dc/terms/"; + +/** + * The URI identifier for the "xml" prefix + */ +static const std::string xmlNamespaceUri + = "http://www.w3.org/XML/1998/namespace"; + /* =============================================== local function prototypes */ @@ -489,13 +501,15 @@ AudioClip :: setMetadata(Ptr::Ref value, metadata = dynamic_cast (rootList.front()); } else { metadata = rootNode->add_child(metadataElementName); - metadata->set_namespace_declaration(defaultPrefixUri); - metadata->set_namespace_declaration(titleElementUri, - titleElementPrefix); - metadata->set_namespace_declaration(extentElementUri, - extentElementPrefix); + metadata->set_namespace_declaration(defaultNamespaceUri); metadata->set_namespace_declaration(liveSupportNamespaceUri, liveSupportNamespacePrefix); + metadata->set_namespace_declaration(dcNamespaceUri, + titleElementPrefix); + metadata->set_namespace_declaration(dctermsNamespaceUri, + extentElementPrefix); + metadata->set_namespace_declaration(xmlNamespaceUri, + xmlNamespacePrefix); } // find the element to be modified @@ -569,13 +583,15 @@ AudioClip :: getXmlDocumentString() const throw () } xmlpp::Element* metadata = rootNode->add_child(metadataElementName); - metadata->set_namespace_declaration(defaultPrefixUri); - metadata->set_namespace_declaration(titleElementUri, - titleElementPrefix); - metadata->set_namespace_declaration(extentElementUri, - extentElementPrefix); + metadata->set_namespace_declaration(defaultNamespaceUri); metadata->set_namespace_declaration(liveSupportNamespaceUri, liveSupportNamespacePrefix); + metadata->set_namespace_declaration(dcNamespaceUri, + titleElementPrefix); + metadata->set_namespace_declaration(dctermsNamespaceUri, + extentElementPrefix); + metadata->set_namespace_declaration(xmlNamespaceUri, + xmlNamespacePrefix); } Ptr::Ref metadataString(new Glib::ustring( diff --git a/livesupport/modules/core/src/Playlist.cxx b/livesupport/modules/core/src/Playlist.cxx index 0b1c0ba00..e003e544a 100644 --- a/livesupport/modules/core/src/Playlist.cxx +++ b/livesupport/modules/core/src/Playlist.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.34 $ + Version : $Revision: 1.35 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Playlist.cxx,v $ ------------------------------------------------------------------------------*/ @@ -86,11 +86,6 @@ static const std::string extentElementPrefix = "dcterms"; */ static const std::string extentElementName = "extent"; -/** - * The URI identifier for the "dcterms" prefix - */ -static const std::string extentElementUri = "http://purl.org/dc/terms/"; - /** * The prefix of the title metadata element. */ @@ -101,27 +96,46 @@ static const std::string titleElementPrefix = "dc"; */ static const std::string titleElementName = "title"; -/** - * The URI identifier for the "dc" prefix - */ -static const std::string titleElementUri ="http://purl.org/dc/elements/1.1/"; - -/** - * The URI identifier for the default XML namespace - */ -static const std::string defaultPrefixUri ="http://www.streamonthefly.org/"; - /** * The prefix for the Live Support extension elements. */ static const std::string liveSupportNamespacePrefix = "ls"; +/** + * The prefix for the "xml:" prefix elements. + */ +static const std::string xmlNamespacePrefix = "xml"; + +/** + * The URI identifier for the default namespace + */ +static const std::string defaultNamespaceUri + = "http://mdlf.org/livesupport/elements/1.0/"; + /** * The URI identifier for the "ls" prefix. */ static const std::string liveSupportNamespaceUri = "http://mdlf.org/livesupport/elements/1.0/"; +/** + * The URI identifier for the "dc" prefix + */ +static const std::string dcNamespaceUri + = "http://purl.org/dc/elements/1.1/"; + +/** + * The URI identifier for the "dcterms" prefix + */ +static const std::string dctermsNamespaceUri + = "http://purl.org/dc/terms/"; + +/** + * The URI identifier for the "xml" prefix + */ +static const std::string xmlNamespaceUri + = "http://www.w3.org/XML/1998/namespace"; + /* =============================================== local function prototypes */ @@ -670,13 +684,15 @@ Playlist :: setMetadata(Ptr::Ref value, metadata = dynamic_cast (rootList.front()); } else { metadata = rootNode->add_child(metadataElementName); - metadata->set_namespace_declaration(defaultPrefixUri); - metadata->set_namespace_declaration(titleElementUri, - titleElementPrefix); - metadata->set_namespace_declaration(extentElementUri, - extentElementPrefix); + metadata->set_namespace_declaration(defaultNamespaceUri); metadata->set_namespace_declaration(liveSupportNamespaceUri, liveSupportNamespacePrefix); + metadata->set_namespace_declaration(dcNamespaceUri, + titleElementPrefix); + metadata->set_namespace_declaration(dctermsNamespaceUri, + extentElementPrefix); + metadata->set_namespace_declaration(xmlNamespaceUri, + xmlNamespacePrefix); } // find the element to be modified @@ -761,13 +777,15 @@ Playlist :: getXmlDocumentString() const throw () } xmlpp::Element* metadata = rootNode->add_child(metadataElementName); - metadata->set_namespace_declaration(defaultPrefixUri); - metadata->set_namespace_declaration(titleElementUri, - titleElementPrefix); - metadata->set_namespace_declaration(extentElementUri, - extentElementPrefix); + metadata->set_namespace_declaration(defaultNamespaceUri); metadata->set_namespace_declaration(liveSupportNamespaceUri, liveSupportNamespacePrefix); + metadata->set_namespace_declaration(dcNamespaceUri, + titleElementPrefix); + metadata->set_namespace_declaration(dctermsNamespaceUri, + extentElementPrefix); + metadata->set_namespace_declaration(xmlNamespaceUri, + xmlNamespacePrefix); } Glib::ustring playlistElementsXmlString("\n");