page.wikiPage.sourceUri instead of page.wikiPage.title.pageIri

hadyelsahar · hadyelsahar · commit cd0cb6d9b932 · 2014-02-23T09:25:17.000+02:00
diff --git a/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataFactsExtractor.scala b/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataFactsExtractor.scala
@@ -58,11 +58,11 @@ class WikidataFactsExtractor(
                 for( fact <- valueFacts.keys)
                 {
                   if(valueFacts(fact)=="")
-                    quads += new Quad(null, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.title.pageIri, context.ontology.datatypes("xsd:string"))
+                    quads += new Quad(null, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.sourceUri, context.ontology.datatypes("xsd:string"))
                   else if (valueFacts(fact) == "CommonMediaFile")
-                    quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.title.pageIri, null)
+                    quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.sourceUri, null)
                   else
-                    quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.title.pageIri, context.ontology.datatypes(valueFacts(fact)))
+                    quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.sourceUri, context.ontology.datatypes(valueFacts(fact)))
                 }
               }
           }
@@ -77,8 +77,7 @@ class WikidataFactsExtractor(
               val UriFacts = node.getUriTriples(property)
               for( fact <- UriFacts)
               {
-                //println(subjectUri+"\t"+property+"\t"+fact)
-                quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.title.pageIri, null)
+                quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.sourceUri, null)
               }
             }
           }
