From 3ef5b8dee76dbb5b7b809e72058a417abee11c4f Mon Sep 17 00:00:00 2001
From: tomas <tomas@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 10 Feb 2005 01:38:08 +0000
Subject: [PATCH] minor changes

---
 .../modules/storageServer/var/LocStor.php     |  7 ++--
 .../storageServer/var/xmlrpc/testRunner.sh    | 36 +++++++++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/livesupport/modules/storageServer/var/LocStor.php b/livesupport/modules/storageServer/var/LocStor.php
index d28cb72f1..6fd7ba442 100644
--- a/livesupport/modules/storageServer/var/LocStor.php
+++ b/livesupport/modules/storageServer/var/LocStor.php
@@ -23,7 +23,7 @@
  
  
     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 $
 
 ------------------------------------------------------------------------------*/
@@ -513,9 +513,8 @@ class LocStor extends BasicStor{
     }
 
     /*====================================================== playlist methods */
-
     /**
-     *  Create a new Playlist metafile.
+     *  Create a new empty playlist.
      *
      *  @param sessid string, session ID
      *  @param playlistId string, playlist global unique ID
@@ -539,7 +538,7 @@ class LocStor extends BasicStor{
         $oid = $this->addObj($tmpFname , 'File', $parid);
         if(PEAR::isError($oid)) return $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'
         );
         if(PEAR::isError($ac)){
diff --git a/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh b/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
index 7ebd6e7e0..04e19db94 100755
--- a/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
+++ b/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
@@ -23,7 +23,7 @@
 #
 #
 #   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 $
 #-------------------------------------------------------------------------------
 
@@ -202,6 +202,7 @@ accessPlaylist() {
     echo "# curl: "
     CURLOUT=`curl -fs $URL;` || { ERN=$?; echo $RES; exit $ERN; }
     if [ $DEBUG ]; then echo $CURLOUT; fi
+    # echo $CURLOUT
     if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi
     echo "#  status: $?"
     if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi
@@ -211,15 +212,30 @@ accessPlaylist() {
 
 editPlaylist() {
     DATE=`date '+%H:%M:%S'`
-    PLAYLIST="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<smil><head><metadata>
- <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:dc=\"http://purl.org/metadata/dublin_core#\">
-  <dc:title>XY $DATE</dc:title>
- </rdf:RDF>
-</metadata></head><body><seq>
-   <audio src=\"123456789abcdefa\"/>
-   <audio src=\"123456789abcdefb\"/>
-</seq></body></smil>"
+    PLAYLIST="<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<playlist id=\"0000000000000001\" playlength=\"01:30:00.000000\" 
+          title=\"My First Playlist\">
+    <playlistElement id=\"0000000000000101\" relativeOffset=\"0\" >
+        <audioClip   id=\"0000000000010001\" playlength=\"01:00:00.000000\" 
+                                           title=\"one\"/>
+    </playlistElement>
+    <playlistElement id=\"0000000000000102\" relativeOffset=\"01:00:00.000000\" >
+        <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: "
     RES=`$XR_CLI editPlaylist $SESSID $PLID` || \
     	{ ERN=$?; echo $RES; exit $ERN; }