From a5e6054fbdc9d9a78c5f729f687b4db2a6d11bf5 Mon Sep 17 00:00:00 2001
From: Adam Vessey <adam@discoverygarden.ca>
Date: Fri, 20 Apr 2012 18:09:20 -0300
Subject: [PATCH] Extract the Sparql parser out, so it might be used elsewhere
 during transition.

---
 ObjectHelper.inc | 72 +++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/ObjectHelper.inc b/ObjectHelper.inc
index 16076a18..7fed4f86 100644
--- a/ObjectHelper.inc
+++ b/ObjectHelper.inc
@@ -1015,6 +1015,48 @@ class ObjectHelper {
     drupal_set_message(t($configMess . "<br />" . $messMap[$app] . "<hr  width='40%' align = 'left'/>", array('%app' => $app)), 'warning', FALSE);
   }
 
+  /**
+   * Parse the passed in Sparql XML string into a more easily usable format.
+   *
+   * @param $sparql string
+   *   A string containing Sparql result XML.
+   * @return array
+   *   Indexed (numerical) array, containing a number of associative arrays,
+   *   with keys being the same as the variable names in the query.
+   *   URIs beginning with 'info:fedora/' will have this beginning stripped
+   *   off, to facilitate their use as PIDs.
+   */
+  public static function parse_sparql_results($sparql) {
+    //Load the results into a SimpleXMLElement
+    $doc = new SimpleXMLElement($sparql, 0, FALSE, 'http://www.w3.org/2001/sw/DataAccess/rf1/result');
+    
+    $results = array(); //Storage.
+    
+    //Build the results.
+    foreach ($doc->results->children() as $result) {
+      //Built a single result.
+      $r = array();
+      foreach ($result->children() as $element) {
+        $val = NULL;
+        
+        $attrs = $element->attributes();
+        if (!empty($attrs['uri'])) {
+          $val = self::_pid_uri_to_bare_pid((string)$attrs['uri']);
+        }
+        else {
+          $val = (string)$element;
+        }
+        
+        //Map the name to the value in the array.
+        $r[$element->getName()] = $val;
+      }
+      
+      //Add the single result to the set to return.
+      $results[] = $r;
+    }
+    return $results;
+  }
+  
   /**
    * Performs the given Resource Index query and return the results.
    *
@@ -1064,34 +1106,8 @@ static function perform_ri_query($query, $type = 'itql', $limit = -1, $offset =
       return FALSE;
     }
     
-    //Load the results into a SimpleXMLElement
-    $doc = new SimpleXMLElement($curl_result[0], 0, FALSE, 'http://www.w3.org/2001/sw/DataAccess/rf1/result');
-    
-    $results = array(); //Storage.
-    
-    //Build the results.
-    foreach ($doc->results->children() as $result) {
-      //Built a single result.
-      $r = array();
-      foreach ($result->children() as $element) {
-        $val = NULL;
-        
-        $attrs = $element->attributes();
-        if (!empty($attrs['uri'])) {
-          $val = self::pid_uri_to_bare_pid((string)$attrs['uri']);
-        }
-        else {
-          $val = (string)$element;
-        }
-        
-        //Map the name to the value in the array.
-        $r[$element->getName()] = $val;
-      }
-      
-      //Add the single result to the set to return.
-      $results[] = $r;
-    }
-    return $results;
+    //Pass the query's results off to a decent parser.
+    return self::parse_sparql_results($curl_result[0]);
   }
   /**
    * Thin wrapper for self::_perform_ri_query().