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

modified WebStorageClient to reflect changes in storageServer module

Browse source
This commit is contained in:
fgerlits 2005-01-18 13:14:14 +00:00
parent 6a43a272b0
commit 30060746dd
3 changed files with 166 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

255
livesupport/modules/storage/src/WebStorageClient.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.27 $ Version : $Revision: 1.28 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClient.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClient.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -187,13 +187,42 @@ static const std::string resetStorageMethodName
= "locstor.resetStorage"; = "locstor.resetStorage";
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* The name of the result parameter returned by the method * The name of the audio clips result parameter returned by the method
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
static const std::string resetStorageResultParamName = "gunids"; static const std::string resetStorageAudioClipResultParamName = "audioclips";
/*------------------------------------------------------------------------------
* The name of the playlists result parameter returned by the method
*----------------------------------------------------------------------------*/
static const std::string resetStoragePlaylistResultParamName = "playlists";
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ playlist methods */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ playlist methods */
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: createPlaylist */
/*------------------------------------------------------------------------------
* The name of the create playlist method on the storage server
*----------------------------------------------------------------------------*/
static const std::string createPlaylistMethodName
= "locstor.createPlaylist";
/*------------------------------------------------------------------------------
* The name of the session ID parameter in the input structure
*----------------------------------------------------------------------------*/
static const std::string createPlaylistSessionIdParamName = "sessid";
/*------------------------------------------------------------------------------
* The name of the playlist unique ID parameter in the input structure
*----------------------------------------------------------------------------*/
static const std::string createPlaylistPlaylistIdParamName = "plid";
/*------------------------------------------------------------------------------
* The name of the result parameter returned by the method
*----------------------------------------------------------------------------*/
static const std::string createPlaylistResultParamName = "plid";
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: existsPlaylist */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: existsPlaylist */
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
@ -314,7 +343,7 @@ static const std::string savePlaylistNewPlaylistParamName = "newPlaylist";
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* The name of the result parameter returned by the method * The name of the result parameter returned by the method
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
static const std::string savePlaylistResultParamName = "status"; static const std::string savePlaylistResultParamName = "plid";
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: deletePlaylist */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: deletePlaylist */
@ -341,30 +370,6 @@ static const std::string deletePlaylistPlaylistIdParamName = "plid";
static const std::string deletePlaylistResultParamName = "status"; static const std::string deletePlaylistResultParamName = "status";
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: createPlaylist */
/*------------------------------------------------------------------------------
* The name of the create playlist method on the storage server
*----------------------------------------------------------------------------*/
static const std::string createPlaylistMethodName
= "locstor.createPlaylist";
/*------------------------------------------------------------------------------
* The name of the session ID parameter in the input structure
*----------------------------------------------------------------------------*/
static const std::string createPlaylistSessionIdParamName = "sessid";
/*------------------------------------------------------------------------------
* The name of the playlist unique ID parameter in the input structure
*----------------------------------------------------------------------------*/
static const std::string createPlaylistPlaylistIdParamName = "plid";
/*------------------------------------------------------------------------------
* The name of the result parameter returned by the method
*----------------------------------------------------------------------------*/
static const std::string createPlaylistResultParamName = "plid";
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ audio clip methods */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ audio clip methods */
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: existsAudioClip */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: existsAudioClip */
@ -630,6 +635,75 @@ WebStorageClient :: configure(const xmlpp::Element & element)
} }
/*------------------------------------------------------------------------------
* Create a new playlist.
*----------------------------------------------------------------------------*/
Ptr<UniqueId>::Ref
WebStorageClient :: createPlaylist(Ptr<SessionId>::Ref sessionId)
throw (Core::XmlRpcException)
{
XmlRpcValue parameters;
XmlRpcValue result;
XmlRpcClient xmlRpcClient(storageServerName.c_str(), storageServerPort,
storageServerPath.c_str(), false);
parameters.clear();
parameters[createPlaylistSessionIdParamName]
= sessionId->getId();
result.clear();
if (!xmlRpcClient.execute(createPlaylistMethodName.c_str(),
parameters, result)) {
xmlRpcClient.close();
std::string eMsg = "cannot execute XML-RPC method '";
eMsg += createPlaylistMethodName;
eMsg += "'";
throw XmlRpcCommunicationException(eMsg);
}
xmlRpcClient.close();
if (xmlRpcClient.isFault()) {
std::stringstream eMsg;
eMsg << "XML-RPC method '"
<< createPlaylistMethodName
<< "' returned error message:\n"
<< result;
throw XmlRpcMethodFaultException(eMsg.str());
}
if (! result.hasMember(createPlaylistResultParamName)
|| result[createPlaylistResultParamName].getType()
!= XmlRpcValue::TypeString) {
std::stringstream eMsg;
eMsg << "XML-RPC method '"
<< createPlaylistMethodName
<< "' returned unexpected value:\n"
<< result;
throw XmlRpcMethodResponseException(eMsg.str());
}
Ptr<UniqueId>::Ref newId(new UniqueId(std::string(
result[createPlaylistResultParamName] )));
Ptr<const std::string>::Ref url, token;
editPlaylistGetUrl(sessionId, newId, url, token);
Ptr<time_duration>::Ref playlength(new time_duration(0,0,0,0));
Ptr<Playlist>::Ref playlist(new Playlist(newId, playlength));
playlist->setToken(token);
editedPlaylists[newId->getId()] = std::make_pair(sessionId, playlist);
savePlaylist(sessionId, playlist);
token.reset();
playlist->setToken(token);
return playlist->getId();
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Tell if a playlist exists. * Tell if a playlist exists.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
@ -965,7 +1039,9 @@ WebStorageClient :: savePlaylist(Ptr<SessionId>::Ref sessionId,
if (! result.hasMember(savePlaylistResultParamName) if (! result.hasMember(savePlaylistResultParamName)
|| result[savePlaylistResultParamName].getType() || result[savePlaylistResultParamName].getType()
!= XmlRpcValue::TypeBoolean) { != XmlRpcValue::TypeString
|| std::string(result[savePlaylistResultParamName])
!= std::string(*playlist->getId())) {
std::stringstream eMsg; std::stringstream eMsg;
eMsg << "XML-RPC method '" eMsg << "XML-RPC method '"
<< savePlaylistMethodName << savePlaylistMethodName
@ -974,14 +1050,6 @@ WebStorageClient :: savePlaylist(Ptr<SessionId>::Ref sessionId,
throw XmlRpcMethodResponseException(eMsg.str()); throw XmlRpcMethodResponseException(eMsg.str());
} }
if (! bool(result[savePlaylistResultParamName])) {
std::stringstream eMsg;
eMsg << "XML-RPC method '"
<< savePlaylistMethodName
<< "' returned 'false'";
throw XmlRpcMethodResponseException(eMsg.str());
}
Ptr<const std::string>::Ref nullpointer; Ptr<const std::string>::Ref nullpointer;
playlist->setToken(nullpointer); playlist->setToken(nullpointer);
} }
@ -1201,77 +1269,6 @@ WebStorageClient :: getAllPlaylists(Ptr<SessionId>::Ref sessionId) const
} }
/*------------------------------------------------------------------------------
* Create a new playlist.
*----------------------------------------------------------------------------*/
Ptr<UniqueId>::Ref
WebStorageClient :: createPlaylist(Ptr<SessionId>::Ref sessionId)
throw (Core::XmlRpcException)
{
XmlRpcValue parameters;
XmlRpcValue result;
XmlRpcClient xmlRpcClient(storageServerName.c_str(), storageServerPort,
storageServerPath.c_str(), false);
parameters.clear();
parameters[createPlaylistSessionIdParamName]
= sessionId->getId();
result.clear();
if (!xmlRpcClient.execute(createPlaylistMethodName.c_str(),
parameters, result)) {
xmlRpcClient.close();
std::string eMsg = "cannot execute XML-RPC method '";
eMsg += createPlaylistMethodName;
eMsg += "'";
throw XmlRpcCommunicationException(eMsg);
}
xmlRpcClient.close();
if (xmlRpcClient.isFault()) {
std::stringstream eMsg;
eMsg << "XML-RPC method '"
<< createPlaylistMethodName
<< "' returned error message:\n"
<< result;
throw XmlRpcMethodFaultException(eMsg.str());
}
if (! result.hasMember(createPlaylistResultParamName)
|| result[createPlaylistResultParamName].getType()
!= XmlRpcValue::TypeString) {
std::stringstream eMsg;
eMsg << "XML-RPC method '"
<< createPlaylistMethodName
<< "' returned unexpected value:\n"
<< result;
throw XmlRpcMethodResponseException(eMsg.str());
}
Ptr<UniqueId>::Ref newId(new UniqueId(std::string(
result[createPlaylistResultParamName] )));
// std::cerr << "\nnew id: "
// << std::string(result[createPlaylistResultParamName]) << "\n";
Ptr<const std::string>::Ref url, token;
editPlaylistGetUrl(sessionId, newId, url, token);
Ptr<time_duration>::Ref playlength(new time_duration(0,0,0,0));
Ptr<Playlist>::Ref playlist(new Playlist(newId, playlength));
playlist->setToken(token);
editedPlaylists[newId->getId()] = std::make_pair(sessionId, playlist);
savePlaylist(sessionId, playlist);
token.reset();
playlist->setToken(token);
return playlist->getId();
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Tell if an audio clip exists. * Tell if an audio clip exists.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
@ -1819,7 +1816,7 @@ WebStorageClient :: getAllAudioClips(Ptr<SessionId>::Ref sessionId)
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Reset the storage to its initial state. * Reset the storage to its initial state.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
Ptr<std::vector<Ptr<UniqueId>::Ref> >::Ref void
WebStorageClient :: reset(void) WebStorageClient :: reset(void)
throw (Core::XmlRpcException) throw (Core::XmlRpcException)
{ {
@ -1852,8 +1849,11 @@ WebStorageClient :: reset(void)
throw XmlRpcMethodFaultException(eMsg.str()); throw XmlRpcMethodFaultException(eMsg.str());
} }
if (! result.hasMember(resetStorageResultParamName) if (! result.hasMember(resetStorageAudioClipResultParamName)
|| result[resetStorageResultParamName].getType() || result[resetStorageAudioClipResultParamName].getType()
!= XmlRpcValue::TypeArray
|| ! result.hasMember(resetStoragePlaylistResultParamName)
|| result[resetStoragePlaylistResultParamName].getType()
!= XmlRpcValue::TypeArray) { != XmlRpcValue::TypeArray) {
std::stringstream eMsg; std::stringstream eMsg;
eMsg << "XML-RPC method '" eMsg << "XML-RPC method '"
@ -1863,23 +1863,38 @@ WebStorageClient :: reset(void)
throw XmlRpcMethodResponseException(eMsg.str()); throw XmlRpcMethodResponseException(eMsg.str());
} }
XmlRpcValue uniqueIdArray = result[resetStorageResultParamName]; XmlRpcValue audioClipArray = result[resetStorageAudioClipResultParamName];
Ptr<std::vector<Ptr<UniqueId>::Ref> >::Ref returnValue( testAudioClipIds.reset(new std::vector<Ptr<UniqueId>::Ref>);
new std::vector<Ptr<UniqueId>::Ref>);
for (int i=0; i < uniqueIdArray.size(); i++) { for (int i=0; i < audioClipArray.size(); i++) {
if (uniqueIdArray[i].getType() != XmlRpcValue::TypeString) { if (audioClipArray[i].getType() != XmlRpcValue::TypeString) {
std::stringstream eMsg; std::stringstream eMsg;
eMsg << "Non-string gunid returned by XML-RPC method '" eMsg << "Non-string audio clip gunid returned by XML-RPC method '"
<< resetStorageMethodName << resetStorageMethodName
<< "':\n" << "':\n"
<< result; << result;
throw XmlRpcMethodResponseException(eMsg.str()); throw XmlRpcMethodResponseException(eMsg.str());
} }
Ptr<UniqueId>::Ref uniqueId(new UniqueId(std::string(uniqueIdArray[i]))); Ptr<UniqueId>::Ref uniqueId(new UniqueId(std::string(
returnValue->push_back(uniqueId); audioClipArray[i])));
testAudioClipIds->push_back(uniqueId);
} }
XmlRpcValue playlistArray = result[resetStoragePlaylistResultParamName];
testPlaylistIds.reset(new std::vector<Ptr<UniqueId>::Ref>);
return returnValue; for (int i=0; i < playlistArray.size(); i++) {
if (playlistArray[i].getType() != XmlRpcValue::TypeString) {
std::stringstream eMsg;
eMsg << "Non-string audio clip gunid returned by XML-RPC method '"
<< resetStorageMethodName
<< "':\n"
<< result;
throw XmlRpcMethodResponseException(eMsg.str());
}
Ptr<UniqueId>::Ref uniqueId(new UniqueId(std::string(
playlistArray[i])));
testPlaylistIds->push_back(uniqueId);
}
} }

