Rel1_43

composer.json

@@ -1,5 +1,5 @@
 {
-	"name": "professional-wiki/semantic-wikibase",
+	"name": "baillyk/semantic-wikibase",
 	"type": "mediawiki-extension",
 	"description": "MediaWiki extension that makes Wikibase data available in Semantic MediaWiki",
 	"keywords": [
@@ -12,7 +12,7 @@
 		"semantic web",
 		"wikidata"
 	],
-	"homepage": "https://professional.wiki/en/extension/semantic-wikibase",
+	"homepage": "https://github.com/baillyk/SemanticWikibase",
 	"license": "GPL-2.0-or-later",
 	"authors": [
 		{

extension.json

@@ -38,9 +38,11 @@
 	"callback": "MediaWiki\\Extension\\SemanticWikibase\\EntryPoints\\HookHandlers::onExtensionRegistration",
 
 	"Hooks": {
+		"ParserFirstCallInit":"MediaWiki\\Extension\\SemanticWikibase\\EntryPoints\\HookHandlers::onParserFirstCallInit",
 		"SMW::Property::initProperties": "MediaWiki\\Extension\\SemanticWikibase\\EntryPoints\\HookHandlers::onSmwInitProperties",
 		"SMW::SQLStore::AddCustomFixedPropertyTables": "MediaWiki\\Extension\\SemanticWikibase\\EntryPoints\\HookHandlers::onSmwAddCustomFixedPropertyTables",
-		"SMWStore::updateDataBefore": "MediaWiki\\Extension\\SemanticWikibase\\EntryPoints\\HookHandlers::onSmwUpdateDataBefore"
+		"SMW::SQLStore::BeforeDataUpdateComplete": "MediaWiki\\Extension\\SemanticWikibase\\EntryPoints\\HookHandlers::onSmwUpdateDataBefore",
+		"MultiContentSave": "MediaWiki\\Extension\\SemanticWikibase\\EntryPoints\\HookHandlers::onMultiContentSave"
 	},
 
 	"config": {

src/EntryPoints/HookHandlers.php

@@ -4,11 +4,22 @@
 
 namespace MediaWiki\Extension\SemanticWikibase\EntryPoints;
 
+use MediaWiki\Revision\RenderedRevision;
+use MediaWiki\User\UserIdentity;
+use CommentStoreComment;
+use Status;
+use MediaWiki\MediaWikiServices;
+use MediaWiki\TitleFactory;
 use MediaWiki\Extension\SemanticWikibase\SemanticWikibase;
+use SMW\Services\ServicesFactory as ApplicationFactory;
 use SMW\PropertyRegistry;
 use SMW\SemanticData;
+use SMW\DIWikiPage;
+use SMW\StoreFactory;
 use SMW\Store;
 
+use Parser;
+
 class HookHandlers {
 
 	public static function onExtensionRegistration(): void {
@@ -17,18 +28,52 @@ public static function onExtensionRegistration(): void {
 		$smwgNamespacesWithSemanticLinks[WB_NS_PROPERTY] = true;
 	}
 
+	public static function onParserFirstCallInit( Parser $parser ) {
+		# getInstance() will call initProperties() which aktivates existing hook onSmwInitProperties()
+		wfDebug( __METHOD__ . "SWB: onParserFirstCallInit" );
+		PropertyRegistry::getInstance();
+	}
+
 	public static function onSmwInitProperties( PropertyRegistry $propertyRegistry ): void {
-		SemanticWikibase::getGlobalInstance()->registerProperties( $propertyRegistry );
+		wfDebug( __METHOD__ . "SWB: onSmwInitProperties..." );
+		SemanticWikibase::getGlobalInstance()->registerProperties( $propertyRegistry );	
 	}
 
 	public static function onSmwAddCustomFixedPropertyTables( array &$customFixedProperties, array &$fixedPropertyTablePrefix ): void {
+		wfDebug( __METHOD__ . "SWB: onSmwAddCustomFixedPropertyTables" );
 		SemanticWikibase::getGlobalInstance()->getFixedProperties()
 			->registerFixedTables( $customFixedProperties, $fixedPropertyTablePrefix );
 	}
 
 	public static function onSmwUpdateDataBefore( Store $store, SemanticData $semanticData ): void {
+		wfDebug( __METHOD__ . "SWB: onSmwUpdateDataBefore" );
 		SemanticWikibase::getGlobalInstance()->getSemanticDataUpdate()
 			->run( $semanticData );
+
 	}
 
+	public static function onPageSaveComplete( WikiPage $wikiPage, MediaWiki\User\UserIdentity $user, string $summary, int $flags, MediaWiki\Revision\RevisionRecord $revisionRecord, MediaWiki\Storage\EditResult $editResult ) {
+        wfDebug( __METHOD__ . "SWB: onPageSaveComplete" );
+		// Access the semantic data of the page via the Semantic MediaWiki API
+        $semanticData = \SMW\MediaWiki\Hooks\ParserHooks::getSemanticDataForPage($wikiPage);
+
+        onSmwUpdateDataBefore(null, $semanticData);
+    }
+
+	public static function onMultiContentSave( RenderedRevision $renderedRevision, UserIdentity $user, CommentStoreComment $summary, $flags, Status $hookStatus ) {
+		wfDebug( __METHOD__ . "SWB: onMultiContentSave" );
+        $revision = $renderedRevision->getRevision();
+
+		$titleFactory = MediaWikiServices::getInstance()->getTitleFactory();
+        $title = $titleFactory->newFromLinkTarget($revision->getPageAsLinkTarget());
+		wfDebug( __METHOD__ . "SWB: onMultiContentSave...title:".$title );
+		$subject = DIWikiPage::newFromTitle( $title );
+        #$new_content = $revision->getContent(SlotRecord::MAIN, RevisionRecord::RAW)->getNativeData();
+		$semanticData = StoreFactory::getStore()->getSemanticData( DIWikiPage::newFromTitle( $title ) );
+		wfDebug( __METHOD__ . "SWB: onMultiContentSave: ".json_encode($semanticData) );
+        SemanticWikibase::getGlobalInstance()->getSemanticDataUpdate()->run( $semanticData );
+
+        return true;
+    } 
+
 }

src/SMW/SemanticEntity.php

@@ -8,28 +8,34 @@
 use SMW\DIWikiPage;
 use SMW\SemanticData;
 use SMWDataItem;
+use SMW\Subobject;
 
 class SemanticEntity {
 
 	private array $dataItemsPerProperty = [];
+	private array $subObjectsPerProperty=[];
 
-	public function addPropertyValue( string $propertyId, SMWDataItem $dataItem ) {
-		$this->dataItemsPerProperty[$propertyId][] = $dataItem;
+	public function addPropertyValue( string $NumericPropertyId, SMWDataItem $dataItem ) {
+		$this->dataItemsPerProperty[$NumericPropertyId][] = $dataItem;
+	}
+
+	public function addSubobject( string $NumericPropertyId, SubObject $subobject ){
+		$this->subObjectsPerProperty[$NumericPropertyId][] = $subobject;
 	}
 
 	/**
-	 * @param string $propertyId
+	 * @param string $NumericPropertyId
 	 * @return SMWDataItem[]
 	 */
-	public function getDataItemsForProperty( string $propertyId ): array {
-		return $this->dataItemsPerProperty[$propertyId] ?? [];
+	public function getDataItemsForProperty( string $NumericPropertyId ): array {
+		return $this->dataItemsPerProperty[$NumericPropertyId] ?? [];
 	}
 
 	public function toSemanticData( DIWikiPage $subject ): SemanticData {
 		$semanticData = new SemanticData( $subject );
 
-		foreach ( $this->dataItemsPerProperty as $propertyId => $dataItems ) {
-			$property = new DIProperty( $propertyId );
+		foreach ( $this->dataItemsPerProperty as $NumericPropertyId => $dataItems ) {
+			$property = new DIProperty( $NumericPropertyId );
 
 			foreach ( $dataItems as $dataItem ) {
 				$semanticData->addPropertyObjectValue(
@@ -39,6 +45,14 @@ public function toSemanticData( DIWikiPage $subject ): SemanticData {
 			}
 		}
 
+		foreach ( $this->subObjectsPerProperty as $NumericPropertyId => $subobjects ) {
+			$property = new DIProperty( $NumericPropertyId );
+
+			foreach ( $subobjects as $subobject ) {
+				$semanticData->addSubobject($subobject);
+			}
+		}
+
 		return $semanticData;
 	}
 
@@ -52,9 +66,9 @@ public function functionalMerge( self $entity ): self {
 	}
 
 	public function add( self $entity ): void {
-		foreach ( $entity->dataItemsPerProperty as $propertyId => $dataItems ) {
+		foreach ( $entity->dataItemsPerProperty as $NumericPropertyId => $dataItems ) {
 			foreach ( $dataItems as $dataItem ) {
-				$this->addPropertyValue( $propertyId, $dataItem );
+				$this->addPropertyValue( $NumericPropertyId, $dataItem );
 			}
 		}
 	}

src/SemanticDataUpdate.php

@@ -12,7 +12,7 @@
 use SMW\SemanticData;
 use Title;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Entity\NumericPropertyId;
 use Wikibase\DataModel\Services\Lookup\ItemLookup;
 use Wikibase\DataModel\Services\Lookup\PropertyLookup;
 
@@ -63,8 +63,13 @@ private function newItemTranslator( Title $title ): ItemTranslator {
 	}
 
 	private function getSemanticEntityForPropertyTitle( Title $title ): SemanticEntity {
+		wfDebug(__METHOD__. "swb: getSemanticEntity:".json_encode($title));
+		wfDebug(__METHOD__. "swb: getSemanticEntity:".json_encode($title->getText()));
+		wfDebug(__METHOD__. "swb: getSemanticEntity:".json_encode(new NumericPropertyId( $title->getText() )));
+		wfDebug(__METHOD__. "swb: getSemanticEntity:".json_encode($this->propertyLookup->getPropertyForId( new NumericPropertyId( $title->getText() ) )));
+
 		return $this->newPropertyTranslator( $title )->translateProperty(
-			$this->propertyLookup->getPropertyForId( new PropertyId( $title->getText() ) )
+			$this->propertyLookup->getPropertyForId( new NumericPropertyId( $title->getText() ) )
 		);
 	}
 

src/SemanticWikibase.php

@@ -62,15 +62,18 @@ protected function getPropertyTypeLookup(): PropertyDataTypeLookup {
 	}
 
 	public function registerProperties( PropertyRegistry $propertyRegistry ) {
+		wfDebug("SWB: register properties ".json_encode($this->getAllProperties()));
 		foreach ( $this->getAllProperties() as $property ) {
 			$propertyRegistry->registerProperty(
 				$property->getId(),
 				$property->getType(),
 				$property->getLabel(),
-				true,
-				false
+				true, #is_visible
+				true, #is_annotable
+				false #is_declarative
 			);
-
+			wfDebug("SWB: register property ".$property->getId());
+			wfDebug("SWB: register property ".$property->getType());
 			foreach ( $property->getAliases() as $alias ) {
 				$propertyRegistry->registerPropertyAlias( $property->getId(), $alias );
 			}

src/Translation/DataValueTranslator.php

@@ -19,14 +19,33 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdValue;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Entity\NumericPropertyId;
+use Wikibase\EDTF\Services\TimeValueBuilder;
+use Wikibase\EDTF\EdtfValue;
+use MediaWiki\Logger\LoggerFactory;
+use EDTF\EdtfFactory;
+use EDTF\Model\ExtDate;
+use EDTF\Model\ExtDateTime;
+use EDTF\Model\Interval;
 
 class DataValueTranslator {
 
 	public function translate( TypedDataValue $typedValue ): SMWDataItem {
+
+
 		$value = $typedValue->getValue();
-
+		$propertyType = $typedValue->getPropertyType();
+		if( $value != null) {
+			wfDebug( 'swb: translate: '.get_class( $value ).' ptype: '.$propertyType );
+		}
+
 		if ( $value instanceof StringValue ) {
+			wfDebug( 'swb: translate: '. $typedValue->getValue()->getValue()  );
+			if( $propertyType == 'edtf') {
+				return $this->translateEDTF("".$value->getValue());
+			}else if ($propertyType == 'localMedia') {
+                return $this->translateLocalMedia("".$value->getValue());
+            }
 			return $this->translateStringValue( $typedValue );
 		}
 		if ( $value instanceof BooleanValue ) {
@@ -44,10 +63,12 @@ public function translate( TypedDataValue $typedValue ): SMWDataItem {
 		if ( $value instanceof GlobeCoordinateValue ) {
 			return $this->translateGlobeCoordinateValue( $value );
 		}
+
 		if ( $value instanceof TimeValue ) {
 			return $this->translateTimeValue( $value );
 		}
-
+
+
 		throw new \RuntimeException( 'Support for DataValue type "' . get_class( $value ) . '" not implemented' );
 	}
 
@@ -66,6 +87,12 @@ private function translateGlobeCoordinateValue( GlobeCoordinateValue $globeValue
 		);
 	}
 
+	private function translateLocalMedia( String $imagePage): SMWDataItem {
+			return new DIWikiPage(
+					$imagePage,
+					NS_FILE
+			);
+	}
 	private function translateEntityIdValue( EntityIdValue $idValue ): SMWDataItem {
 		return new DIWikiPage(
 			$idValue->getEntityId()->getSerialization(),
@@ -78,7 +105,7 @@ private function entityIdToNamespaceId( EntityId $idValue ): int {
 			return WB_NS_ITEM;
 		}
 
-		if ( $idValue instanceof PropertyId ) {
+		if ( $idValue instanceof NumericPropertyId ) {
 			return WB_NS_PROPERTY;
 		}
 
@@ -89,6 +116,59 @@ public function translateDecimalValue( DecimalValue $value ): SMWDataItem {
 		return new \SMWDINumber( $value->getValueFloat() );
 	}
 
+	private function translateEDTF( String $value ): \SMWDITime {
+		wfDebug( 'swb: translate edtf' );
+		$tvb = new TimeValueBuilder( EdtfFactory::newParser() );
+		$tvArr = $tvb->edtfToTimeValues( $value );
+		$parser = \EDTF\EdtfFactory::newParser();
+		$parsingResult = $parser->parse($value);
+		wfDebug($parsingResult->isValid()); // true
+		$edtfValue = $parsingResult->getEdtfValue(); // \EDTF\EdtfValue
+		$humanizer = \EDTF\EdtfFactory::newHumanizerForLanguage( 'en' );
+		wfDebug($humanizer->humanize($edtfValue)); // string
+		wfDebug(get_class($edtfValue)); // string
+		$result = null;
+
+		if ( $edtfValue instanceof Interval ) {
+			if($edtfValue->hasStartDate()){
+				$edtfValue = $edtfValue->getStartDate();
+			} else if ($edtfValue->hasEndDate()){
+				$edtfValue = $edtfValue->getEndDate();
+			} else {
+				wfDebug('ERROR: unable to translate empty edtf interval to smw date');
+				return null;
+			}
+		}
+
+		if( $edtfValue instanceof ExtDate ) {
+			$result = new \SMWDITime(
+				SMWDITime::CM_GREGORIAN,
+				$edtfValue->getYear(),
+				$edtfValue->getMonth(),
+				$edtfValue->getDay()
+			);
+
+		} else if ( $edtfValue instanceof ExtDateTime ) {
+			$result = new \SMWDITime(
+				SMWDITime::CM_GREGORIAN,
+				$edtfValue->getYear(),
+				$edtfValue->getMonth(),
+				$edtfValue->getDay(),
+				$edtfValue->getHour(),
+				$edtfValue->getMinute(),
+				$edtfValue->getSecond()
+			);
+		} else {
+		$result = new \SMWDITime(
+				SMWDITime::CM_GREGORIAN,
+				1970
+			);
+
+		}
+
+		return $result;
+	}
+
 	private function translateTimeValue( TimeValue $value ): \SMWDITime {
 		$components = ( new TimeValueParser() )->parse( $value->getTime() );
 

src/Translation/ItemTranslator.php

@@ -18,10 +18,10 @@ public function __construct( FingerprintTranslator $fingerprintTranslator, State
 		$this->statementListTranslator = $statementListTranslator;
 	}
 
-	public function translateItem( Item $item ): SemanticEntity {
+	public function translateItem( ?Item $item ): SemanticEntity {
 		$semanticEntity = new SemanticEntity();
 
-		if ( $item->getId() === null ) {
+		if ( $item === null || $item->getId() === null ) {
 			return $semanticEntity;
 		}
 

src/Translation/PropertyTranslator.php

@@ -6,7 +6,7 @@
 
 use MediaWiki\Extension\SemanticWikibase\SMW\SemanticEntity;
 use Wikibase\DataModel\Entity\Property;
-use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Entity\NumericPropertyId;
 
 class PropertyTranslator {
 
@@ -18,10 +18,10 @@ public function __construct( FingerprintTranslator $fingerprintTranslator, State
 		$this->statementListTranslator = $statementListTranslator;
 	}
 
-	public function translateProperty( Property $property ): SemanticEntity {
+	public function translateProperty( ?Property $property ): SemanticEntity {
 		$semanticEntity = new SemanticEntity();
 
-		if ( $property->getId() === null ) {
+		if ( $property === null || $property->getId() === null ) {
 			return $semanticEntity;
 		}
 
@@ -32,7 +32,7 @@ public function translateProperty( Property $property ): SemanticEntity {
 		return $semanticEntity;
 	}
 
-	private function addId( SemanticEntity $semanticEntity, PropertyId $itemId ): void {
+	private function addId( SemanticEntity $semanticEntity, NumericPropertyId $itemId ): void {
 		$semanticEntity->addPropertyValue(
 			FixedProperties::ID,
 			new \SMWDIBlob( $itemId->getSerialization() )