[Feature] WOQLQuery.prototype.label/description: accept 'woql:Datatype' objects #32

Author: fidelthomet

lib/query/woqlBuilder.js

@@ -245,12 +245,8 @@ WOQLQuery.prototype.domain = function(d) {
 }
 
 WOQLQuery.prototype.label = function(l, lang) {
-    if (typeof l !== 'string' && l['@value'] != null) {
-        lang = l['@language']
-        l = l['@value']
-    }
     lang = lang ? lang : 'en'
-    if (l.substring(0, 2) == 'v:') {
+    if (typeof l === 'object' || l.substring(0, 2) == 'v:') {
         var d = l
     } else {
         var d = {'@value': l, '@type': 'xsd:string', '@language': lang}
@@ -259,12 +255,8 @@ WOQLQuery.prototype.label = function(l, lang) {
 }
 
 WOQLQuery.prototype.description = function(c, lang) {
-    if (typeof c !== 'string' && c['@value'] != null) {
-        lang = c['@language']
-        c = c['@value']
-    }
     lang = lang ? lang : 'en'
-    if (c.substring(0, 2) == 'v:') {
+    if (typeof c === 'object' || c.substring(0, 2) == 'v:') {
         var d = c
     } else {
         var d = {'@value': c, '@type': 'xsd:string', '@language': lang}