diff --git a/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataLLExtractor.scala b/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataLLExtractor.scala
@@ -23,7 +23,7 @@ class WikidataLLExtractor(
   private val isPrimaryTopicOf = context.ontology.properties("foaf:isPrimaryTopicOf")
   private val primaryTopic = context.ontology.properties("foaf:primaryTopic")
   private val dcLanguage = context.ontology.properties("dc:language")
-  //private val sameasProperty = context.ontology.properties("")
+  private val sameAsProperty = context.ontology.properties("owl:sameAs")
 
 
   // this is where we will store the output
@@ -55,7 +55,7 @@ class WikidataLLExtractor(
                 {
                   for (llink2 <- node.getUriTriples(property) diff List(llink))
                   {
-                    quads += new Quad(context.language, DBpediaDatasets.WikidataLL, llink, property,llink2, page.wikiPage.title.pageIri,null)
+                    quads += new Quad(context.language, DBpediaDatasets.WikidataLL, llink, sameAsProperty,llink2, page.wikiPage.sourceUri,null)
                   }
                 }
               }
diff --git a/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataLabelExtractor.scala b/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataLabelExtractor.scala
@@ -59,7 +59,7 @@ class WikidataLabelExtractor(
                   //write triples for languages that included only in the namespace
                   Language.get(lang) match
                   {
-                    case Some(l) => quads += new Quad(l, DBpediaDatasets.WikidataLabels, subjectUri, labelProperty, labelsMap(lang), page.wikiPage.title.pageIri, context.ontology.datatypes("xsd:string"))
+                    case Some(l) => quads += new Quad(l, DBpediaDatasets.WikidataLabels, subjectUri, labelProperty, labelsMap(lang), page.wikiPage.sourceUri, context.ontology.datatypes("xsd:string"))
                     case _=>
                   }
                 }
diff --git a/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataMappedFactsExtractor.scala b/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataMappedFactsExtractor.scala
@@ -60,7 +60,7 @@ class WikidataMappedFactsExtractor(
             //check for triples that doesn't contain Label or sameas properties only
               node.NodeType match {
                 case JsonNode.CoordinatesFacts => {
-                  quads += new Quad(null, DBpediaDatasets.WikidataMappedFacts, subjectUri, context.ontology.properties(property), fact, page.wikiPage.title.pageIri)
+                  quads += new Quad(null, DBpediaDatasets.WikidataMappedFacts, subjectUri, context.ontology.properties(property), fact, page.wikiPage.sourceUri)
                 }
 
                 case JsonNode.CommonMediaFacts => {
@@ -69,7 +69,7 @@ class WikidataMappedFactsExtractor(
                   getDBpediaSameasProperties(property).foreach{dbProp =>
 
                     val fileURI = "http://commons.wikimedia.org/wiki/File:" + fact.replace(" ","_")
-                    quads += new Quad(context.language, DBpediaDatasets.WikidataMappedFacts, subjectUri, dbProp.uri,fileURI, page.wikiPage.title.pageIri,null)
+                    quads += new Quad(context.language, DBpediaDatasets.WikidataMappedFacts, subjectUri, dbProp.uri,fileURI, page.wikiPage.sourceUri,null)
 
                   }
                 }
@@ -89,7 +89,7 @@ class WikidataMappedFactsExtractor(
 
                     val dateParser = new DateTimeParser(context, dbProp.range.asInstanceOf[Datatype])
                     dateParser.parse(new TextNode(fact,0)) match {
-                      case Some(date) => quads += new Quad(context.language, DBpediaDatasets.WikidataMappedFacts, subjectUri, dbProp,date.toString, page.wikiPage.title.pageIri)
+                      case Some(date) => quads += new Quad(context.language, DBpediaDatasets.WikidataMappedFacts, subjectUri, dbProp,date.toString, page.wikiPage.sourceUri)
                       case None =>
                     }
                   }
@@ -112,7 +112,7 @@ class WikidataMappedFactsExtractor(
               for( fact <- UriFacts)
               {
                     getDBpediaSameasProperties(property).foreach({mappedProp =>
-                      quads += new Quad(Language.apply("en"), DBpediaDatasets.WikidataMappedFacts, subjectUri, mappedProp.toString,fact, page.wikiPage.title.pageIri,null)
+                      quads += new Quad(Language.apply("en"), DBpediaDatasets.WikidataMappedFacts, subjectUri, mappedProp.toString,fact, page.wikiPage.sourceUri,null)
                     })
               }
             }
diff --git a/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataNameSpaceSameAsExtractor.scala b/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataNameSpaceSameAsExtractor.scala
@@ -25,7 +25,6 @@ class WikidataNameSpaceSameAsExtractor(
   private val dcLanguage = context.ontology.properties("dc:language")
   private val sameAsProperty = context.ontology.properties("owl:sameAs")
 
-
   // this is where we will store the output
   override val datasets = Set(DBpediaDatasets.WikidataNameSpaceSameAs )
 
@@ -35,7 +34,8 @@ class WikidataNameSpaceSameAsExtractor(
     val quads = new ArrayBuffer[Quad]()
 
     val objectUri = subjectUri.replace("wikidata.dbpedia.org/resource","wikidata.org/entity")
-    quads += new Quad(context.language, DBpediaDatasets.WikidataNameSpaceSameAs , subjectUri, sameAsProperty , objectUri, page.wikiPage.title.pageIri,null)
+
+    quads += new Quad(context.language, DBpediaDatasets.WikidataNameSpaceSameAs , subjectUri, sameAsProperty , objectUri, page.wikiPage.sourceUri,null)
 
     quads
   }
diff --git a/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataSameAsExtractor.scala b/core/src/main/scala/org/dbpedia/extraction/mappings/WikidataSameAsExtractor.scala
@@ -25,7 +25,7 @@ class WikidataSameAsExtractor(
   private val isPrimaryTopicOf = context.ontology.properties("foaf:isPrimaryTopicOf")
   private val primaryTopic = context.ontology.properties("foaf:primaryTopic")
   private val dcLanguage = context.ontology.properties("dc:language")
-  //private val sameasProperty = context.ontology.properties("")
+  private val sameAsProperty = context.ontology.properties("owl:sameAs")
 
 
   // this is where we will store the output
@@ -54,7 +54,7 @@ class WikidataSameAsExtractor(
                 //links returned from the wikiparser are in the form of URIs so SimpleNode.getUriTriples method is used
                 for( llink <- node.getUriTriples(property))
                 {
-                    quads += new Quad(context.language, DBpediaDatasets.WikidataSameAs, subjectUri, property,llink, page.wikiPage.title.pageIri,null)
+                    quads += new Quad(context.language, DBpediaDatasets.WikidataSameAs, subjectUri, sameAsProperty,llink, page.wikiPage.sourceUri,null)
                 }
               }
               case _=> //ignore others

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,11 @@ class WikidataFactsExtractor(`
`58`	`58`	`for( fact <- valueFacts.keys)`
`59`	`59`	`{`
`60`	`60`	`if(valueFacts(fact)=="")`
`61`		`- quads += new Quad(null, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.title.pageIri, context.ontology.datatypes("xsd:string"))`
	`61`	`+ quads += new Quad(null, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.sourceUri, context.ontology.datatypes("xsd:string"))`
`62`	`62`	`else if (valueFacts(fact) == "CommonMediaFile")`
`63`		`- quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.title.pageIri, null)`
	`63`	`+ quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.sourceUri, null)`
`64`	`64`	`else`
`65`		`- quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.title.pageIri, context.ontology.datatypes(valueFacts(fact)))`
	`65`	`+ quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.sourceUri, context.ontology.datatypes(valueFacts(fact)))`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -77,8 +77,7 @@ class WikidataFactsExtractor(`
`77`	`77`	`val UriFacts = node.getUriTriples(property)`
`78`	`78`	`for( fact <- UriFacts)`
`79`	`79`	`{`
`80`		`- //println(subjectUri+"\t"+property+"\t"+fact)`
`81`		`- quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.title.pageIri, null)`
	`80`	`+ quads += new Quad(context.language, DBpediaDatasets.WikidataFacts, subjectUri, property, fact, page.wikiPage.sourceUri, null)`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class WikidataLLExtractor(`
`23`	`23`	`private val isPrimaryTopicOf = context.ontology.properties("foaf:isPrimaryTopicOf")`
`24`	`24`	`private val primaryTopic = context.ontology.properties("foaf:primaryTopic")`
`25`	`25`	`private val dcLanguage = context.ontology.properties("dc:language")`
`26`		`- //private val sameasProperty = context.ontology.properties("")`
	`26`	`+ private val sameAsProperty = context.ontology.properties("owl:sameAs")`
`27`	`27`
`28`	`28`
`29`	`29`	`// this is where we will store the output`
`@@ -55,7 +55,7 @@ class WikidataLLExtractor(`
`55`	`55`	`{`
`56`	`56`	`for (llink2 <- node.getUriTriples(property) diff List(llink))`
`57`	`57`	`{`
`58`		`- quads += new Quad(context.language, DBpediaDatasets.WikidataLL, llink, property,llink2, page.wikiPage.title.pageIri,null)`
	`58`	`+ quads += new Quad(context.language, DBpediaDatasets.WikidataLL, llink, sameAsProperty,llink2, page.wikiPage.sourceUri,null)`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class WikidataLabelExtractor(`
`59`	`59`	`//write triples for languages that included only in the namespace`
`60`	`60`	`Language.get(lang) match`
`61`	`61`	`{`
`62`		`- case Some(l) => quads += new Quad(l, DBpediaDatasets.WikidataLabels, subjectUri, labelProperty, labelsMap(lang), page.wikiPage.title.pageIri, context.ontology.datatypes("xsd:string"))`
	`62`	`+ case Some(l) => quads += new Quad(l, DBpediaDatasets.WikidataLabels, subjectUri, labelProperty, labelsMap(lang), page.wikiPage.sourceUri, context.ontology.datatypes("xsd:string"))`
`63`	`63`	`case _=>`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class WikidataMappedFactsExtractor(`
`60`	`60`	`//check for triples that doesn't contain Label or sameas properties only`
`61`	`61`	`node.NodeType match {`
`62`	`62`	`case JsonNode.CoordinatesFacts => {`
`63`		`- quads += new Quad(null, DBpediaDatasets.WikidataMappedFacts, subjectUri, context.ontology.properties(property), fact, page.wikiPage.title.pageIri)`
	`63`	`+ quads += new Quad(null, DBpediaDatasets.WikidataMappedFacts, subjectUri, context.ontology.properties(property), fact, page.wikiPage.sourceUri)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`case JsonNode.CommonMediaFacts => {`
`@@ -69,7 +69,7 @@ class WikidataMappedFactsExtractor(`
`69`	`69`	`getDBpediaSameasProperties(property).foreach{dbProp =>`
`70`	`70`
`71`	`71`	`val fileURI = "http://commons.wikimedia.org/wiki/File:" + fact.replace(" ","_")`
`72`		`- quads += new Quad(context.language, DBpediaDatasets.WikidataMappedFacts, subjectUri, dbProp.uri,fileURI, page.wikiPage.title.pageIri,null)`
	`72`	`+ quads += new Quad(context.language, DBpediaDatasets.WikidataMappedFacts, subjectUri, dbProp.uri,fileURI, page.wikiPage.sourceUri,null)`
`73`	`73`
`74`	`74`	`}`
`75`	`75`	`}`
`@@ -89,7 +89,7 @@ class WikidataMappedFactsExtractor(`
`89`	`89`
`90`	`90`	`val dateParser = new DateTimeParser(context, dbProp.range.asInstanceOf[Datatype])`
`91`	`91`	`dateParser.parse(new TextNode(fact,0)) match {`
`92`		`- case Some(date) => quads += new Quad(context.language, DBpediaDatasets.WikidataMappedFacts, subjectUri, dbProp,date.toString, page.wikiPage.title.pageIri)`
	`92`	`+ case Some(date) => quads += new Quad(context.language, DBpediaDatasets.WikidataMappedFacts, subjectUri, dbProp,date.toString, page.wikiPage.sourceUri)`
`93`	`93`	`case None =>`
`94`	`94`	`}`
`95`	`95`	`}`
`@@ -112,7 +112,7 @@ class WikidataMappedFactsExtractor(`
`112`	`112`	`for( fact <- UriFacts)`
`113`	`113`	`{`
`114`	`114`	`getDBpediaSameasProperties(property).foreach({mappedProp =>`
`115`		`- quads += new Quad(Language.apply("en"), DBpediaDatasets.WikidataMappedFacts, subjectUri, mappedProp.toString,fact, page.wikiPage.title.pageIri,null)`
	`115`	`+ quads += new Quad(Language.apply("en"), DBpediaDatasets.WikidataMappedFacts, subjectUri, mappedProp.toString,fact, page.wikiPage.sourceUri,null)`
`116`	`116`	`})`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class WikidataSameAsExtractor(`
`25`	`25`	`private val isPrimaryTopicOf = context.ontology.properties("foaf:isPrimaryTopicOf")`
`26`	`26`	`private val primaryTopic = context.ontology.properties("foaf:primaryTopic")`
`27`	`27`	`private val dcLanguage = context.ontology.properties("dc:language")`
`28`		`- //private val sameasProperty = context.ontology.properties("")`
	`28`	`+ private val sameAsProperty = context.ontology.properties("owl:sameAs")`
`29`	`29`
`30`	`30`
`31`	`31`	`// this is where we will store the output`
`@@ -54,7 +54,7 @@ class WikidataSameAsExtractor(`
`54`	`54`	`//links returned from the wikiparser are in the form of URIs so SimpleNode.getUriTriples method is used`
`55`	`55`	`for( llink <- node.getUriTriples(property))`
`56`	`56`	`{`
`57`		`- quads += new Quad(context.language, DBpediaDatasets.WikidataSameAs, subjectUri, property,llink, page.wikiPage.title.pageIri,null)`
	`57`	`+ quads += new Quad(context.language, DBpediaDatasets.WikidataSameAs, subjectUri, sameAsProperty,llink, page.wikiPage.sourceUri,null)`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`case _=> //ignore others`