From 0caf92b44e95873bf7a99eab6537397ba439c0fe Mon Sep 17 00:00:00 2001
From: tomash <tomash@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Fri, 20 Oct 2006 14:51:45 +0000
Subject: [PATCH] #1872 added 'source' to search result structure

---
 .../src/modules/storageServer/var/BasicStor.php     |  2 ++
 .../src/modules/storageServer/var/DataEngine.php    | 13 +++++++++----
 .../src/modules/storageServer/var/LocStor.php       |  1 +
 .../modules/storageServer/var/xmlrpc/XR_LocStor.php |  3 +++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/campcaster/src/modules/storageServer/var/BasicStor.php b/campcaster/src/modules/storageServer/var/BasicStor.php
index d6a36e9e0..d87653d79 100644
--- a/campcaster/src/modules/storageServer/var/BasicStor.php
+++ b/campcaster/src/modules/storageServer/var/BasicStor.php
@@ -968,6 +968,7 @@ class BasicStor extends Alib {
      *          type: string - audioclip | playlist | webstream
      *          title: string - dc:title from metadata
      *          creator: string - dc:creator from metadata
+     *          source: string - dc:source from metadata
      *          length: string - dcterms:extent in extent format
      *  @see DataEngine
      */
@@ -2034,6 +2035,7 @@ class BasicStor extends Alib {
      *          type: string - audioclip | playlist | webstream
      *          title: string - dc:title from metadata
      *          creator: string - dc:creator from metadata
+     *          source: string - dc:source from metadata
      *          length: string - dcterms:extent in extent format
      */
     function resetStorage($loadSampleData=TRUE, $filesOnly=FALSE)
diff --git a/campcaster/src/modules/storageServer/var/DataEngine.php b/campcaster/src/modules/storageServer/var/DataEngine.php
index e3fdcc7d2..925ac590a 100644
--- a/campcaster/src/modules/storageServer/var/DataEngine.php
+++ b/campcaster/src/modules/storageServer/var/DataEngine.php
@@ -266,6 +266,7 @@ class DataEngine{
      *          type: string - audioclip | playlist | webstream
      *          title: string - dc:title from metadata
      *          creator: string - dc:creator from metadata
+     *          source: string - dc:source from metadata
      *          length: string - dcterms:extent in extent format
      *     OR (in browse mode)
      *       results: array of strings - browsed values
@@ -342,15 +343,19 @@ class DataEngine{
                 $creatorA = $r = $this->gb->bsGetMetadataValue($it['id'], 'dc:creator');
                 if(PEAR::isError($r)) return $r;
                 $creator  = (isset($creatorA[0]['value']) ? $creatorA[0]['value'] : '');
+                $sourceA = $r = $this->gb->bsGetMetadataValue($it['id'], 'dc:source');
+                if(PEAR::isError($r)) return $r;
+                $source  = (isset($sourceA[0]['value']) ? $sourceA[0]['value'] : '');
                 $lengthA  = $r = $this->gb->bsGetMetadataValue($it['id'], 'dcterms:extent');
                 if(PEAR::isError($r)) return $r;
                 $length   = (isset($lengthA[0]['value']) ? $lengthA[0]['value'] : '');
                 $eres[] = array(
-                    'gunid'   => $gunid,
-                    'type'    => $it['ftype'],
-                    'title'   => $title,
+                    'gunid' => $gunid,
+                    'type' => $it['ftype'],
+                    'title' => $title,
                     'creator' => $creator,
-                    'length'  => $length,
+                    'length' => $length,
+                    'source' => $source,
                 );
             }else{
                 $eres[] = $it['txt'];
diff --git a/campcaster/src/modules/storageServer/var/LocStor.php b/campcaster/src/modules/storageServer/var/LocStor.php
index 9ef614f41..b450e67b2 100644
--- a/campcaster/src/modules/storageServer/var/LocStor.php
+++ b/campcaster/src/modules/storageServer/var/LocStor.php
@@ -366,6 +366,7 @@ class LocStor extends BasicStor {
      *           <li>type: string - audioclip | playlist | webstream</li>
      *           <li>title: string - dc:title from metadata</li>
      *           <li>creator: string - dc:creator from metadata</li>
+     *           <li>source: string - dc:source from metadata</li>
      *           <li>length: string - dcterms:extent in extent format</li>
      *          </ul>
      *      </li>
diff --git a/campcaster/src/modules/storageServer/var/xmlrpc/XR_LocStor.php b/campcaster/src/modules/storageServer/var/xmlrpc/XR_LocStor.php
index 6440df81b..d77fa21da 100644
--- a/campcaster/src/modules/storageServer/var/xmlrpc/XR_LocStor.php
+++ b/campcaster/src/modules/storageServer/var/xmlrpc/XR_LocStor.php
@@ -2257,6 +2257,7 @@ class XR_LocStor extends LocStor{
      *           <li>type: string - audioclip | playlist | webstream</li>
      *           <li>title: string - dc:title from metadata</li>
      *           <li>creator: string - dc:creator from metadata</li>
+     *           <li>source: string - dc:source from metadata</li>
      *           <li>length: string - dcterms:extent in extent format</li>
      *          </ul>
      *      </li>
@@ -3110,6 +3111,7 @@ class XR_LocStor extends LocStor{
      *           <li>type: string - audioclip | playlist | webstream</li>
      *           <li>title: string - dc:title from metadata</li>
      *           <li>creator: string - dc:creator from metadata</li>
+     *           <li>source: string - dc:source from metadata</li>
      *           <li>length: string - dcterms:extent in extent format</li>
      *          </ul>
      *      </li>
@@ -3278,6 +3280,7 @@ class XR_LocStor extends LocStor{
      *           <li>type: string - audioclip | playlist | webstream</li>
      *           <li>title: string - dc:title from metadata</li>
      *           <li>creator: string - dc:creator from metadata</li>
+     *           <li>source: string - dc:source from metadata</li>
      *           <li>length: string - dcterms:extent in extent format</li>
      *          </ul>
      *      </li>