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

#832 Elements names in playlists are now considered case sensitive.

This commit is contained in:
tomas 2005-04-19 22:15:20 +00:00
parent 49c6517346
commit db4f5da722
10 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
livesupport/modules/htmlUI/var/ui_playlist.class.php
View File

@ -223,20 +223,20 @@ class uiPlaylist
function plwalk($arr, $parent=0, $attrs=0) function plwalk($arr, $parent=0, $attrs=0)
{ {
foreach ($arr['children'] as $node=>$sub) { foreach ($arr['children'] as $node=>$sub) {
if ($sub['elementname']==='playlistelement') { if ($sub['elementname']==='playlistElement') {
$this->plwalk($sub, $node, $sub['attrs']); $this->plwalk($sub, $node, $sub['attrs']);
} }
if ($sub['elementname']==='audioclip' || $sub['elementname']==='playlist') { if ($sub['elementname']==='audioClip' || $sub['elementname']==='playlist') {
#$this->flat["$parent.$node"] = $sub['attrs']; #$this->flat["$parent.$node"] = $sub['attrs'];
#$this->flat["$parent.$node"]['type'] = $sub['elementname']; #$this->flat["$parent.$node"]['type'] = $sub['elementname'];
$this->flat[$parent] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($sub['attrs']['id'])); $this->flat[$parent] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($sub['attrs']['id']));
$this->flat[$parent]['attrs'] = $attrs; $this->flat[$parent]['attrs'] = $attrs;
} }
if ($sub['elementname']==='fadeinfo') { if ($sub['elementname']==='fadeInfo') {
$this->flat[$parent]['fadein'] = GreenBox::_plTimeToSecs($sub['attrs']['fadein']); $this->flat[$parent]['fadein'] = GreenBox::_plTimeToSecs($sub['attrs']['fadeIn']);
$this->flat[$parent]['fadeout'] = GreenBox::_plTimeToSecs($sub['attrs']['fadeout']); $this->flat[$parent]['fadeout'] = GreenBox::_plTimeToSecs($sub['attrs']['fadeOut']);
$this->flat[$parent]['fadein_ms'] = $sub['attrs']['fadein'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadein']) * 1000 : 0; $this->flat[$parent]['fadein_ms'] = $sub['attrs']['fadeIn'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadeIn']) * 1000 : 0;
$this->flat[$parent]['fadeout_ms'] = $sub['attrs']['fadeout'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadeout']) * 1000 : 0; $this->flat[$parent]['fadeout_ms'] = $sub['attrs']['fadeOut'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadeOut']) * 1000 : 0;
} }
} }
} }

