www

commit caad9aa4d6e0d1d58a04daf786c75ae8ab1fc38b
parent 66bfaaae13ba8590cb542b9ecafb4b232a5a201d
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat, 12 May 2012 09:31:33 -0700

Merge pull request #127 from aurimasv/rdf

Rdf tweaks
Diffstat:
M
chrome/content/zotero/xpcom/rdf/identity.js
 | 
17
+++++++----------
M
chrome/content/zotero/xpcom/rdf/init.js
 | 
18
++++++++----------
M
chrome/content/zotero/xpcom/translation/translate.js
 | 
3
++-

3 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/chrome/content/zotero/xpcom/rdf/identity.js b/chrome/content/zotero/xpcom/rdf/identity.js
@@ -202,7 +202,7 @@ We replace the bigger with the smaller.
     moveIndex(this.classActions);
     moveIndex(this.propertyActions);
 
-    tabulator.log.debug("Equate done. "+big+" now links to "+small)    
+    $rdf.log.debug("Equate done. "+big+" now links to "+small)    
     return true; // true means the statement does not need to be put in
   };
 
@@ -250,9 +250,7 @@ We replace the bigger with the smaller.
         return new $rdf.Literal(val); // @@ differet types
       if(typeof val == 'boolean')
         return new $rdf.Literal(val ? "1" : "0", undefined, $rdf.Symbol.prototype.XSDboolean);
-      else if(typeof val == 'number')
-        return new $rdf.Literal('' + val); // @@ datatypes
-      else if(typeof val == 'undefined')
+      if(typeof val == 'undefined')
         return undefined;
       else // @@ add converting of dates and numbers
       throw "Can't make Term from " + val + " of type " + typeof val;
@@ -390,12 +388,11 @@ We replace the bigger with the smaller.
           break;
         }
       }
-      if(st != null) results.push(st);
-    }
-
-    if(justOne) {
-      if(results.length > 1)
-        results = results.slice(0, 1);
+      if(st != null) {
+        results.push(st);
+        if(justOne)
+          break;
+      }
     }
     return results;
   }; // statementsMatching
diff --git a/chrome/content/zotero/xpcom/rdf/init.js b/chrome/content/zotero/xpcom/rdf/init.js
@@ -19,7 +19,11 @@ var $rdf = {
       }
       throw "RDFArrayRemove: Array did not contain " + x;
     },
-  }
+  },
+  log: {
+  	debug: Zotero.debug,
+  	warn: Zotero.debug
+	}
 };
 
 if(Zotero.RDF) {
@@ -28,11 +32,5 @@ if(Zotero.RDF) {
 	Zotero.RDF = {AJAW:$rdf};
 }
 
-var tabulator = {
-	log: {
-  	debug: Zotero.debug,
-  	warn: Zotero.debug
-	}
-};
-
-var alert = Zotero.debug;
-\ No newline at end of file
+var tabulator = {log: $rdf.log};
+var alert = $rdf.log.warn;
+\ No newline at end of file
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
@@ -2285,7 +2285,8 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 		"getArcsOut":"r",
 		"getSources":"r",
 		"getTargets":"r",
-		"getStatementsMatching":"r"
+		"getStatementsMatching":"r",
+		"serialize":"r"
 	},
 	
 	/**