ls:url moved to metadata container

This commit is contained in:
tomas 2005-03-03 19:23:52 +00:00
parent 6c2dfef068
commit 3e920486bd
4 changed files with 9 additions and 9 deletions

View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.50 $ Version : $Revision: 1.51 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/GreenBox.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/GreenBox.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -35,7 +35,7 @@ require_once "BasicStor.php";
* LiveSupport file storage module * LiveSupport file storage module
* *
* @author $Author: tomas $ * @author $Author: tomas $
* @version $Revision: 1.50 $ * @version $Revision: 1.51 $
* @see BasicStor * @see BasicStor
*/ */
class GreenBox extends BasicStor{ class GreenBox extends BasicStor{
@ -107,7 +107,7 @@ class GreenBox extends BasicStor{
); );
if(PEAR::isError($oid)) return $oid; if(PEAR::isError($oid)) return $oid;
$r = $this-> bsSetMetadataValue( $r = $this-> bsSetMetadataValue(
$oid, 'ls:url', $url, NULL, NULL, 'audioClip'); $oid, 'ls:url', $url, NULL, NULL, 'metadata');
if(PEAR::isError($r)) return $r; if(PEAR::isError($r)) return $r;
return $oid; return $oid;
} }

View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.36 $ Version : $Revision: 1.37 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -158,7 +158,7 @@ class LocStor extends BasicStor{
if(PEAR::isError($ac)) return $ac; if(PEAR::isError($ac)) return $ac;
$oid = $ac->getId(); $oid = $ac->getId();
$r = $this-> bsSetMetadataValue( $r = $this-> bsSetMetadataValue(
$oid, 'ls:url', $url, NULL, NULL, 'audioClip'); $oid, 'ls:url', $url, NULL, NULL, 'metadata');
if(PEAR::isError($r)) return $r; if(PEAR::isError($r)) return $r;
return $gunid; return $gunid;
} }

View file

@ -9,6 +9,6 @@
> >
<dc:title>Webstream test 1</dc:title> <dc:title>Webstream test 1</dc:title>
<dcterms:extent>01:30:00.000000</dcterms:extent> <dcterms:extent>01:30:00.000000</dcterms:extent>
<ls:url>http://localhost/y</ls:url>
</metadata> </metadata>
<ls:url>http://localhost/y</ls:url>
</audioclip> </audioclip>

View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.1 $ Version : $Revision: 1.2 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -32,13 +32,13 @@ $webstreamFormat = array(
'_root'=>'audioclip', '_root'=>'audioclip',
'audioclip'=>array( 'audioclip'=>array(
'childs'=>array( 'childs'=>array(
'required'=>array('metadata', 'ls:url'), 'required'=>array('metadata'),
), ),
), ),
'metadata'=>array( 'metadata'=>array(
'childs'=>array( 'childs'=>array(
'required'=>array( 'required'=>array(
'dc:title', 'dcterms:extent' 'dc:title', 'dcterms:extent', 'ls:url'
), ),
'optional'=>array( 'optional'=>array(
'dc:identifier', 'dc:identifier',