[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 947fe1c55d9e4e81980128d787ad31445484d9e5

Roland Mas lolando at fusionforge.org
Fri Mar 27 11:01:15 CET 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  947fe1c55d9e4e81980128d787ad31445484d9e5 (commit)
      from  642be713d7eba290a24d2414a71b5f7a6466024f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 947fe1c55d9e4e81980128d787ad31445484d9e5
Author: Roland Mas <lolando at debian.org>
Date:   Fri Mar 27 11:01:06 2015 +0100

    Manual revert of 642be71

diff --git a/src/common/include/rdfutils.php b/src/common/include/rdfutils.php
index 757b43a..90f4ad6 100644
--- a/src/common/include/rdfutils.php
+++ b/src/common/include/rdfutils.php
@@ -73,25 +73,6 @@ function rdfutils_setPropToXSDdateTime(&$res, $prop, $date) {
 	$res->setProp($prop, $datecreated);
 }
 
-/**
- * rdfutils_setPropToString() - Add a string property to an ARC2_Resource, with optional language tag
- *
- * example : rdfutils_setPropToString($res, 'dct:description', 'Olivier was here', 'en');
- *
- * @param	ARC2_Resource	$res
- * @param	string	$prop
- * @param	string	$value
- * @param	string	$lang (optional)
- */
-function rdfutils_setPropToString(&$res, $prop, $value, $lang = '') {
-	if (!$lang) {
-		$res->setProp($prop, $value);
-	} else {
-		$res->setProp($prop, array('type' => 'literal', 'value' => $value, 'lang' => $lang) );
-	}
-}
-
-
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"
diff --git a/src/plugins/admssw/README b/src/plugins/admssw/README
index d3563e5..2b8409e 100644
--- a/src/plugins/admssw/README
+++ b/src/plugins/admssw/README
@@ -1,19 +1,11 @@
 ADMS.SW plugin
 
-This plugin will provide content-negociation means to export RDF+XML
-ADMS.SW profiles for projects on /projects URLs, in addition to the
-content already provided by the 'doaprdf' plugin.
+This plugin will provide content-negociation means to export RDF+XML ADMS.SW profiles for projects on /projects URLs, in addition to the content already provided by doaprdf.
 
-ADMS.SW stands for "Asset Description Metadata Schema for
-Software". See https://joinup.ec.europa.eu/asset/adms_foss/description
-for more details.
+ADMS.SW stands for Asset Description Metadata Schema for Software. See https://joinup.ec.europa.eu/asset/adms_foss/description for more details.
 
 For instance, one may try :
  curl -k -H 'Accept: application/rdf+xml' https://myforge.example.com/projects/aproject/
 
-The 'doaprdf' plugin has to be installed.
-
-Since V XXX this plugin also supports the ADMS Application Profile for
-Joinup (see
-https://joinup.ec.europa.eu/asset/adms/asset_release/adms-application-profile-joinup)
+The doaprdf plugin has to be installed.
 
diff --git a/src/plugins/admssw/common/RDFedFRSFile.class.php b/src/plugins/admssw/common/RDFedFRSFile.class.php
index 94a4df1..f5168bf 100644
--- a/src/plugins/admssw/common/RDFedFRSFile.class.php
+++ b/src/plugins/admssw/common/RDFedFRSFile.class.php
@@ -101,17 +101,12 @@ class RDFedFRSFile extends FRSFile {
 		// $res->setRel('rdf:type', 'admssw:SoftwarePackage');
 		rdfutils_setPropToUri($res, 'rdf:type', 'admssw:SoftwarePackage');
 
-		$res->setProp('rdfs:label', $frs_file_name); // for ADMS.SW
-		$res->setProp('dcterms:title', $frs_file_name); // for ADMS. AP JoinUp
-		$description = "'". $frs_file_name ."', part of " .$frs_package->getName(). ' - ' .$frs_release->getName();
-		rdfutils_setPropToString($res, 'dcterms:description', $description, 'en');
-
-		rdfutils_setPropToUri($res, 'schema:downloadUrl', $this->getDownloadUrl()); // for ADMS.SW
-		rdfutils_setPropToUri($res, 'dcat:accessUrl', $this->getDownloadUrl()); // for ADMS. AP JoinUp
-		rdfutils_setPropToUri($res, 'dcat:downloadUrl', $this->getDownloadUrl()); // for ADMS. AP JoinUp
-		$release_date = date('c', $this->getReleaseTime());
-		rdfutils_setPropToXSDdateTime($res, 'dcterms:created', $release_date); // for ADMS.SW
-		rdfutils_setPropToXSDdateTime($res, 'dcterms:issued', $release_date); // for ADMS. AP JoinUp
+		$res->setProp('rdfs:label', $frs_file_name);
+		$description = $frs_file_name. _(', part of ') .$frs_package->getName(). ' ' .$frs_release->getName();
+		$res->setProp('dcterms:description', $description);
+
+		rdfutils_setPropToUri($res, 'schema:downloadUrl', $this->getDownloadUrl());
+		rdfutils_setPropToXSDdateTime($res, 'dcterms:created', date('c', $this->getReleaseTime()));
 		$res->setProp('schema:fileSize', $this->getSize());
 
 		$frs_filetype_id = $this->getTypeID();
@@ -160,9 +155,8 @@ class RDFedFRSFile extends FRSFile {
 				$mime_type = 'application/binary';
 				break;
 		}
-		rdfutils_setPropToUri($res, 'dcterms:format', $mime_type); // for ADMS.SW
-		rdfutils_setPropToUri($res, 'dcat:mediaType', $mime_type); // for ADMS. AP JoinUp
-		
+		rdfutils_setPropToUri($res, 'dcterms:format', 'http://purl.org/NET/mediatypes/'. $mime_type);
+
 		rdfutils_setPropToUri($res, 'admssw:release', $frs_release->getUri());
 
 		rdfutils_setPropToUri($res, 'dcterms:license', $this->getDownloadUrl().'#unspecified_license');
diff --git a/src/plugins/admssw/common/RDFedFRSRelease.class.php b/src/plugins/admssw/common/RDFedFRSRelease.class.php
index 767e9ae..166a90b 100644
--- a/src/plugins/admssw/common/RDFedFRSRelease.class.php
+++ b/src/plugins/admssw/common/RDFedFRSRelease.class.php
@@ -115,18 +115,14 @@ class RDFedFRSRelease extends FRSRelease {
 		// $res->setRel('rdf:type', 'admssw:SoftwareRelease');
 		rdfutils_setPropToUri($res, 'rdf:type', 'admssw:SoftwareRelease');
 
-		$res->setProp('rdfs:label', $package_name.' '.$release_name ); // for ADMS.SW
-		$res->setProp('dcterms:title', $package_name.' '.$release_name ); // for ADMS. AP JoinUp
-		$res->setProp('doap:revision', $release_name ); // for ADMS.SW
-		$res->setProp('owl:versionInfo', $release_name ); // for ADMS. AP JoinUp
-
-		rdfutils_setPropToXSDdateTime($res, 'dcterms:created', date('c', $this->getReleaseDate())); // for ADMS.SW
-		rdfutils_setPropToXSDdateTime($res, 'dcterms:issued', date('c', $this->getReleaseDate())); // for ADMS. AP JoinUp
-		
+		$res->setProp('rdfs:label', $package_name.' '.$release_name );
+		$res->setProp('doap:revision', $release_name );
+
+		rdfutils_setPropToXSDdateTime($res, 'dcterms:created', date('c', $this->getReleaseDate()));
+
 		$res->setProp('dcterms:description', $this->getNotes());
 
-		$res->setProp('schema:releaseNotes', $this->getChanges()); // for ADMS.SW
-		$res->setProp('adms:versionNotes', $this->getChanges()); // for ADMS. AP JoinUp
+		$res->setProp('schema:releaseNotes', $this->getChanges());
 
 		$projecturi = util_make_url ('/projects/'. $projectname .'/#project');
 
@@ -143,8 +139,7 @@ class RDFedFRSRelease extends FRSRelease {
 		foreach($frs_files as $frs_file) {
 			$file_uris[] = $frs_file->getUri();
 		}
-		rdfutils_setPropToUri($res, 'admssw:package', $file_uris); // for ADMS.SW
-		rdfutils_setPropToUri($res, 'dcat:distribution', $file_uris); // for ADMS. AP JoinUp
+		rdfutils_setPropToUri($res, 'admssw:package', $file_uris);
 
 		$count = $graph->addTriples( ARC2::getTriplesFromIndex($res->index) );
 
diff --git a/src/plugins/admssw/include/admsswPlugin.class.php b/src/plugins/admssw/include/admsswPlugin.class.php
index e13c33d..cf7d362 100644
--- a/src/plugins/admssw/include/admsswPlugin.class.php
+++ b/src/plugins/admssw/include/admsswPlugin.class.php
@@ -61,9 +61,7 @@ class admsswPlugin extends Plugin {
 				'foaf' => 'http://xmlns.com/foaf/0.1/',
 				'schema' => 'http://schema.org/',
 				'rad' => 'http://www.w3.org/ns/rad#',
-				'ldp' => 'http://www.w3.org/ns/ldp#',
-				'dcat' => 'http://www.w3.org/ns/dcat#',
-				'owl' => 'http://www.w3.org/2002/07/owl#'
+				'ldp' => 'http://www.w3.org/ns/ldp#'
 		);
 
 		//$this->trovecat_id_index = array();
@@ -335,9 +333,7 @@ class admsswPlugin extends Plugin {
 					$trovecaturis['admssw:programmingLanguage'][] = $trovecaturi;
 					break;
 				default:
-					// all the rest : topic, ...
 					$trovecaturis['rad:theme'][] = $trovecaturi;
-					$trovecaturis['dcat:theme'][] = $trovecaturi;
 					break;
 			}
 		}
@@ -457,23 +453,15 @@ class admsswPlugin extends Plugin {
 		$res->setURI( admsswPlugin::repositoryUri() );
 
 		// $res->setRel('rdf:type', 'admssw:SoftwareRepository');
-		
-		rdfutils_setPropToUri($res, 'rdf:type', array('admssw:SoftwareRepository', 'adms:AssetRepository'));
-		
+		rdfutils_setPropToUri($res, 'rdf:type', 'admssw:SoftwareRepository');
+
 		//$res->setProp('doap:name', $projectname);
 		rdfutils_setPropToUri($res, 'adms:accessURL', util_make_url ("/softwaremap/") );
 		$forge_name = forge_get_config ('forge_name');
 		$ff = new FusionForge();
-		//$res->setProp('dcterms:description', "...", 'en');
-		rdfutils_setPropToString($res, 'dcterms:description', 'Public projects in the '. $ff->software_name .' Software Map on '. $forge_name, 'en');
-		$res->setProp('rdfs:label', $forge_name .' public projects'); // for ADMS.SW
-		rdfutils_setPropToString($res, 'dct:title', $forge_name .' public projects', 'en'); // for ADMS. AP JoinUp
-		$res->setProp('adms:supportedSchema', array('ADMS.SW v1.0', 'ADMS Application Profile for Joinup'));
-
-		// TODO :
-		// - dcat:contactPoint
-		// - dct:modified
-		// - dct:publisher : faof:Agent
+		$res->setProp('dcterms:description', 'Public projects in the '. $ff->software_name .' Software Map on '. $forge_name );
+		$res->setProp('rdfs:label', $forge_name .' public projects');
+		$res->setProp('adms:supportedSchema', 'ADMS.SW v1.0');
 
 		// same as for trove's full list
 		$projects = get_public_active_projects_asc();
@@ -493,8 +481,7 @@ class admsswPlugin extends Plugin {
 			$proj_uris[] = $proj_uri;
 		}
 		if(count($proj_uris)) {
-			rdfutils_setPropToUri($res, 'dcterms:hasPart', $proj_uris); // for ADMS.SW
-			rdfutils_setPropToUri($res, 'dcat:dataset', $proj_uris); // for ADMS. AP JoinUp
+			rdfutils_setPropToUri($res, 'dcterms:hasPart', $proj_uris);
 		}
 
 		$graph = new Graphite();

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/rdfutils.php                    |   19 --------------
 src/plugins/admssw/README                          |   14 +++-------
 src/plugins/admssw/common/RDFedFRSFile.class.php   |   22 ++++++----------
 .../admssw/common/RDFedFRSRelease.class.php        |   19 +++++---------
 src/plugins/admssw/include/admsswPlugin.class.php  |   27 +++++---------------
 5 files changed, 25 insertions(+), 76 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list