[MediaWiki-CVS] SVN: [51647] trunk/extensions/SemanticMediaWiki/includes

[mkroetzsch]

Revision: 51647
Author:   mkroetzsch
Date:     2009-06-09 16:06:23 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------
Better fix for problem with empty URIs for imported vocabulary (unstubbing 
needs to happen when get- methods are called)

Modified Paths:
--------------
    trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Import.php
    trunk/extensions/SemanticMediaWiki/includes/SMW_SemanticData.php

Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Import.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Import.php       
2009-06-09 15:59:21 UTC (rev 51646)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Import.php       
2009-06-09 16:06:23 UTC (rev 51647)
@@ -127,10 +127,12 @@
        }
 
        public function getShortWikiText($linked = NULL) {
+               $this->unstub();
                return $this->m_caption;
        }
 
        public function getShortHTMLText($linker = NULL) {
+               $this->unstub();
                return htmlspecialchars($this->m_value);
        }
 
@@ -151,22 +153,27 @@
        }
 
        public function getDBkeys() {
+               $this->unstub();
                return array($this->m_namespace . ' ' . $this->m_section . ' ' 
. $this->m_uri);
        }
 
        public function getWikiValue(){
+               $this->unstub();
                return $this->m_value;
        }
 
        public function getNS(){
+               $this->unstub();
                return $this->m_uri;
        }
 
        public function getNSID(){
+               $this->unstub();
                return $this->m_namespace;
        }
 
        public function getLocalName(){
+               $this->unstub();
                return $this->m_section;
        }
 }

Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_SemanticData.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_SemanticData.php    
2009-06-09 15:59:21 UTC (rev 51646)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_SemanticData.php    
2009-06-09 16:06:23 UTC (rev 51647)
@@ -86,8 +86,6 @@
                                $dv = 
SMWDataValueFactory::newPropertyObjectValue($property);
                                $dv->setDBkeys($dbkeys);
 
-                               $dv->isValid();
-
                                if ($this->m_noduplicates) {
                                        
$this->propvals[$property->getDBkey()][$dv->getHash()] = $dv;
                                } else {



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs