From 7e654293752048f8bb52212bfb4cbe6f6872d5fb Mon Sep 17 00:00:00 2001
From: Dave Longley <dlongley@digitalbazaar.com>
Date: Wed, 9 Nov 2011 13:58:47 -0500
Subject: [PATCH] Made sort optimization more effective.

---
 jsonld.php | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/jsonld.php b/jsonld.php
index 50539cd..ca8f58d 100644
--- a/jsonld.php
+++ b/jsonld.php
@@ -1889,6 +1889,7 @@ class JsonLdProcessor
       {
          if($resort)
          {
+            $resort = false;
             usort($bnodes, array($this, 'deepCompareBlankNodes'));
          }
 
@@ -1927,24 +1928,24 @@ class JsonLdProcessor
                }
             }
 
-            // only clear serializations if resorting is necessary
-            if($resort)
+            // only keep non-canonically named bnodes
+            $tmp = $bnodes;
+            $bnodes = array();
+            foreach($tmp as $i => $b)
             {
-               // only keep non-canonically named bnodes
-               $tmp = $bnodes;
-               $bnodes = array();
-               foreach($tmp as $i => $b)
+               $iriB = $b->{'@subject'}->{'@iri'};
+               if(!$c14n->inNamespace($iriB))
                {
-                  $iriB = $b->{'@subject'}->{'@iri'};
-                  if(!$c14n->inNamespace($iriB))
+                  // mark serializations related to the named bnodes as dirty
+                  foreach($renamed as $r)
                   {
-                     // mark serializations related to the named bnodes as dirty
-                     foreach($renamed as $r)
+                     if($this->markSerializationDirty($iriB, $r, $dir))
                      {
-                        $this->markSerializationDirty($iriB, $r, $dir);
+                        // resort if a serialization was marked dirty
+                        $resort = true;
                      }
-                     $bnodes[] = $b;
                   }
+                  $bnodes[] = $b;
                }
             }
          }
@@ -1974,14 +1975,19 @@ class JsonLdProcessor
     * @param iri the IRI of the bnode to check.
     * @param changed the old IRI of the bnode that changed.
     * @param dir the direction to check ('props' or 'refs').
+    *
+    * @return true if the serialization was marked dirty, false if not.
     */
    public function markSerializationDirty($iri, $changed, $dir)
    {
+      $rval = false;
       $s = $this->serializations->$iri;
       if($s->$dir !== null and property_exists($s->$dir->m, $changed))
       {
          $s->$dir = null;
+         $rval = true;
       }
+      return $rval;
    }
 
    /**