[Fusionforge-commits] r11825 - in trunk/src/plugins/oslc/include/oslc-zend/application: controllers models views/scripts/fusionforgecm
Sabri LABBENE
labbenes at libremir.placard.fr.eu.org
Thu Dec 16 16:06:59 CET 2010
Author: labbenes
Date: 2010-12-16 16:06:59 +0100 (Thu, 16 Dec 2010)
New Revision: 11825
Modified:
trunk/src/plugins/oslc/include/oslc-zend/application/controllers/FusionForgeOSLCConnector.php
trunk/src/plugins/oslc/include/oslc-zend/application/models/fusionforge.inc.php
trunk/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/_resource_xml.php
Log:
Change helios_bt:status by oslc_cm:status.
Modified: trunk/src/plugins/oslc/include/oslc-zend/application/controllers/FusionForgeOSLCConnector.php
===================================================================
--- trunk/src/plugins/oslc/include/oslc-zend/application/controllers/FusionForgeOSLCConnector.php 2010-12-16 14:06:55 UTC (rev 11824)
+++ trunk/src/plugins/oslc/include/oslc-zend/application/controllers/FusionForgeOSLCConnector.php 2010-12-16 15:06:59 UTC (rev 11825)
@@ -62,7 +62,7 @@
'dc:title',
'dc:description',
'dc:creator',
- 'helios_bt:status',
+ 'oslc_cm:status',
'helios_bt:priority',
'helios_bt:assigned_to',
'dc:modified',
@@ -154,7 +154,7 @@
if($term[0]=='=') {
$term[2] = str_replace("\"", "", $term[2]);
switch($term[1]) {
- case 'helios_bt:status':
+ case 'oslc_cm:status':
if (array_key_exists($term[2],self::$status_arr)) {
$query['status'] = self::$status_arr[$term[2]];
}else {
@@ -367,7 +367,7 @@
throw new Exception('Error : Could not instanciate project Tracker');
} else {
// Construct array for oslc.where with all possible values for each attribute
- // Currently only helios_bt:status and helios_bt:assigned_to are supported for
+ // Currently only oslc_cm:status and helios_bt:assigned_to are supported for
// oslc.where query.
$engine = RBACEngine::getInstance() ;
$techs = $engine->getUsersByAllowedAction ('tracker', $tracker, 'tech') ;
@@ -546,7 +546,7 @@
}
}
- // helios_bt:status ===> status
+ // oslc_cm:status ===> status
if(in_array('status',$props))
{
if(isset($cm_request['status']))
@@ -555,7 +555,7 @@
}
else
{
- throw new BadRequestException("helios_bt:status mentioned in the request query not found in request body!");
+ throw new BadRequestException("oslc_cm:status mentioned in the request query not found in request body!");
}
}
Modified: trunk/src/plugins/oslc/include/oslc-zend/application/models/fusionforge.inc.php
===================================================================
--- trunk/src/plugins/oslc/include/oslc-zend/application/models/fusionforge.inc.php 2010-12-16 14:06:55 UTC (rev 11824)
+++ trunk/src/plugins/oslc/include/oslc-zend/application/models/fusionforge.inc.php 2010-12-16 15:06:59 UTC (rev 11825)
@@ -127,6 +127,26 @@
$resource[$field] = $value;
}
}
+ foreach ($changerequest->children('http://open-services.net/ns/core#') as $child) {
+ $field = $child->getName();
+ if(!$field){
+ print('No ontology attribute !!!');
+ }
+ if (in_array($field,$fusionforgebt_attr)) {
+ $value = (string)$child;
+ $resource[$field] = $value;
+ }
+ }
+ foreach ($changerequest->children('http://open-services.net/ns/cm#') as $child) {
+ $field = $child->getName();
+ if(!$field){
+ print('No ontology attribute !!!');
+ }
+ if (in_array($field,$fusionforgebt_attr)) {
+ $value = (string)$child;
+ $resource[$field] = $value;
+ }
+ }
}
}
}
@@ -154,6 +174,7 @@
foreach ($resource as $field => $value) {
$field = str_replace('dc:', '', $field);
$field = str_replace('helios_bt:', '', $field);
+ $field = str_replace('oslc_cm:', '', $field);
$changerequest->container[$field] = $value;
}
@@ -178,9 +199,9 @@
}
}
- /* duplicated from code in the SOAP API
+ /*
*
- * TODO Add code that maps fusionforge tracker fields to ontologies (dc, helios_bt, etc)
+ * Maps fusionforge tracker fields to ontologies (dc, oslc_cm, oslc, helios_bt, etc)
*
*/
protected static function convert_artifacts_array($at_arr, $fields_string) {
@@ -248,8 +269,8 @@
case 'dc:creator':
$return[$identifier]['creator'] = $at_arr[$i]->data_array['submitted_realname'];
break;
- case 'helios_bt:status':
- $return[$identifier]['helios_bt:status'] = $at_arr[$i]->data_array['status_name'];
+ case 'oslc_cm:status':
+ $return[$identifier]['oslc_cm:status'] = $at_arr[$i]->data_array['status_name'];
break;
case 'helios_bt:priority':
$return[$identifier]['helios_bt:priority'] = $at_arr[$i]->data_array['priority'];
@@ -273,7 +294,7 @@
'identifier'=>$identifier,
'title'=>$at_arr[$i]->data_array['summary'],
'description'=>$at_arr[$i]->data_array['details'],
- 'helios_bt:status'=>$at_arr[$i]->data_array['status_name'],
+ 'oslc_cm:status'=>$at_arr[$i]->data_array['status_name'],
'helios_bt:priority'=>$at_arr[$i]->data_array['priority'],
'creator' => $at_arr[$i]->data_array['submitted_realname'],
'helios_bt:assigned_to' => $at_arr[$i]->data_array['assigned_realname'],
Modified: trunk/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/_resource_xml.php
===================================================================
--- trunk/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/_resource_xml.php 2010-12-16 14:06:55 UTC (rev 11824)
+++ trunk/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/_resource_xml.php 2010-12-16 15:06:59 UTC (rev 11825)
@@ -36,6 +36,9 @@
case 'dc' :
$prefix = 'http://purl.org/dc/terms/';
break;
+ case 'oslc_cm':
+ $prefix = 'http://open-services.net/ns/cm#';
+ break;
case 'helios_bt' :
$prefix = 'http://heliosplatform.sourceforge.net/ontologies/2010/05/helios_bt.owl';
break;
@@ -56,13 +59,10 @@
function createRessourceCollectionView($view){
$feedcharset = 'UTF-8';
- $feedauthor = 'OSLC-CM-V1 Demo server ( '.TRACKER_TYPE.' version)';
- if(isset($view->tracker)){
- $feedtitle = TRACKER_TYPE.' OSLC-CM Change requests';
- }else{
- $feedtitle = 'All '.TRACKER_TYPE.' OSLC-CM Change requests';
- }
+ $feedauthor = 'FusionForge OSLC-CM plugin';
+ $feedtitle = TRACKER_TYPE.' OSLC-CM ChangeRequests found in Tracker'. $view->tracker;
+
$doc = new DOMDocument('1.0',$feedcharset);
$doc->formatOutput = true;
More information about the Fusionforge-commits
mailing list