From 945ce41036c8a860bffb65e2f6bfe8a15a1659b3 Mon Sep 17 00:00:00 2001
From: aurimasv <aurimas.dev@gmail.com>
Date: Mon, 7 May 2012 05:34:15 -0500
Subject: [PATCH 1/2] Re-expose logging functions to RDF parser after init
 script rearrangement

---
 chrome/content/zotero/xpcom/rdf/init.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/chrome/content/zotero/xpcom/rdf/init.js b/chrome/content/zotero/xpcom/rdf/init.js
index 88355c89d..fc310ec7f 100644
--- a/chrome/content/zotero/xpcom/rdf/init.js
+++ b/chrome/content/zotero/xpcom/rdf/init.js
@@ -19,18 +19,20 @@ var $rdf = {
       }
       throw "RDFArrayRemove: Array did not contain " + x;
     },
-  },
-  tabulator: {
-  	log: {
-    	debug: Zotero.debug,
-    	warn: Zotero.debug
-  	}
-	},
-	alert: Zotero.debug
+  }
 };
 
 if(Zotero.RDF) {
 	Zotero.RDF.AJAW = $rdf;
 } else {
 	Zotero.RDF = {AJAW:$rdf};
-}
\ No newline at end of file
+}
+
+var tabulator = {
+	log: {
+  	debug: Zotero.debug,
+  	warn: Zotero.debug
+	}
+};
+
+var alert = Zotero.debug;
\ No newline at end of file

From 8c6404626fc3b2024294d4b7089bd848514cbac5 Mon Sep 17 00:00:00 2001
From: aurimasv <aurimas.dev@gmail.com>
Date: Mon, 7 May 2012 05:35:39 -0500
Subject: [PATCH 2/2] Tweak SameAs handling to prevent creating entries for a
 non-canonical subject

---
 chrome/content/zotero/xpcom/rdf/identity.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/xpcom/rdf/identity.js b/chrome/content/zotero/xpcom/rdf/identity.js
index 9aef4c8c6..66c3dd77f 100644
--- a/chrome/content/zotero/xpcom/rdf/identity.js
+++ b/chrome/content/zotero/xpcom/rdf/identity.js
@@ -191,7 +191,7 @@ We replace the bigger with the smaller.
         }
       }
 
-      this.add(small, this.sym('http://www.w3.org/2007/ont/link#uri'), big.uri)
+      //this.add(small, this.sym('http://www.w3.org/2007/ont/link#uri'), big.uri)
 
       // If two things are equal, and one is requested, we should request the other.
       if(this.sf) {
@@ -202,7 +202,7 @@ We replace the bigger with the smaller.
     moveIndex(this.classActions);
     moveIndex(this.propertyActions);
 
-    //$rdf.log.debug("Equate done. "+big+" to be known as "+small)    
+    tabulator.log.debug("Equate done. "+big+" now links to "+small)    
     return true; // true means the statement does not need to be put in
   };
 
@@ -274,15 +274,11 @@ We replace the bigger with the smaller.
     obj = RDFMakeTerm(this, obj);
     why = RDFMakeTerm(this, why);
 
-    var hash = [this.canon(subj).hashString(), this.canon(pred).hashString(),
-                       this.canon(obj).hashString(), this.canon(why).hashString()];
-
-
     if(this.predicateCallback != undefined)
       this.predicateCallback(this, pred, why);
 
     // Action return true if the statement does not need to be added
-    var actions = this.propertyActions[hash[1]]; // Predicate hash
+    var actions = this.propertyActions[this.canon(pred).hashString()];
     var done = false;
     if(actions) {
       // alert('type: '+typeof actions +' @@ actions='+actions);
@@ -294,6 +290,8 @@ We replace the bigger with the smaller.
     //If we are tracking provenanance, every thing should be loaded into the store
     //if (done) return new Statement(subj, pred, obj, why); // Don't put it in the store
     // still return this statement for owl:sameAs input
+    var hash = [this.canon(subj).hashString(), this.canon(pred).hashString(),
+                   this.canon(obj).hashString(), this.canon(why).hashString()];
     var st = new $rdf.Statement(subj, pred, obj, why);
     for(var i = 0; i < 4; i++) {
       var ix = this.index[i];
@@ -302,7 +300,7 @@ We replace the bigger with the smaller.
       ix[h].push(st); // Set of things with this as subject, etc
     }
 
-    //$rdf.log.debug("ADDING    {"+subj+" "+pred+" "+obj+"} "+why);
+    //tabulator.log.debug("ADDING    {"+subj+" "+pred+" "+obj+"} "+why);
     this.statements.push(st);
     return st;
   }; //add