From b5f2262b0a3d75818e856e2afd150da2b1417b5a Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 21 Nov 2006 15:53:30 +0000
Subject: [PATCH] Fixed function call names for renamed functions.

---
 .../src/modules/storageServer/var/tests/webstreamTest.php  | 2 +-
 .../src/modules/storageServer/var/xmlrpc/simpleGet.php     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/campcaster/src/modules/storageServer/var/tests/webstreamTest.php b/campcaster/src/modules/storageServer/var/tests/webstreamTest.php
index 0ef3432d6..8389d8cef 100644
--- a/campcaster/src/modules/storageServer/var/tests/webstreamTest.php
+++ b/campcaster/src/modules/storageServer/var/tests/webstreamTest.php
@@ -24,7 +24,7 @@ echo"#  storeWebstream: "; $r = $gb->storeWebstream(
     $parid, 'test stream', $mdataFileLP, $sessid, $gunid, 'http://localhost/y');
 if(PEAR::isError($r)){ echo "ERROR: ".$r->getMessage()." ".$r->getUserInfo()."\n"; exit(1); }
 echo ""; var_dump($r);
-#$id = $gb->_idFromGunid($gunid);
+#$id = $gb->idFromGunid($gunid);
 $id = $r;
 
 echo"#  getMdata: "; $r = $gb->getMdata($id, $sessid);
diff --git a/campcaster/src/modules/storageServer/var/xmlrpc/simpleGet.php b/campcaster/src/modules/storageServer/var/xmlrpc/simpleGet.php
index 86788b62e..28d9ef7e4 100644
--- a/campcaster/src/modules/storageServer/var/xmlrpc/simpleGet.php
+++ b/campcaster/src/modules/storageServer/var/xmlrpc/simpleGet.php
@@ -69,7 +69,7 @@ if($dbc->isError($ac)){
             http_error(500, "500 ".$ac->getMessage());
     }
 }
-$lid = $locStor->_idFromGunid($gunid);
+$lid = $locStor->idFromGunid($gunid);
 if($dbc->isError($lid)){ http_error(500, $lid->getMessage()); }
 if(($res = $locStor->_authorize('read', $lid, $sessid)) !== TRUE){
     http_error(403, "403 Access denied");
@@ -86,8 +86,9 @@ switch($ftype){
         break;
     case"webstream":
         $url = $locStor->bsGetMetadataValue($lid, 'ls:url');
-        if(PEAR::isError($url)){ http_error(500, $url->getMessage()); }
-        $url = $url[0]['value'];
+        if (empty($url)) {
+        	http_error(500, "Unable to get ls:url value");
+        }
         $txt = "Location: $url";
         header($txt);
         // echo "$txt\n";