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

minor changes

This commit is contained in:
tomas 2005-02-10 01:38:08 +00:00
parent e7e6569e01
commit 3ef5b8dee7
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
livesupport/modules/storageServer/var/LocStor.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.27 $ Version : $Revision: 1.28 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/LocStor.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/LocStor.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -513,9 +513,8 @@ class LocStor extends BasicStor{
} }
/*====================================================== playlist methods */ /*====================================================== playlist methods */
/** /**
* Create a new Playlist metafile. * Create a new empty playlist.
* *
* @param sessid string, session ID * @param sessid string, session ID
* @param playlistId string, playlist global unique ID * @param playlistId string, playlist global unique ID
@ -539,7 +538,7 @@ class LocStor extends BasicStor{
$oid = $this->addObj($tmpFname , 'File', $parid); $oid = $this->addObj($tmpFname , 'File', $parid);
if(PEAR::isError($oid)) return $oid; if(PEAR::isError($oid)) return $oid;
$ac =& StoredFile::insert($this, $oid, '', '', $ac =& StoredFile::insert($this, $oid, '', '',
'<?xml version="1.0" encoding="UTF-8"?><smil><body/></smil>', '<?xml version="1.0" encoding="UTF-8"?><playlist/>',
'string', $playlistId, 'playlist' 'string', $playlistId, 'playlist'
); );
if(PEAR::isError($ac)){ if(PEAR::isError($ac)){

36
livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
View File

@ -23,7 +23,7 @@
# #
# #
# Author : $Author: tomas $ # Author : $Author: tomas $
# Version : $Revision: 1.21 $ # Version : $Revision: 1.22 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -202,6 +202,7 @@ accessPlaylist() {
echo "# curl: " echo "# curl: "
CURLOUT=`curl -fs $URL;` || { ERN=$?; echo $RES; exit $ERN; } CURLOUT=`curl -fs $URL;` || { ERN=$?; echo $RES; exit $ERN; }
if [ $DEBUG ]; then echo $CURLOUT; fi if [ $DEBUG ]; then echo $CURLOUT; fi
# echo $CURLOUT
if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi
echo "# status: $?" echo "# status: $?"
if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi
@ -211,15 +212,30 @@ accessPlaylist() {
editPlaylist() { editPlaylist() {
DATE=`date '+%H:%M:%S'` DATE=`date '+%H:%M:%S'`
PLAYLIST="<?xml version=\"1.0\" encoding=\"UTF-8\"?> PLAYLIST="<?xml version=\"1.0\" encoding=\"utf-8\"?>
<smil><head><metadata> <playlist id=\"0000000000000001\" playlength=\"01:30:00.000000\"
<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:dc=\"http://purl.org/metadata/dublin_core#\"> title=\"My First Playlist\">
<dc:title>XY $DATE</dc:title> <playlistElement id=\"0000000000000101\" relativeOffset=\"0\" >
</rdf:RDF> <audioClip id=\"0000000000010001\" playlength=\"01:00:00.000000\"
</metadata></head><body><seq> title=\"one\"/>
<audio src=\"123456789abcdefa\"/> </playlistElement>
<audio src=\"123456789abcdefb\"/> <playlistElement id=\"0000000000000102\" relativeOffset=\"01:00:00.000000\" >
</seq></body></smil>" <audioClip id=\"0000000000010002\" playlength=\"00:30:00.000000\"
title=\"two\"/>
</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\"
>
<dc:title>My First Playlist</dc:title>
<dc:creator>Me, myself and I</dc:creator>
<dcterms:extent>01:30:00.000000</dcterms:extent>
</metadata>
</playlist>
"
echo -n "# editPlaylist: " echo -n "# editPlaylist: "
RES=`$XR_CLI editPlaylist $SESSID $PLID` || \ RES=`$XR_CLI editPlaylist $SESSID $PLID` || \
{ ERN=$?; echo $RES; exit $ERN; } { ERN=$?; echo $RES; exit $ERN; }