Updated rightOperand/Reference narrative/definition #162

model/config.js

@@ -1,7 +1,7 @@
 var respecConfig = {
         specStatus: "ED",
         shortName:  "odrl-model",
-        publishDate:          "2017-06-06",
+        publishDate:          "2017-06-07",
         editors: [
             {   name:       "Renato Iannella",
                     url:        "https://au.linkedin.com/in/riannella",

model/index.html

@@ -695,7 +695,12 @@ <h3>Atomic Constraint</h3>
 
 <p>The <code>operator</code> identifies the logical operation such as &#8220;greater than&#8221; or &#8220;equal to&#8221 between the left and right operands.</p>
 
-<p>The <code>rightOperand</code> identifies the right operand of the logic expression. The <code>rightOperand</code> MAY be the value of the Constraint that is to be compared to the <code>leftOperand</code>. The <code>rightOperand</code> represents the literal value (such as <code>10</code> or <code>http://example.com/c100</code>) and <code>rightOperandReference</code> represents an IRI that MUST be de-referenced first to obtain the actual value of the <code>rightOperand</code>. A <code>rightOperandReference</code> is used in cases where the value of the <code>rightOperand</code> MUST be obtained from dereferencing an IRI. Only one of <code>rightOperand</code> and <code>rightOperandReference</code> MUST appear in the Atomic Constraint.</p>
+<p>The <code>rightOperand</code> identifies the right operand of the logic expression. The <code>rightOperand</code> is the literal value of the Constraint that is to be compared to the <code>leftOperand</code>. The <code>rightOperandReference</code> represents an IRI that MUST be de-referenced first to obtain the actual literal value of the <code>rightOperand</code>. A <code>rightOperandReference</code> is used in cases where the value of the <code>rightOperand</code> MUST be obtained from dereferencing an IRI first.  Only one of <code>rightOperand</code> or <code>rightOperandReference</code> MUST appear in the Atomic Constraint.</p>
+
+    <p><blockquote>
+The <code>rightOperand</code> represents a literal value and the <code>rightOperandReference</code> represents an IRI that must be de-referenced. If the <code>rightOperand</code> was <code>http://example.com/c100</code> then that is interpreted as the value to be compared in the logical expression. If the <code>rightOperandReference</code>  was the same value of <code>http://example.com/c100</code>, then that IRI must be de-referenced first and the data returned must be interpreted as the value to be compared in the logical expression.
+  </blockquote> </p> 
+
 
 <p>The <code>dataType</code> indicates the type of the <code>rightOperand/Reference</code>, such as <code>xsd:decimal</code> or <code>xsd:datetime</code> and the <code>unit</code> indicates the unit value of the <code>rightOperand/Reference</code>, such as &#8220;EU currency&#8221;.</p>
 
@@ -940,7 +945,7 @@ <h3>Party Constraint</h3>
 
 
 <section id="composition">
-<h4>Policy Composition</h4>
+<h4>Policy Rule Composition</h4>
 
     <p>A Policy MAY contain multiple Rules, and each Rule MAY contain multiple Assets, Parties, Actions, Constraints, and Duties. A Policy MAY also contain Assets, Parties, and Actions at the Policy level, and these entities apply to all of the enclosing Rules in the Policy.</p>
 

vocab/ODRL22.ttl

@@ -726,10 +726,10 @@ odrl:
 	a rdf:Property, skos:Concept ;
 	rdfs:isDefinedBy odrl: ;
 	rdfs:domain :Constraint ;
-#	rdfs:range rdfs:Resource ;
+	rdfs:range rdfs:Datatype ;
 	rdfs:label "Datatype"@en ;
 	skos:definition "The datatype of the value of the rightOperand or rightOperandReference of a Constraint."@en ;
-    skos:note "In RDF encodings, use of the rdf:datatype MAY be used. In JSON-LD encoding, the use of @type MAY be used."@en .
+    skos:note "In RDF encodings, use of the rdf:datatype MUST be used. In JSON-LD encoding, the use of @type MUST be used."@en .
 
 :operator
 	a rdf:Property , owl:ObjectProperty, skos:Concept ;
@@ -740,19 +740,19 @@ odrl:
 	rdfs:range :Operator .
 
 :rightOperand
-	a rdf:Property, skos:Concept ;
+	a rdf:Property, owl:DataTypeProperty, skos:Concept ;
 	rdfs:isDefinedBy odrl: ;
 	rdfs:label "Has Right Operand"@en ;
-	skos:definition "The right operand in a constraint expression."@en ;
+	skos:definition "The literal value of the right operand in a constraint expression."@en ;
 #	rdfs:range xsd:any ;
 	rdfs:domain :Constraint .
 
 :rightOperandReference
 	a rdf:Property, skos:Concept ;
 	rdfs:isDefinedBy odrl: ;
 	rdfs:label "Has Right Operand Reference"@en ;
-	skos:definition "A reference to a web resource providing the value for the right operand of a Constraint."@en ;
-	skos:note "Is an IRI that must be dereferenced to obtain the actual right operand value"@en ;
+	skos:definition "A reference to a web resource providing the literal value for the right operand of a Constraint."@en ;
+	skos:note "Is an IRI that MUST be dereferenced to obtain the actual right operand value"@en ;
 	rdfs:domain :Constraint .
 
 :leftOperand
@@ -974,7 +974,7 @@ odrl:
 	rdfs:isDefinedBy odrl: ;
 	rdfs:label "Device"@en ;
 	skos:definition "An identified computing system for exercising the Action."@en ;
-  owl:deprecated true ;
+    owl:deprecated true ;
 	owl:equivalentProperty :systemDevice .
 
 :elapsedTime