[tracker] Add nie:url property to Data Objects (already in upstream svn)

[Ivan Frade <ifrade src gnome org>]

commit f78509e02648872983695e220ce532c326760d53
Author: Ivan Frade <ivan frade nokia com>
Date:   Wed Dec 9 09:31:28 2009 +0200

    Add nie:url property to Data Objects (already in upstream svn)
    
    Marked nfo:fileURL as deprecated .

 data/ontologies/30-nie.ontology      |    6 ++++++
 data/ontologies/33-nfo.ontology      |    3 ++-
 docs/ontologies/nie/explanation.html |   28 ++++++++++++++--------------
 3 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/data/ontologies/30-nie.ontology b/data/ontologies/30-nie.ontology
index f877e43..45b4c26 100644
--- a/data/ontologies/30-nie.ontology
+++ b/data/ontologies/30-nie.ontology
@@ -262,3 +262,9 @@ nie:usageCounter a rdf:Property ;
 	tracker:isAnnotation true ;
 	tracker:weight 3 .
 
+nie:url a rdf:Property ;
+	rdfs:label "URL" ;
+	rdfs:comment "URL pointing at the location of the resource. In cases where creating a simple file:// or http:// URL for a file is difficult (e.g. for files inside compressed archives) the applications are encouraged to use conventions defined by Apache Commons VFS Project at http://jakarta.apache.org/  commons/ vfs/ filesystems.html." ;
+	nrl:maxCardinality 1 ;
+	rdfs:domain nie:DataObject ;
+	rdfs:range xsd:string .
diff --git a/data/ontologies/33-nfo.ontology b/data/ontologies/33-nfo.ontology
index 9239c64..846d8de 100644
--- a/data/ontologies/33-nfo.ontology
+++ b/data/ontologies/33-nfo.ontology
@@ -3,6 +3,7 @@
 @prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
 @prefix nie: <http://www.semanticdesktop.org/ontologies/2007/01/19/nie#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+ prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
@@ -508,11 +509,11 @@ nfo:hasMediaStream a rdf:Property ;
 	rdfs:domain nfo:Media ;
 	rdfs:range nie:DataObject .
 
-# FIXME Resource or a string? the uri of the file is his location!
 nfo:fileUrl a rdf:Property ;
 	rdfs:label "fileUrl" ;
 	rdfs:comment "URL of the file. It points at the location of the file. In cases where creating a simple file:// or http:// URL for a file is difficult (e.g. for files inside compressed archives) the applications are encouraged to use conventions defined by Apache Commons VFS Project at http://jakarta.apache.org/  commons/ vfs/ filesystems.html." ;
 	nrl:maxCardinality 1 ;
+	nao:deprecated true ;
 	rdfs:domain nfo:FileDataObject ;
 	rdfs:range rdfs:Resource .
 
diff --git a/docs/ontologies/nie/explanation.html b/docs/ontologies/nie/explanation.html
index 69bd6d4..cffc541 100644
--- a/docs/ontologies/nie/explanation.html
+++ b/docs/ontologies/nie/explanation.html
@@ -54,16 +54,17 @@ worth to comment few of them with special relevance:
 
 
 <h3>Dates and timestamps representations</h3>
-FIXME Explain the mess with dates
+<p>There are few important dates for the life-cycle of a resource. These dates are properties of the nie:InformationElement class, and inherited for its subclasses:</p>
 <dl>
-  <dt><a href="#contentLastModified">nie:contentLastModified</a><dt>
-  <dd>.</dd>
   <dt><a href="#informationElementDate">nie:informationElementDate</a><dt>
-  <dd>.</dd>
+  <dd>This is an ''abstract'' property that act as superproperty of
+  the other dates. Don't use it directly.</dd>
+  <dt><a href="#contentLastModified">nie:contentLastModified</a><dt>
+  <dd>Modification time of a resource. Usually the mtime of a local file, or information from the server for online resources.</dd>
   <dt><a href="#contentCreated">nie:contentCreated</a><dt>
-  <dd>.</dd>
+  <dd>Creation time of the content. If the contents is created by an application, the same application should set the value of this property. Note that this property can be undefined for resources in the filesystem because the creation time is not available in the most common filesystem formats.</dd>
   <dt><a href="#contentAccessed">nie:contentAccessed</a><dt>
-  <dd>.</dd>
+  <dd>For resources coming from the filesystem, this is the usual access time to the file. For other  kind of resources (online or virtual), the application accessing it should update its value.</dd>
   <dt><a href="#lastRefreshed">nie:lastRefreshed</a><dt>
   <dd>.</dd>
 </dl>
@@ -77,14 +78,10 @@ FIXME Explain the mess with dates
  <li>To link both things together, every InformationElement must have the property <a href="#isStoredAs">nie:isStoredAs</a>, that points to the location of the resource, and should be used by any program that wants to access it.</li>
 </ol>
 
- Here comes an example, for the image file /home/user/a.jpeg:</p>
+<p>Here comes an example, for the image file /home/user/a.jpeg:</p>
 
 <pre>
-&lt;file:///home/ivan/test/CC-test-big.png&gt;  a nfo:FileDataObject ;
-         # Properties as FileDataObject (physicalities)
-         nfo:fileSize 12341234 .
-
-&lt;urn:uuid:10293801928301293&gt; a nmm:Photo ;
+&lt;urn:uuid:10293801928301293&gt; a nmm:Photo, nfo:FileDataObject ;
          # Properties as nmm:Photo 
 	 nfo:width 49 ;
 	 nfo:height 36 ;
@@ -92,8 +89,11 @@ FIXME Explain the mess with dates
          nmm:whiteBalance &lt;nmm:white-balance-automatic&gt; ;
          nmm:camera "Tracknon N900" ;
 
-         # Mandatory from InformationElement
-         nie:isStoredAs &lt;file:///home/ivan/test/CC-test-big.png&gt; .
+         # Properties from nfo:FileDataObject
+         nfo:fileSize 12341234 ;
+
+         # Mandatory for any nfo:DataObject
+         nie:url &lt;file:///home/ivan/test/CC-test-big.png&gt; .
 
 </pre>