[evolvis-commits] r11592: Fixed misc problems in tracker and soap?==?UTF-8?Q?↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 18:19:46 CET 2011


Author: mirabilos
Date: 2011-02-24 18:19:46 +0100 (Thu, 24 Feb 2011)
New Revision: 11592

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFactory.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/soap/tracker/tracker.php
Log:
Fixed misc problems in tracker and soap


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class	2011-02-24 17:19:45 UTC (rev 11591)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class	2011-02-24 17:19:46 UTC (rev 11592)
@@ -1032,7 +1032,7 @@
 //	Force each field to have some value if it is a numeric field
 //	text fields will just be purged and skipped
 //
-			if (!$extra_fields[$efid]) {
+			if (!array_key_exists($efid, $extra_fields) || !$extra_fields[$efid]) {
 				if ($type == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
 					$this->setError('Status Custom Field Must Be Set');
 					return false;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFactory.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFactory.class	2011-02-24 17:19:45 UTC (rev 11591)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFactory.class	2011-02-24 17:19:46 UTC (rev 11592)
@@ -262,6 +262,8 @@
 		if (is_array($this->extra_fields) && !empty($this->extra_fields)) {
 			$keys=array_keys($this->extra_fields);
 			$vals=array_values($this->extra_fields);
+			$ef_where_str='';
+			$ef_table_str='';
 			for ($i=0; $i<count($keys); $i++) {
 				if (empty($vals[$i])) {
 					continue;
@@ -310,6 +312,10 @@
 		} else {
 			$closedatesql= '';
 		}
+		
+		// these are currently not being used
+		$submitted_by_str = '';
+		
 		//
 		//  now run the query using the criteria chosen above
 		//

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/soap/tracker/tracker.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/soap/tracker/tracker.php	2011-02-24 17:19:45 UTC (rev 11591)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/soap/tracker/tracker.php	2011-02-24 17:19:46 UTC (rev 11592)
@@ -731,7 +731,11 @@
 	}
 	
 	$af->setup(0,'','',0,$set,$assigned_to,$status);
-	return artifacts_to_soap($af->getArtifacts());
+	$artifacts = $af->getArtifacts();
+	if ($artifacts === false) {
+		return new soap_fault ('','getArtifacts',$af->getErrorMessage(),$af->getErrorMessage());
+	}
+	return artifacts_to_soap($artifacts);
 
 }
 
@@ -748,6 +752,9 @@
 function artifacts_to_soap($at_arr) {
 	$return = array();
 	for ($i=0; $i<count($at_arr); $i++) {
+		// return only the first 100
+		if ($i == 100) break;
+		
 		if ($at_arr[$i]->isError()) {
 			//skip if error
 		} else {



More information about the evolvis-commits mailing list