Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed the URIs from released playlists and audio clips

Browse source 
added the XmlRpcServerMethod external to the Scheduler documentation
This commit is contained in:
fgerlits 2004-11-10 17:45:53 +00:00
parent 321955070f
commit 9db6d24725
12 changed files with 43 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

17
livesupport/modules/storage/src/TestStorageClient.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.12 $
Version : $Revision: 1.13 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.cxx,v $
------------------------------------------------------------------------------*/
@ -59,11 +59,6 @@ using namespace LiveSupport::Storage;
*----------------------------------------------------------------------------*/
const std::string TestStorageClient::configElementNameStr = "testStorage";
/*------------------------------------------------------------------------------
* The path to the local temp storage
*----------------------------------------------------------------------------*/
const std::string TestStorageClient::localTempStoragePath = "var/";
/*------------------------------------------------------------------------------
* The XML version used to create the SMIL file.
*----------------------------------------------------------------------------*/
@ -282,7 +277,7 @@ TestStorageClient :: acquirePlaylist(Ptr<const UniqueId>::Ref id) const
* Release a playlist.
*----------------------------------------------------------------------------*/
void
TestStorageClient :: releasePlaylist(Ptr<const Playlist>::Ref playlist) const
TestStorageClient :: releasePlaylist(Ptr<Playlist>::Ref playlist) const
throw (std::logic_error)
{
if (! playlist->getUri()) {
@ -311,6 +306,9 @@ TestStorageClient :: releasePlaylist(Ptr<const Playlist>::Ref playlist) const
++it;
}
Ptr<std::string>::Ref nullPointer;
playlist->setUri(nullPointer);
if (badAudioClips) {
std::stringstream eMsg;
eMsg << "could not release " << badAudioClips
@ -450,12 +448,15 @@ TestStorageClient :: acquireAudioClip(Ptr<const UniqueId>::Ref id) const
* Release an audio clip.
*----------------------------------------------------------------------------*/
void
TestStorageClient :: releaseAudioClip(Ptr<const AudioClip>::Ref audioClip) const
TestStorageClient :: releaseAudioClip(Ptr<AudioClip>::Ref audioClip) const
throw (std::logic_error)
{
if (*(audioClip->getUri()) == "") {
throw std::logic_error("audio clip URI not found");
}
Ptr<std::string>::Ref nullPointer;
audioClip->setUri(nullPointer);
}

8
livesupport/modules/storage/src/TestStorageClient.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.11 $
Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.h,v $
------------------------------------------------------------------------------*/
@ -67,7 +67,7 @@ using namespace LiveSupport::Core;
* A dummy storage client, only used for test purposes.
*
* @author $Author: fgerlits $
* @version $Revision: 1.11 $
* @version $Revision: 1.12 $
*/
class TestStorageClient :
virtual public Configurable,
@ -191,7 +191,7 @@ class TestStorageClient :
* or the file does not exist, etc.
*/
virtual void
releasePlaylist(Ptr<const Playlist>::Ref playlist) const
releasePlaylist(Ptr<Playlist>::Ref playlist) const
throw (std::logic_error);
/**
@ -268,7 +268,7 @@ class TestStorageClient :
* or the file does not exist, etc.
*/
virtual void
releaseAudioClip(Ptr<const AudioClip>::Ref audioClip) const
releaseAudioClip(Ptr<AudioClip>::Ref audioClip) const
throw (std::logic_error);
/**

6
livesupport/modules/storage/src/TestStorageClientTest.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.11 $
Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClientTest.cxx,v $
------------------------------------------------------------------------------*/
@ -288,8 +288,8 @@ TestStorageClientTest :: acquirePlaylistTest(void)
eMsg += e.what();
CPPUNIT_FAIL(eMsg);
}
std::ifstream ifs2(playlist->getUri()->substr(7).c_str());
CPPUNIT_ASSERT(!playlist->getUri());
std::ifstream ifs2(savedTempFilePath.c_str());
if (ifs2) {
ifs2.close();
CPPUNIT_FAIL("temp file not destroyed correctly");