Changeset 22

Timestamp:

Jul 12, 2011, 5:56:17 PM (14 years ago)

Author:

cla

Message:

rdfint

• prefix non-standard methods rdfa::Data::_shrink and rdfa::Data::_resolve with an underscore

File:

• php/trunk/classes/rdfa_Data.php (modified) (14 diffs)

php/trunk/classes/rdfa_Data.php

@@ -137 +137 @@
 
     // resolve namespace prefixes
-    $uriSubject   = $this->resolve( $subject);
-    $uriPredicate = $this->resolve( $predicate);
-    $uriObject    = $this->resolve( $object);
+    $uriSubject   = $this->_resolve( $subject);
+    $uriPredicate = $this->_resolve( $predicate);
+    $uriObject    = $this->_resolve( $object);
 
     // resolve method may return NULL, then use original value
@@ -151 +151 @@
 
       // must be triple
-      if ((isset( $aTriple[ 'type'])) && 
+      if ((isset( $aTriple[ 'type'])) &&
           ($aTriple[ 'type'] != 'triple'))
         continue;
@@ -199 +199 @@
   private function _subjectExists( $subject) {
 
-    $uriSubject = $this->shrink( $subject);
+    $uriSubject = $this->_shrink( $subject);
     foreach ($this->aTriples as $aTriple) {
-      if ( $uriSubject == $this->shrink( $aTriple[ 's']))
+      if ( $uriSubject == $this->_shrink( $aTriple[ 's']))
         return true;
     }
@@ -248 +248 @@
   private function _shrinkFormatted( $uri) {
 
-    $curie = $this->shrink( $uri);
+    $curie = $this->_shrink( $uri);
     if ($curie == $uri)
       $curie = "<$uri>";
@@ -363 +363 @@
    * <strong>NOTE: This method is a library specific extension to the RDF API and RDFa API.</strong>
    */
-  public function resolve( $curie) {
+  public function _resolve( $curie) {
 
     $replacecount = 1;
@@ -389 +389 @@
     return $uri;
 
-  } //  public function resolve
+  } //  public function _resolve
 
   // --------------------------------------------------------
@@ -402 +402 @@
    * <strong>NOTE: This method is a library specific extension to the RDF API and RDFa API.</strong>
    */
-  public function shrink( $uri) {
+  public function _shrink( $uri) {
 
     $replacecount = 1;
@@ -423 +423 @@
     return $uri;
 
-  }  //  public function shrink
+  }  //  public function _shrink
 
   /**@} */ /***************** DOXYGEN GROUP ENDS - Mapping APIs */
@@ -518 +518 @@
     $aresult = false;
     foreach ($aTriplesResult as $aTriple) {
-      $aresult[]= $this->shrink( $aTriple[ 's']);
+      $aresult[]= $this->_shrink( $aTriple[ 's']);
     }
 
@@ -565 +565 @@
     $aresult = false;
     foreach ($aTriplesResult as $aTriple) {
-      $aresult[]= $this->shrink( $aTriple[ 'p']);
+      $aresult[]= $this->_shrink( $aTriple[ 'p']);
     }
     
@@ -619 +619 @@
     foreach ($aTriplesResult as $pos => $aTriple) {
       // isolate predicate and check if it was already found
-      $thispredicate = $this->shrink( $aTriple[ 'p']);
+      $thispredicate = $this->_shrink( $aTriple[ 'p']);
       if (isset( $afound[ $thispredicate])) {
         unset( $aresult[ $thispredicate]);
@@ -625 +625 @@
       } else {
         $afound[ $thispredicate] = true;
-        $aresult[ $thispredicate] = $this->shrink( $aTriple[ 'o']);
+        $aresult[ $thispredicate] = $this->_shrink( $aTriple[ 'o']);
       }
     }
@@ -673 +673 @@
     $aresult = false;
     foreach ($aTriplesResult as $aTriple) {
-      $aresult[]= $this->shrink( $aTriple[ 'o']);
+      $aresult[]= $this->_shrink( $aTriple[ 'o']);
     }
 
@@ -726 +726 @@
     $result = false;
     foreach ($aTriplesResult as $aTriple) {
-      $result = $this->shrink( $aTriple[ 'o']);
+      $result = $this->_shrink( $aTriple[ 'o']);
       break;
     }