24
livesupport/modules/storage/src/WebStorageClient.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.19 $ Version : $Revision: 1.20 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClient.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClient.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -99,7 +99,7 @@ using namespace LiveSupport::Core;
* </code></pre> * </code></pre>
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.19 $ * @version $Revision: 1.20 $
*/ */
class WebStorageClient : class WebStorageClient :
virtual public Configurable, virtual public Configurable,
@ -506,13 +506,25 @@ class WebStorageClient :
/** /**
* Reset the storage to its initial state. Used for testing. * A vector containing the unique IDs of the audio clips in the
* storage. Set by reset(). Used for testing.
*/
Ptr<std::vector<Ptr<UniqueId>::Ref> >::Ref testAudioClipIds;
/**
* A vector containing the unique IDs of the playlists in the
* storage. Set by reset(). Used for testing.
*/
Ptr<std::vector<Ptr<UniqueId>::Ref> >::Ref testPlaylistIds;
/**
* Reset the storage to its initial state.
* Calls locstor.resetStorage, and puts the unique IDs returned
* into testAudioClipIds and testPlaylistIds. Used for testing.
* *
* @return a vector containing the UniqueId's of the audio clips
* in the storage after the reset.
* @exception XmlRpcException if the server returns an error. * @exception XmlRpcException if the server returns an error.
*/ */
Ptr<std::vector<Ptr<UniqueId>::Ref> >::Ref void
reset(void) reset(void)
throw (XmlRpcException); throw (XmlRpcException);
}; };