10
livesupport/modules/storageServer/var/MetaData.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.29 $ Version : $Revision: 1.30 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/MetaData.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/MetaData.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -188,7 +188,7 @@ class MetaData{
function getMetadataEl($category, $parid=NULL) function getMetadataEl($category, $parid=NULL)
{ {
// handle predicate namespace shortcut // handle predicate namespace shortcut
$a = XML_Util::splitQualifiedName(strtolower($category)); $a = XML_Util::splitQualifiedName($category);
if(PEAR::isError($a)) return $a; if(PEAR::isError($a)) return $a;
$catNs = $a['namespace']; $catNs = $a['namespace'];
$cat = $a['localPart']; $cat = $a['localPart'];
@ -268,7 +268,7 @@ class MetaData{
*/ */
function insertMetadataEl($parid, $category, $value=NULL, $predxml='T') function insertMetadataEl($parid, $category, $value=NULL, $predxml='T')
{ {
$category = strtolower($category); //$category = strtolower($category);
$parent = $this->dbc->getRow(" $parent = $this->dbc->getRow("
SELECT predns, predicate, predxml FROM {$this->mdataTable} SELECT predns, predicate, predxml FROM {$this->mdataTable}
WHERE gunid=x'{$this->gunid}'::bigint AND id=$parid WHERE gunid=x'{$this->gunid}'::bigint AND id=$parid
@ -647,8 +647,8 @@ class MetaData{
$objns=NULL, $object=NULL) $objns=NULL, $object=NULL)
{ {
//echo "$subjns, $subject, $predns, $predicate, $predxml, $objns, $object\n"; //echo "$subjns, $subject, $predns, $predicate, $predxml, $objns, $object\n";
$predns = strtolower($predns); //$predns = strtolower($predns);
$predicate = strtolower($predicate); //$predicate = strtolower($predicate);
$predns_sql = (is_null($predns) ? "NULL" : "'$predns'" ); $predns_sql = (is_null($predns) ? "NULL" : "'$predns'" );
$objns_sql = (is_null($objns) ? "NULL" : "'$objns'" ); $objns_sql = (is_null($objns) ? "NULL" : "'$objns'" );
$object_sql = (is_null($object)? "NULL" : "'$object'"); $object_sql = (is_null($object)? "NULL" : "'$object'");

55
livesupport/modules/storageServer/var/Playlist.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.12 $ Version : $Revision: 1.13 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/Playlist.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/Playlist.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -72,7 +72,7 @@ class Playlist extends StoredFile{
* <li>acGunid, string - audioClip gunid</li> * <li>acGunid, string - audioClip gunid</li>
* <li>acLen string - length of clip in dcterms:extent format</li> * <li>acLen string - length of clip in dcterms:extent format</li>
* <li>acTit string - clip title</li> * <li>acTit string - clip title</li>
* <li>elType string - audioclip | playlist</li> * <li>elType string - audioClip | playlist</li>
* </ul> * </ul>
*/ */
function getAcInfo($acId) function getAcInfo($acId)
@ -89,7 +89,10 @@ class Playlist extends StoredFile{
if(isset($r[0]['value'])) $acTit = $r[0]['value']; if(isset($r[0]['value'])) $acTit = $r[0]['value'];
else $acTit = $acGunid; else $acTit = $acGunid;
$elType = $this->gb->getObjType($acId); $elType = $this->gb->getObjType($acId);
if($elType == 'webstream') $elType = 'audioclip'; $trTbl = array('audioclip'=>'audioClip', 'webstream'=>'audioClip',
'playlist'=>'playlist');
$elType = $trTbl[$elType];
if($elType == 'webstream') $elType = 'audioClip';
return compact('acGunid', 'acLen', 'acTit', 'elType'); return compact('acGunid', 'acLen', 'acTit', 'elType');
} }
@ -163,8 +166,8 @@ class Playlist extends StoredFile{
* @param acGunid string - audioClip gunid * @param acGunid string - audioClip gunid
* @param acLen string - audiClip length in extent format * @param acLen string - audiClip length in extent format
* @param acTit string - audioClip title * @param acTit string - audioClip title
* @param fadeIn string - fadein value in ss.ssssss or extent format * @param fadeIn string - fadeIn value in ss.ssssss or extent format
* @param fadeOut string - fadeout value in ss.ssssss or extent format * @param fadeOut string - fadeOut value in ss.ssssss or extent format
* @param plElGunid string - optional playlist element gunid * @param plElGunid string - optional playlist element gunid
* @param elType string - optional 'audioClip' | 'playlist' * @param elType string - optional 'audioClip' | 'playlist'
* @return array with fields: * @return array with fields:
@ -287,7 +290,7 @@ class Playlist extends StoredFile{
} }
/** /**
* Add audioclip specified by local id to the playlist * Add audioClip specified by local id to the playlist
* *
* @param acId string, local ID of added file * @param acId string, local ID of added file
* @param fadeIn string, optional, in time format hh:mm:ss.ssssss * @param fadeIn string, optional, in time format hh:mm:ss.ssssss
@ -329,7 +332,7 @@ class Playlist extends StoredFile{
/** /**
* Remove audioclip from playlist * Remove audioClip from playlist
* *
* @param plElGunid string, global id of deleted playlistElement * @param plElGunid string, global id of deleted playlistElement
* @return boolean * @return boolean
@ -440,7 +443,7 @@ class Playlist extends StoredFile{
$arr = $this->md->genPhpArray(); $arr = $this->md->genPhpArray();
$els =& $arr['children']; $els =& $arr['children'];
foreach($els as $i=>$el){ foreach($els as $i=>$el){
if($el['elementname'] != 'playlistelement'){ if($el['elementname'] != 'playlistElement'){
$metadata = array_splice($els, $i, 1); $metadata = array_splice($els, $i, 1);
continue; continue;
} }
@ -462,11 +465,11 @@ class Playlist extends StoredFile{
$fadeIn = NULL; $fadeIn = NULL;
$fadeOut = NULL; $fadeOut = NULL;
foreach($el['children'] as $j=>$af){ foreach($el['children'] as $j=>$af){
if($af['elementname'] == 'audioclip'){ if($af['elementname'] == 'audioClip'){
$acGunid = $af['attrs']['id']; $acGunid = $af['attrs']['id'];
}elseif($af['elementname'] == 'fadeinfo'){ }elseif($af['elementname'] == 'fadeInfo'){
$fadeIn = $af['attrs']['fadein']; $fadeIn = $af['attrs']['fadeIn'];
$fadeOut = $af['attrs']['fadeout']; $fadeOut = $af['attrs']['fadeOut'];
}else{ }else{
} }
} }
@ -508,8 +511,8 @@ class Playlist extends StoredFile{
$plElGunidArr = $this->md->getMetadataEl('id', $elId); $plElGunidArr = $this->md->getMetadataEl('id', $elId);
if(PEAR::isError($plElGunidArr)){ return $plElGunidArr; } if(PEAR::isError($plElGunidArr)){ return $plElGunidArr; }
$plElGunid = $plElGunidArr[0]['value']; $plElGunid = $plElGunidArr[0]['value'];
// get relativeoffset: // get relativeOffset:
$offArr = $this->md->getMetadataEl('relativeoffset', $elId); $offArr = $this->md->getMetadataEl('relativeOffset', $elId);
if(PEAR::isError($offArr)){ return $offArr; } if(PEAR::isError($offArr)){ return $offArr; }
$offsetId = $offArr[0]['mid']; $offsetId = $offArr[0]['mid'];
$offset = $offArr[0]['value']; $offset = $offArr[0]['value'];
@ -598,26 +601,26 @@ class Playlist extends StoredFile{
$plArr = array('els'=>array()); $plArr = array('els'=>array());
foreach($arr[children] as $i=>$plEl){ foreach($arr[children] as $i=>$plEl){
switch($plEl['elementname']){ switch($plEl['elementname']){
case"playlistelement": case"playlistElement":
$plInfo = array( $plInfo = array(
'acLen' => '00:00:00.000000', 'acLenS' => 0, 'acLen' => '00:00:00.000000', 'acLenS' => 0,
'fadein' => '00:00:00.000000', 'fadeinS' => 0, 'fadeIn' => '00:00:00.000000', 'fadeInS' => 0,
'fadeout' => '00:00:00.000000', 'fadeoutS' => 0, 'fadeOut' => '00:00:00.000000', 'fadeOutS' => 0,
); );
$plInfo['elOffset'] = $pom = $plEl['attrs']['relativeoffset']; $plInfo['elOffset'] = $pom = $plEl['attrs']['relativeOffset'];
$plInfo['elOffsetS'] = $this->_plTimeToSecs($pom); $plInfo['elOffsetS'] = $this->_plTimeToSecs($pom);
foreach($plEl['children'] as $j=>$acFi){ foreach($plEl['children'] as $j=>$acFi){
switch($acFi['elementname']){ switch($acFi['elementname']){
case"audioclip": case"audioClip":
$plInfo['acLen'] = $pom = $acFi['attrs']['playlength']; $plInfo['acLen'] = $pom = $acFi['attrs']['playlength'];
$plInfo['acLenS'] = $this->_plTimeToSecs($pom); $plInfo['acLenS'] = $this->_plTimeToSecs($pom);
$plInfo['acGunid'] = $pom = $acFi['attrs']['id']; $plInfo['acGunid'] = $pom = $acFi['attrs']['id'];
break; break;
case"fadeinfo": case"fadeInfo":
$plInfo['fadein'] = $pom = $acFi['attrs']['fadein']; $plInfo['fadeIn'] = $pom = $acFi['attrs']['fadeIn'];
$plInfo['fadeinS'] = $this->_plTimeToSecs($pom); $plInfo['fadeInS'] = $this->_plTimeToSecs($pom);
$plInfo['fadeout'] = $pom = $acFi['attrs']['fadeout']; $plInfo['fadeOut'] = $pom = $acFi['attrs']['fadeOut'];
$plInfo['fadeoutS'] = $this->_plTimeToSecs($pom); $plInfo['fadeOutS'] = $this->_plTimeToSecs($pom);
break; break;
} }
} }
@ -705,7 +708,7 @@ class Playlist extends StoredFile{
* Cyclic-recursion checking * Cyclic-recursion checking
* *
* @param insGunid string, gunid of playlist beeing inserted * @param insGunid string, gunid of playlist beeing inserted
* @return * @return boolean - true if recursion is detected
*/ */
function _cyclicRecursion($insGunid) function _cyclicRecursion($insGunid)
{ {
@ -717,7 +720,7 @@ class Playlist extends StoredFile{
$els =& $arr['children']; $els =& $arr['children'];
if(!is_array($els)) return FALSE; if(!is_array($els)) return FALSE;
foreach($els as $i=>$plEl){ foreach($els as $i=>$plEl){
if($plEl['elementname'] != "playlistelement") continue; if($plEl['elementname'] != "playlistElement") continue;
foreach($plEl['children'] as $j=>$elCh){ foreach($plEl['children'] as $j=>$elCh){
if($elCh['elementname'] != "playlist") continue; if($elCh['elementname'] != "playlist") continue;
$nextGunid = $elCh['attrs']['id']; $nextGunid = $elCh['attrs']['id'];

8
livesupport/modules/storageServer/var/Validator.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.6 $ Version : $Revision: 1.7 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/Validator.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/Validator.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -146,7 +146,7 @@ class Validator{
*/ */
function validateNode(&$node, $fname) function validateNode(&$node, $fname)
{ {
$dname = strtolower(($node->ns? $node->ns.":" : '').$node->name); $dname = (($node->ns? $node->ns.":" : '').$node->name);
$formTree =& $this->formTree; $formTree =& $this->formTree;
if(DEBUG) echo"\nVAL::validateNode: 1 $dname/$fname\n"; if(DEBUG) echo"\nVAL::validateNode: 1 $dname/$fname\n";
// check root node name: // check root node name:
@ -181,7 +181,7 @@ class Validator{
$attrs = array(); $attrs = array();
// check if all attrs are permitted here: // check if all attrs are permitted here:
foreach($node->attrs as $i=>$attr){ foreach($node->attrs as $i=>$attr){
$aname = strtolower(($attr->ns? $attr->ns.":" : '').$attr->name); $aname = (($attr->ns? $attr->ns.":" : '').$attr->name);
$attrs[$aname] =& $node->attrs[$i]; $attrs[$aname] =& $node->attrs[$i];
if(!$this->isAttrInFormat($fname, $aname)) if(!$this->isAttrInFormat($fname, $aname))
return $this->_err(VAL_UNKNOWNA, $aname); return $this->_err(VAL_UNKNOWNA, $aname);
@ -219,7 +219,7 @@ class Validator{
$childs = array(); $childs = array();
// check if all children are permitted here: // check if all children are permitted here:
foreach($node->children as $i=>$ch){ foreach($node->children as $i=>$ch){
$chname = strtolower(($ch->ns? $ch->ns.":" : '').$ch->name); $chname = (($ch->ns? $ch->ns.":" : '').$ch->name);
// echo "XXE $chname\n"; // echo "XXE $chname\n";
if(!$this->isChildInFormat($fname, $chname)) if(!$this->isChildInFormat($fname, $chname))
return $this->_err(VAL_UNKNOWNE, $chname); return $this->_err(VAL_UNKNOWNE, $chname);

12
livesupport/modules/storageServer/var/audioClipFormat.php
View File

@ -22,15 +22,15 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Author : $Author: sebastian $ Author : $Author: tomas $
Version : $Revision: 1.3 $ Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/audioClipFormat.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/audioClipFormat.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
$audioClipFormat = array( $audioClipFormat = array(
'_root'=>'audioclip', '_root'=>'audioClip',
'audioclip'=>array( 'audioClip'=>array(
'childs'=>array( 'childs'=>array(
'required'=>array('metadata'), 'required'=>array('metadata'),
), ),
@ -56,7 +56,7 @@ $audioClipFormat = array(
'dcterms:spatial', 'dcterms:entity', 'dc:description', 'dcterms:spatial', 'dcterms:entity', 'dc:description',
'dc:creator', 'dc:subject', 'dc:type', 'dc:format', 'dc:creator', 'dc:subject', 'dc:type', 'dc:format',
'dc:contributor', 'dc:language', 'dc:rights', 'dc:contributor', 'dc:language', 'dc:rights',
'dcterms:ispartof', 'dc:date', 'dcterms:isPartOf', 'dc:date',
'dc:publisher', 'dc:publisher',
// extra // extra
'dcterms:alternative', 'dcterms:alternative',
@ -327,7 +327,7 @@ $audioClipFormat = array(
'area'=>'Talk', 'area'=>'Talk',
'attrs'=>array('implied'=>array('xml:lang')), 'attrs'=>array('implied'=>array('xml:lang')),
), ),
'dcterms:ispartof'=>array( 'dcterms:isPartOf'=>array(
'type'=>'Text', 'type'=>'Text',
'area'=>'Talk', 'area'=>'Talk',
'attrs'=>array('implied'=>array('xml:lang')), 'attrs'=>array('implied'=>array('xml:lang')),

24
livesupport/modules/storageServer/var/playlistFormat.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.3 $ Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/playlistFormat.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/playlistFormat.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -32,24 +32,24 @@ $playlistFormat = array(
'_root'=>'playlist', '_root'=>'playlist',
'playlist'=>array( 'playlist'=>array(
'childs'=>array( 'childs'=>array(
// 'repeatable'=>array('playlistelement'), // 'repeatable'=>array('playlistElement'),
'optional'=>array('metadata', 'playlistelement'), 'optional'=>array('metadata', 'playlistElement'),
), ),
'attrs'=>array( 'attrs'=>array(
'required'=>array('id', 'playlength'), 'required'=>array('id', 'playlength'),
'implied'=>array('title'), 'implied'=>array('title'),
), ),
), ),
'playlistelement'=>array( 'playlistElement'=>array(
'childs'=>array( 'childs'=>array(
'oneof'=>array('audioclip', 'playlist'), 'oneof'=>array('audioClip', 'playlist'),
'optional'=>array('fadeinfo'), 'optional'=>array('fadeInfo'),
), ),
'attrs'=>array( 'attrs'=>array(
'required'=>array('id', 'relativeoffset'), 'required'=>array('id', 'relativeOffset'),
), ),
), ),
'audioclip'=>array( 'audioClip'=>array(
'childs'=>array( 'childs'=>array(
'optional'=>array('metadata'), 'optional'=>array('metadata'),
), ),
@ -57,9 +57,9 @@ $playlistFormat = array(
'implied'=>array('id', 'title', 'playlength', 'uri'), 'implied'=>array('id', 'title', 'playlength', 'uri'),
), ),
), ),
'fadeinfo'=>array( 'fadeInfo'=>array(
'attrs'=>array( 'attrs'=>array(
'required'=>array('id', 'fadein', 'fadeout'), 'required'=>array('id', 'fadeIn', 'fadeOut'),
), ),
), ),
'metadata'=>array( 'metadata'=>array(
@ -98,11 +98,11 @@ $playlistFormat = array(
'type'=>'Attribute', 'type'=>'Attribute',
'regexp'=>'^[0-9a-f]{16}$', 'regexp'=>'^[0-9a-f]{16}$',
), ),
'fadein'=>array( 'fadeIn'=>array(
'type'=>'Attribute', 'type'=>'Attribute',
'regexp'=>'^((\d{2}:)?\d{2}:)?\d{1,2}(.\d{6})?$', 'regexp'=>'^((\d{2}:)?\d{2}:)?\d{1,2}(.\d{6})?$',
), ),
'fadeout'=>array( 'fadeOut'=>array(
'type'=>'Attribute', 'type'=>'Attribute',
'regexp'=>'^((\d{2}:)?\d{2}:)?\d{1,2}(.\d{6})?$', 'regexp'=>'^((\d{2}:)?\d{2}:)?\d{1,2}(.\d{6})?$',
), ),

2
livesupport/modules/storageServer/var/tests/plist1.xml
View File

@ -4,7 +4,7 @@
<playlistElement id="0000000000000101" relativeOffset="0" > <playlistElement id="0000000000000101" relativeOffset="0" >
<audioClip id="0000000000010001" playlength="01:00:00.000000" <audioClip id="0000000000010001" playlength="01:00:00.000000"
title="one"/> title="one"/>
<fadeinfo fadein="02.000000" fadeout="03.000000" <fadeInfo fadeIn="02.000000" fadeOut="03.000000"
id="15015b4b70a054f1" /> id="15015b4b70a054f1" />
</playlistElement> </playlistElement>
<playlistElement id="0000000000000102" relativeOffset="01:00:00.000000" > <playlistElement id="0000000000000102" relativeOffset="01:00:00.000000" >

4
livesupport/modules/storageServer/var/tests/wstream1.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<audioclip> <audioClip>
<metadata <metadata
xmlns="http://mdlf.org/livesupport/elements/1.0/" xmlns="http://mdlf.org/livesupport/elements/1.0/"
xmlns:ls="http://mdlf.org/livesupport/elements/1.0/" xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
@ -11,4 +11,4 @@
<dcterms:extent>01:30:00.000000</dcterms:extent> <dcterms:extent>01:30:00.000000</dcterms:extent>
<ls:url>http://localhost/y</ls:url> <ls:url>http://localhost/y</ls:url>
</metadata> </metadata>
</audioclip> </audioClip>

12
livesupport/modules/storageServer/var/webstreamFormat.php
View File

@ -22,15 +22,15 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Author : $Author: sebastian $ Author : $Author: tomas $
Version : $Revision: 1.3 $ Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/webstreamFormat.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/webstreamFormat.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
$webstreamFormat = array( $webstreamFormat = array(
'_root'=>'audioclip', '_root'=>'audioClip',
'audioclip'=>array( 'audioClip'=>array(
'childs'=>array( 'childs'=>array(
'required'=>array('metadata'), 'required'=>array('metadata'),
), ),
@ -56,7 +56,7 @@ $webstreamFormat = array(
'dcterms:spatial', 'dcterms:entity', 'dc:description', 'dcterms:spatial', 'dcterms:entity', 'dc:description',
'dc:creator', 'dc:subject', 'dc:type', 'dc:format', 'dc:creator', 'dc:subject', 'dc:type', 'dc:format',
'dc:contributor', 'dc:language', 'dc:rights', 'dc:contributor', 'dc:language', 'dc:rights',
'dcterms:ispartof', 'dc:date', 'dcterms:isPartOf', 'dc:date',
'dc:publisher', 'dc:publisher',
// extra // extra
'dcterms:alternative', 'dcterms:alternative',
@ -330,7 +330,7 @@ $webstreamFormat = array(
'area'=>'Talk', 'area'=>'Talk',
'attrs'=>array('implied'=>array('xml:lang')), 'attrs'=>array('implied'=>array('xml:lang')),
), ),
'dcterms:ispartof'=>array( 'dcterms:isPartOf'=>array(
'type'=>'Text', 'type'=>'Text',
'area'=>'Talk', 'area'=>'Talk',
'attrs'=>array('implied'=>array('xml:lang')), 'attrs'=>array('implied'=>array('xml:lang')),

5
livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.16 $ Version : $Revision: 1.17 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -906,7 +906,8 @@ class XR_LocStor extends LocStor{
* *
* On success, returns a XML-RPC struct with single field: * On success, returns a XML-RPC struct with single field:
* <ul> * <ul>
* <li> url : string - readable url</li> * <li> url : string - readable url of accessed playlist in
* XML format</li>
* <li> token : string - playlist token</li> * <li> token : string - playlist token</li>
* <li> chsum : string - md5 checksum</li> * <li> chsum : string - md5 checksum</li>
* </ul> * </ul>