28
livesupport/modules/storage/src/WebStorageClientTest.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.29 $ Version : $Revision: 1.30 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClientTest.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClientTest.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -181,14 +181,13 @@ void
WebStorageClientTest :: playlistTest(void) WebStorageClientTest :: playlistTest(void)
throw (CPPUNIT_NS::Exception) throw (CPPUNIT_NS::Exception)
{ {
Ptr<std::vector<Ptr<UniqueId>::Ref> >::Ref uniqueIdVector;
try { try {
uniqueIdVector = wsc->reset(); wsc->reset();
} catch (XmlRpcException &e) { } catch (XmlRpcException &e) {
CPPUNIT_FAIL(e.what()); CPPUNIT_FAIL(e.what());
} }
CPPUNIT_ASSERT(uniqueIdVector->size() >= 3); CPPUNIT_ASSERT(wsc->testAudioClipIds->size() >= 3);
Ptr<UniqueId>::Ref audioClipId = uniqueIdVector->at(0); Ptr<UniqueId>::Ref audioClipId = wsc->testAudioClipIds->at(0);
Ptr<SessionId>::Ref sessionId; Ptr<SessionId>::Ref sessionId;
try { try {
@ -361,18 +360,18 @@ void
WebStorageClientTest :: audioClipTest(void) WebStorageClientTest :: audioClipTest(void)
throw (CPPUNIT_NS::Exception) throw (CPPUNIT_NS::Exception)
{ {
Ptr<std::vector<Ptr<UniqueId>::Ref> >::Ref uniqueIdVector;
try { try {
uniqueIdVector = wsc->reset(); wsc->reset();
} catch (XmlRpcException &e) { } catch (XmlRpcException &e) {
CPPUNIT_FAIL(e.what()); CPPUNIT_FAIL(e.what());
} }
CPPUNIT_ASSERT(uniqueIdVector->size() >= 2); CPPUNIT_ASSERT(wsc->testAudioClipIds->size() >= 2);
Ptr<UniqueId>::Ref id01 = uniqueIdVector->at(1); Ptr<UniqueId>::Ref id01 = wsc->testAudioClipIds->at(1);
// std::cout << "\nReset storage result:\n"; // std::cout << "\nReset storage result:\n";
// for (unsigned i=0; i<uniqueIdVector->size(); i++) { // for (unsigned i=0; i < wsc->testAudioClipIds->size(); i++) {
// std::cout << std::hex << std::string(*uniqueIdVector->at(i)) << std::endl; // std::cout << std::hex << std::string(*wsc->testAudioClipIds->at(i))
// << std::endl;
// } // }
Ptr<SessionId>::Ref sessionId; Ptr<SessionId>::Ref sessionId;
@ -500,14 +499,13 @@ void
WebStorageClientTest :: simplePlaylistTest(void) WebStorageClientTest :: simplePlaylistTest(void)
throw (CPPUNIT_NS::Exception) throw (CPPUNIT_NS::Exception)
{ {
Ptr<std::vector<Ptr<UniqueId>::Ref> >::Ref uniqueIdVector;
try { try {
uniqueIdVector = wsc->reset(); wsc->reset();
} catch (XmlRpcException &e) { } catch (XmlRpcException &e) {
CPPUNIT_FAIL(e.what()); CPPUNIT_FAIL(e.what());
} }
CPPUNIT_ASSERT(uniqueIdVector->size() >= 3); CPPUNIT_ASSERT(wsc->testAudioClipIds->size() >= 3);
Ptr<UniqueId>::Ref audioClipId = uniqueIdVector->at(0); Ptr<UniqueId>::Ref audioClipId = wsc->testAudioClipIds->at(0);
Ptr<SessionId>::Ref sessionId; Ptr<SessionId>::Ref sessionId;
try { try {