[evolvis-commits] r17608: merge bm:taramir51/upstream; pending merges:↵ cbayle 2011-10-12 make so buildbot3 builds debian packages in /var/lib/jenkins/builder↵ cbayle 2011-10-12 Clean package from previous build↵ Roland Mas 2011-10-12 Fixed getting of cmd_for_post_commit_hook values↵ Roland Mas 2011-10-11 Revert sysdebug_dbquery in buildbots, since this option has more effects t...↵ Roland Mas 2011-10-10 Added missing column in GROUP BY clause↵ Roland Mas 2011-10-10 Avoid strange dashes in testsuite↵ Roland Mas 2011-10-10 Added missing column in GROUP BY clause↵ Roland Mas 2011-10-10 Avoid non-break spaces in testsuite↵ Roland Mas 2011-10-10 SQL syntax fix↵ Roland Mas 2011-10-10 Handle setting default FTI config for PostgreSQL < 8.3↵ Roland Mas 2011-10-10 Added testsuite for advanced search↵ Roland Mas 2011-10-10 Search fixes↵ Roland Mas 2011-10-10 Log SQL queries when appropriate option is configured; and enable that opt...↵ Roland Mas 2011-10-10 Added missing column in GROUP BY clauses↵ Roland Mas 2011-10-09 Use official Debian mirror↵ Roland Mas 2011-10-09 Only set the FTI search config when actually using FTI↵ Roland Mas 2011-10-09 Use syntax compatible with PostgreSQL < 8.2 for CREATE AGGREGATE↵ Roland Mas 2011-10-09 PostgreSQL < 8.2 does not have DROP AGGREGATE IF EXISTS↵ Roland Mas 2011-10-09 PostgreSQL < 8.2 does not have DROP AGGREGATE IF EXISTS↵ Roland Mas 2011-10-09 PostgreSQL < 9.0 does not have a built-in string_agg() function↵ Roland Mas 2011-10-09 Temporarily disable FTI search on Red Hat targets; testsuite failures may ...↵ Roland Mas 2011-10-08 Actually run the search tests↵ Roland Mas 2011-10-08 Rewrite ff_tsvector_add in plpgsql (rather than plain SQL) to avoid parsin...

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Oct 21 12:13:27 CEST 2011


Author: mirabilos
Date: 2011-10-21 12:13:27 +0200 (Fri, 21 Oct 2011)
New Revision: 17608

Added:
   trunk/gforge_base/evolvisforge-5.1/config/local.vladimir
   trunk/gforge_base/evolvisforge-5.1/src/db/20111009-string-aggregate-function.sql
Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/database-pgsql.php
   trunk/gforge_base/evolvisforge-5.1/src/common/reporting/ReportSetup.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/search/ArtifactSearchQuery.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/search/ForumSearchQuery.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/search/SearchQuery.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/search/TasksSearchQuery.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/search/TrackersSearchQuery.class.php
   trunk/gforge_base/evolvisforge-5.1/src/db/20111007-fti-aggregate-functions.sql
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/tests/DEBDebian60Tests.php
   trunk/gforge_base/evolvisforge-5.1/tests/RPMCentos52Tests.php
   trunk/gforge_base/evolvisforge-5.1/tests/TarCentos52Tests.php
   trunk/gforge_base/evolvisforge-5.1/tests/config/default
   trunk/gforge_base/evolvisforge-5.1/tests/func/Search/searchTest.php
   trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-deb.sh
   trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-rpm.sh
   trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-source.sh
   trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-src-cos.sh
Log:
merge bm:taramir51/upstream; pending merges:
  cbayle 2011-10-12 make so buildbot3 builds debian packages in /var/lib/jenkins/builder
    cbayle 2011-10-12 Clean package from previous build
    Roland Mas 2011-10-12 Fixed getting of cmd_for_post_commit_hook values
    Roland Mas 2011-10-11 Revert sysdebug_dbquery in buildbots, since this option has more effects t...
    Roland Mas 2011-10-10 Added missing column in GROUP BY clause
    Roland Mas 2011-10-10 Avoid strange dashes in testsuite
    Roland Mas 2011-10-10 Added missing column in GROUP BY clause
    Roland Mas 2011-10-10 Avoid non-break spaces in testsuite
    Roland Mas 2011-10-10 SQL syntax fix
    Roland Mas 2011-10-10 Handle setting default FTI config for PostgreSQL < 8.3
    Roland Mas 2011-10-10 Added testsuite for advanced search
    Roland Mas 2011-10-10 Search fixes
    Roland Mas 2011-10-10 Log SQL queries when appropriate option is configured; and enable that opt...
    Roland Mas 2011-10-10 Added missing column in GROUP BY clauses
    Roland Mas 2011-10-09 Use official Debian mirror
    Roland Mas 2011-10-09 Only set the FTI search config when actually using FTI
    Roland Mas 2011-10-09 Use syntax compatible with PostgreSQL < 8.2 for CREATE AGGREGATE
    Roland Mas 2011-10-09 PostgreSQL < 8.2 does not have DROP AGGREGATE IF EXISTS
    Roland Mas 2011-10-09 PostgreSQL < 8.2 does not have DROP AGGREGATE IF EXISTS
    Roland Mas 2011-10-09 PostgreSQL < 9.0 does not have a built-in string_agg() function
    Roland Mas 2011-10-09 Temporarily disable FTI search on Red Hat targets; testsuite failures may ...
    Roland Mas 2011-10-08 Actually run the search tests
    Roland Mas 2011-10-08 Rewrite ff_tsvector_add in plpgsql (rather than plain SQL) to avoid parsin...


Added: trunk/gforge_base/evolvisforge-5.1/config/local.vladimir
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/config/local.vladimir	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/config/local.vladimir	2011-10-21 10:13:27 UTC (rev 17608)
@@ -0,0 +1 @@
+BUILDERDIR=/var/lib/jenkins/builder

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/database-pgsql.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/database-pgsql.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/database-pgsql.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -99,10 +99,15 @@
 	define('SYS_DB_TROVE', $gfconn2);
 	define('SYS_DB_SEARCH', $gfconn2);
 
-	db_query_params ('SELECT set_config($1, $2, false)', 
-			 array('default_text_search_config',
-			       'simple'));
-	
+	$res = db_query_params ('SELECT set_config($1, $2, false)', 
+				array('default_text_search_config',
+				      'simple'));
+	if (!$res) {
+		// Cope with PostgreSQL < 8.3
+		db_query_params ('SELECT set_curcfg($1)', 
+				array('simple'));
+	}
+
 	// Register top-level "finally" handler to abort current
 	// transaction in case of error
 	register_shutdown_function("system_cleanup");
@@ -252,6 +257,7 @@
 	if ($sysdebug_dbquery) {
 		ffDebug('trace', "tracing call of db_query_params():\n",
 		    debug_string_backtrace());
+		error_log('SQL: '.db_query_to_string($qstring,$params).'; ');
 	}
 
 	$res = @pg_query_params($dbserver,$qstring,$params);
@@ -593,15 +599,17 @@
 	return db_construct_qpa ($old_qpa, $new_qpa[0], $new_qpa[1]) ;
 }
 
-function db_qpa_to_string ($qpa) {
-	$sql = $qpa[0];
-	$params = $qpa[1];
+function db_query_to_string ($sql, $params = array()) {
 	foreach ($params as $index => $value) {
 		$sql = preg_replace('/\\$'.($index+1).'(?!\d)/', "'".$value."'", $sql);
 	}
 	return $sql;
 }	
 
+function db_qpa_to_string ($qpa) {
+	return db_query_to_string($qpa[0], $qpa[1]);
+}	
+
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/reporting/ReportSetup.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/reporting/ReportSetup.class.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/reporting/ReportSetup.class.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -292,6 +292,7 @@
 
 	$sql[]="DROP VIEW rep_site_act_oa_vw";
 	$sql[]="CREATE VIEW rep_site_act_oa_vw AS
+	SELECT
 	sum(tracker_opened) AS tracker_opened,
 	sum(tracker_closed) AS tracker_closed,
 	sum(forum) AS forum,

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/search/ArtifactSearchQuery.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/search/ArtifactSearchQuery.class.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/search/ArtifactSearchQuery.class.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -67,8 +67,8 @@
 		$words = $this->getFTIwords();
 
 		$qpa = db_construct_qpa ($qpa,
-					 'SELECT x.* FROM (SELECT artifact.artifact_id, artifact.group_artifact_id, artifact.summary, artifact.open_date, users.realname, artifact.summary||$1||artifact.details||$1||coalesce(string_agg(artifact_message.body, $1), $2) as full_string_agg',
-						 array ($this->field_separator, ' '));
+					 'SELECT x.* FROM (SELECT artifact.artifact_id, artifact.group_artifact_id, artifact.summary, artifact.open_date, users.realname, artifact.summary||$1||artifact.details||$1||coalesce(ff_string_agg(artifact_message.body), $1) as full_string_agg',
+						 array (''));
 		if (forge_get_config('use_fti')) {
 			$qpa = db_construct_qpa ($qpa,
 						 ', (artifact_idx.vectors || coalesce(ff_tsvector_agg(artifact_message_idx.vectors), $1::tsvector)) AS full_vector_agg',
@@ -91,7 +91,7 @@
 						 array ()) ;
 		}
 		$qpa = db_construct_qpa ($qpa,
-					 'GROUP BY artifact.artifact_id, artifact.group_artifact_id, artifact.summary, artifact.open_date, users.realname') ;
+					 'GROUP BY artifact.artifact_id, artifact.group_artifact_id, artifact.summary, artifact.open_date, users.realname, artifact.details') ;
 
 		if (forge_get_config('use_fti')) {
 			$qpa = db_construct_qpa ($qpa, 
@@ -138,9 +138,8 @@
 						 'SELECT a.group_artifact_id, a.artifact_id, ts_headline(summary, $1) AS summary, ',
 						 array ($words)) ;
 			$qpa = db_construct_qpa ($qpa,
-						 'a.open_date, users.realname, rank FROM (SELECT a.artifact_id, SUM (ts_rank(ai.vectors, q) + ts_rank(ami.vectors, q)) AS rank, artifact.summary||$1||artifact.details||$1||coalesce(string_agg(artifact_message.body, $1), $2) as full_string_agg FROM artifact a LEFT OUTER JOIN artifact_message am USING (artifact_id)',
-						 array($this->field_separator,
-						       '')) ;
+						 'a.open_date, users.realname, rank FROM (SELECT a.artifact_id, SUM (ts_rank(ai.vectors, q) + ts_rank(ami.vectors, q)) AS rank, artifact.summary||$1||artifact.details||$1||coalesce(ff_string_agg(artifact_message.body), $1) as full_string_agg FROM artifact a LEFT OUTER JOIN artifact_message am USING (artifact_id)',
+						 array('')) ;
 
 			$qpa = db_construct_qpa ($qpa,
 						 ', artifact_idx ai, artifact_message_idx ami, to_tsquery($1) q',

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/search/ForumSearchQuery.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/search/ForumSearchQuery.class.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/search/ForumSearchQuery.class.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -68,7 +68,7 @@
 		if (forge_get_config('use_fti')) {
 			$words = $this->getFTIwords();
 			$qpa = db_construct_qpa ($qpa,
-						 'SELECT x.* FROM (SELECT forum.msg_id, ts_headline(forum.subject, $1::tsquery) AS subject, forum.post_date, users.realname, forum.subject||$2||forum.body as full_string_agg, forum_idx.vectors FROM forum, users, to_tsquery($1) AS q, forum_idx WHERE forum.group_forum_id = $3 AND forum.posted_by = users.user_id AND forum_idx.msg_id = forum.msg_id GROUP BY forum.msg_id, subject, post_date, realname, forum_idx.vectors) AS x WHERE vectors @@ $1::tsquery ',
+						 'SELECT x.* FROM (SELECT forum.msg_id, ts_headline(forum.subject, $1::tsquery) AS subject, forum.post_date, users.realname, forum.subject||$2||forum.body as full_string_agg, forum_idx.vectors FROM forum, users, to_tsquery($1) AS q, forum_idx WHERE forum.group_forum_id = $3 AND forum.posted_by = users.user_id AND forum_idx.msg_id = forum.msg_id GROUP BY forum.msg_id, subject, body, post_date, realname, forum_idx.vectors) AS x WHERE vectors @@ $1::tsquery ',
 						 array ($words,
 							$this->field_separator,
 							$this->forumId)) ;
@@ -86,7 +86,7 @@
 						 array($words)) ;
 		} else {
 			$qpa = db_construct_qpa ($qpa,
-						 'SELECT x.* FROM (SELECT forum.msg_id, forum.subject, forum.post_date, users.realname, forum.subject||$1||forum.body as full_string_agg FROM forum,users WHERE users.user_id=forum.posted_by AND forum.group_forum_id=$2 GROUP BY msg_id, subject, post_date, realname) AS x WHERE ',
+						 'SELECT x.* FROM (SELECT forum.msg_id, forum.subject, forum.post_date, users.realname, forum.subject||$1||forum.body as full_string_agg FROM forum,users WHERE users.user_id=forum.posted_by AND forum.group_forum_id=$2 GROUP BY msg_id, subject, post_date, realname, body) AS x WHERE ',
 						 array ($this->field_separator,
 							$this->forumId)) ;
 			$qpa = $this->addIlikeCondition ($qpa, 'full_string_agg') ;

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/search/SearchQuery.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/search/SearchQuery.class.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/search/SearchQuery.class.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -332,7 +332,7 @@
 	 */
 	function setSections($sections) {
 		if(is_array($sections)) {
-			$this->sections = array_keys ($sections) ;
+			$this->sections = array_values ($sections) ;
 		} else {
 			$this->sections = $sections;
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/search/TasksSearchQuery.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/search/TasksSearchQuery.class.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/search/TasksSearchQuery.class.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -68,8 +68,8 @@
 		$qpa = db_construct_qpa () ;
 
 		$qpa = db_construct_qpa ($qpa,
-					 'SELECT x.* FROM (SELECT project_task.project_task_id, project_task.summary, project_task.percent_complete, project_task.start_date, project_task.end_date, users.realname, project_group_list.project_name, project_task.summary||$1||project_task.details||$1||coalesce(string_agg(project_messages.body, $1), $2) as full_string_agg',
-					 array ($this->field_separator, ' '));
+					 'SELECT x.* FROM (SELECT project_task.project_task_id, project_task.summary, project_task.percent_complete, project_task.start_date, project_task.end_date, users.realname, project_group_list.project_name, project_task.summary||$1||project_task.details||$1||coalesce(ff_string_agg(project_messages.body), $1) as full_string_agg',
+					 array (''));
 		if (forge_get_config('use_fti')) {
 			$words = $this->getFTIwords();
 			$qpa = db_construct_qpa ($qpa,
@@ -103,7 +103,7 @@
 						 array ()) ;
 		}
 		$qpa = db_construct_qpa ($qpa,
-					 'GROUP BY project_task.project_task_id, project_task.summary, project_task.percent_complete, project_task.start_date, project_task.end_date, users.realname, project_group_list.project_name') ;
+					 'GROUP BY project_task.project_task_id, project_task.summary, project_task.percent_complete, project_task.start_date, project_task.end_date, users.realname, project_group_list.project_name, project_task.details') ;
 		if (forge_get_config('use_fti')) {
 			$qpa = db_construct_qpa ($qpa, 
 						 ', project_task_idx.vectors',

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/search/TrackersSearchQuery.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/search/TrackersSearchQuery.class.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/search/TrackersSearchQuery.class.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -68,8 +68,8 @@
 		$qpa = db_construct_qpa () ;
 
 		$qpa = db_construct_qpa ($qpa,
-					 'SELECT x.* FROM (SELECT artifact.artifact_id, artifact.group_artifact_id, artifact.summary, artifact.open_date, users.realname, artifact_group_list.name, artifact.summary||$1||artifact.details||$1||coalesce(string_agg(artifact_message.body, $1), $2) as full_string_agg',
-						 array ($this->field_separator, ' '));
+					 'SELECT x.* FROM (SELECT artifact.artifact_id, artifact.group_artifact_id, artifact.summary, artifact.open_date, users.realname, artifact_group_list.name, artifact.summary||$1||artifact.details||$1||coalesce(ff_string_agg(artifact_message.body), $1) as full_string_agg',
+						 array (''));
 		if (forge_get_config('use_fti')) {
 			$words = $this->getFTIwords();
 			$qpa = db_construct_qpa ($qpa,
@@ -102,7 +102,7 @@
 						 array ()) ;
 		}
 		$qpa = db_construct_qpa ($qpa,
-					 'GROUP BY artifact.artifact_id, artifact.group_artifact_id, artifact.summary, artifact.open_date, users.realname, artifact_group_list.name') ;
+					 'GROUP BY artifact.artifact_id, artifact.group_artifact_id, artifact.summary, artifact.open_date, users.realname, artifact_group_list.name, artifact.details') ;
 
 		if (forge_get_config('use_fti')) {
 			$qpa = db_construct_qpa ($qpa, 
@@ -130,7 +130,7 @@
 		} else {
 			$qpa = $this->addIlikeCondition ($qpa, 'x.full_string_agg') ;
 			$qpa = db_construct_qpa ($qpa,
-						 'ORDER BY x.name, x.artifact_id') ;
+						 ' ORDER BY x.name, x.artifact_id') ;
 		}
 		return $qpa ;
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/src/db/20111007-fti-aggregate-functions.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/db/20111007-fti-aggregate-functions.sql	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/db/20111007-fti-aggregate-functions.sql	2011-10-21 10:13:27 UTC (rev 17608)
@@ -1,13 +1,15 @@
-CREATE OR REPLACE FUNCTION ff_tsvector_add (tsvector, tsvector)
+CREATE OR REPLACE FUNCTION ff_tsvector_add (v1 tsvector, v2 tsvector)
 RETURNS tsvector
-AS '
-   SELECT $1 || $2
-' LANGUAGE SQL
+AS $$
+BEGIN
+  RETURN v1 || v2 ;
+END;
+$$ LANGUAGE plpgsql
 IMMUTABLE
 RETURNS NULL ON NULL INPUT;
 
-DROP AGGREGATE IF EXISTS ff_tsvector_agg (tsvector);
-CREATE AGGREGATE ff_tsvector_agg (tsvector) (
+CREATE AGGREGATE ff_tsvector_agg (
+       basetype = tsvector,
        sfunc = ff_tsvector_add,
        stype = tsvector
 );

Added: trunk/gforge_base/evolvisforge-5.1/src/db/20111009-string-aggregate-function.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/db/20111009-string-aggregate-function.sql	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/db/20111009-string-aggregate-function.sql	2011-10-21 10:13:27 UTC (rev 17608)
@@ -0,0 +1,15 @@
+CREATE OR REPLACE FUNCTION ff_string_add (t1 text, t2 text)
+RETURNS text
+AS $$
+BEGIN
+  RETURN t1 || ' ioM0Thu6_fieldseparator_kaeph9Ee ' || t2 ;
+END;
+$$ LANGUAGE plpgsql
+IMMUTABLE
+RETURNS NULL ON NULL INPUT;
+
+CREATE AGGREGATE ff_string_agg (
+       basetype = text,
+       sfunc = ff_string_add,
+       stype = text
+);

Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl	2011-10-21 10:13:27 UTC (rev 17608)
@@ -2264,6 +2264,7 @@
     &update_with_sql("FTI-20061025","5.1-8");
     &update_with_sql("20111007-fti-aggregate-functions","5.1-9");
     &update_with_sql("20111007-add-fti-for-task-messages","5.1-10");
+    &update_with_sql("20111009-string-aggregate-function","5.1-11");
 
     $version = &get_db_version;
     $target = "5.1-10+evolvis-1";

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -563,7 +563,7 @@
 		$params['group_id'] = $group->getID();
 		$params['repos'] = $repos;
 		$params['hooks'] = &$hooks;
-		plugin_hook('cmd_for_post_commit_hook', $params);
+		plugin_hook_by_reference('cmd_for_post_commit_hook', $params);
 
 		foreach ($params['hooks'] as $plugin => $cmd ) {
 			if (getenv('sys_localinc')) {

Modified: trunk/gforge_base/evolvisforge-5.1/tests/DEBDebian60Tests.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/DEBDebian60Tests.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/tests/DEBDebian60Tests.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -29,6 +29,7 @@
 		$suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
 		$suite->addTestFiles(glob("func/RBAC/*Test.php"));
 		$suite->addTestFiles(glob("func/Surveys/*Test.php"));
+		$suite->addTestFiles(glob("func/Search/*Test.php"));
 
 		return $suite;
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/tests/RPMCentos52Tests.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/RPMCentos52Tests.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/tests/RPMCentos52Tests.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -30,6 +30,7 @@
 //		$suite->addTestFiles(glob("func/PluginsSvnTracker/*Test.php"));
 		$suite->addTestFiles(glob("func/RBAC/*Test.php"));
 		$suite->addTestFiles(glob("func/Surveys/*Test.php"));
+		$suite->addTestFiles(glob("func/Search/*Test.php"));
 
 		return $suite;
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/tests/TarCentos52Tests.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/TarCentos52Tests.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/tests/TarCentos52Tests.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -30,6 +30,7 @@
 //		$suite->addTestFiles(glob("func/PluginsSvnTracker/*Test.php"));
 		$suite->addTestFiles(glob("func/RBAC/*Test.php"));
 		$suite->addTestFiles(glob("func/Surveys/*Test.php"));
+		$suite->addTestFiles(glob("func/Search/*Test.php"));
 
 		return $suite;
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/tests/config/default
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/config/default	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/tests/config/default	2011-10-21 10:13:27 UTC (rev 17608)
@@ -37,7 +37,7 @@
 REMOTESELENIUM=false
 KEEPVM=false
 DNSDOMAIN=local
-DEBMIRROR=http://cdn.debian.net/debian/
+DEBMIRROR=http://ftp.debian.org/debian/
 DEBMIRRORSEC=http://security.debian.org/
 
 FORGE_ADMIN_USERNAME=admin

Modified: trunk/gforge_base/evolvisforge-5.1/tests/func/Search/searchTest.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/func/Search/searchTest.php	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/tests/func/Search/searchTest.php	2011-10-21 10:13:27 UTC (rev 17608)
@@ -158,7 +158,7 @@
 		$this->type("details", "brebis outremanchienne");
 		$this->clickAndWait("//form[@id='trackeraddform']//input[@type='submit']");
 		$this->clickAndWait("link=Bug1 boustrophédon");
-		$this->type("details", 'Ceci était une référence au « Génie des Alpages », rien à voir avec Charlie');
+		$this->type("details", 'Ceci était une référence au « Génie des Alpages », rien à voir avec Charlie');
 		$this->clickAndWait("submit");
 		$this->clickAndWait("link=Bug1 boustrophédon");
 		$this->type("details", 'This is the needle');
@@ -240,7 +240,7 @@
 		$this->clickAndWait("link=To Do");
 		$this->clickAndWait("link=Add Task");
 		$this->type("summary", "Task1 the brain");
-		$this->type("details", "The same thing we do every night, Pinky—try to take over the world!");
+		$this->type("details", "The same thing we do every night, Pinky - try to take over the world!");
 		$this->type("hours", "199");
 		$this->clickAndWait("submit");
 		
@@ -438,6 +438,29 @@
 		$this->assertTrue($this->isTextPresent("Doc2"));
 		$this->assertFalse($this->isTextPresent("News1"));
 		$this->assertTrue($this->isTextPresent("News2"));
+
+		// Advanced search
+		$this->gotoProject('projecta');
+		$this->clickAndWait('Link=Advanced search');
+		$this->click("//a[contains(@href,'short_forum') and .='all']");
+		$this->click("//a[contains(@href,'short_tracker') and .='all']");
+		$this->click("//a[contains(@href,'short_pm') and .='all']");
+		$this->click("//a[contains(@href,'short_docman') and .='all']");
+		$this->click("//a[contains(@href,'short_news') and .='all']");
+		$this->type("//div[@id='maindiv']//input[@name='words']", "needle");
+		$this->clickAndWait("//input[@name='submitbutton']");
+		$this->assertTrue($this->isTextPresent("Bug1"));
+		$this->assertFalse($this->isTextPresent("Bug2"));
+		$this->assertTrue($this->isTextPresent("Task1"));
+		$this->assertFalse($this->isTextPresent("Task2"));
+		$this->assertFalse($this->isTextPresent("Message1"));
+		$this->assertFalse($this->isTextPresent("Message2"));
+		$this->assertTrue($this->isTextPresent("Message3"));
+		$this->assertFalse($this->isTextPresent("Message4"));
+		$this->assertFalse($this->isTextPresent("Doc1"));
+		$this->assertTrue($this->isTextPresent("Doc2"));
+		$this->assertFalse($this->isTextPresent("News1"));
+		$this->assertTrue($this->isTextPresent("News2"));
 	}
 
 }

Modified: trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-deb.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-deb.sh	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-deb.sh	2011-10-21 10:13:27 UTC (rev 17608)
@@ -112,7 +112,7 @@
 echo "Set forge admin password"
 ssh root@$HOST "/usr/share/gforge/bin/forge_set_password admin $FORGE_ADMIN_PASSWORD"
 #ssh root@$HOST "LANG=C a2dissite default ; LANG=C invoke-rc.d apache2 reload ; LANG=C touch /tmp/fusionforge-use-pfo-rbac"
-ssh root@$HOST "(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-builbot.ini"
+ssh root@$HOST "(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-buildbot.ini"
 #ssh root@$HOST "su - postgres -c \"pg_dump -Fc $DB_NAME\" > /root/dump"
 ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
 ssh root@$HOST "a2dissite default"

Modified: trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-10-21 10:13:27 UTC (rev 17608)
@@ -109,7 +109,7 @@
 [ ! -e "/tmp/timedhosts.txt" ] || scp -p /tmp/timedhosts.txt root@$HOST:/var/cache/yum/timedhosts.txt
 ssh root@$HOST "FFORGE_DB=$DB_NAME FFORGE_USER=gforge FFORGE_ADMIN_USER=$FORGE_ADMIN_USERNAME FFORGE_ADMIN_PASSWORD=$FORGE_ADMIN_PASSWORD export FFORGE_DB FFORGE_USER FFORGE_ADMIN_USER FFORGE_ADMIN_PASSWORD; yum install -y --skip-broken fusionforge fusionforge-plugin-scmsvn fusionforge-plugin-online_help fusionforge-plugin-extratabs fusionforge-plugin-ldapextauth fusionforge-plugin-scmgit fusionforge-plugin-blocks"
 scp -p root@$HOST:/var/cache/yum/timedhosts.txt /tmp/timedhosts.txt || true
-ssh root@$HOST '(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-builbot.ini'
+ssh root@$HOST '(echo [core];echo use_ssl=no;echo use_fti=no) > /etc/gforge/config.ini.d/zzz-buildbot.ini'
 #ssh root@$HOST "cd /root/tests/func; CONFIGURED=true CONFIG_PHP=config.php.buildbot DB_NAME=$DB_NAME php db_reload.php"
 #ssh root@$HOST "su - postgres -c \"pg_dump -Fc $DB_NAME\" > /root/dump"
 ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"

Modified: trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-source.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-source.sh	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-source.sh	2011-10-21 10:13:27 UTC (rev 17608)
@@ -109,7 +109,7 @@
 [ ! -e "/tmp/timedhosts.txt" ] || scp -p /tmp/timedhosts.txt root@$HOST:/var/cache/yum/timedhosts.txt
 ssh root@$HOST "cd fusionforge-*; FFORGE_RPM_REPO=$FFORGE_RPM_REPO DAG_RPMFORGE_REPO=$DAG_RPMFORGE_REPO FFORGE_DB=fforge FFORGE_USER=gforge FFORGE_ADMIN_USER=ffadmin FFORGE_ADMIN_PASSWORD=ffadmin ./install.sh $HOST"
 scp -p root@$HOST:/var/cache/yum/timedhosts.txt /tmp/timedhosts.txt || true
-ssh root@$HOST "(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-zbuildbot.ini"
+ssh root@$HOST "(echo [core];echo use_ssl=no;echo use_fti=no) > /etc/gforge/config.ini.d/zzz-zbuildbot.ini"
 ssh root@$HOST "cd /root/tests/func; CONFIGURED=true CONFIG_PHP=config.php.buildbot DB_NAME=$DB_NAME php db_reload.php"
 ssh root@$HOST "su - postgres -c \"pg_dump -Fc $DB_NAME\" > /root/dump"
 #ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"

Modified: trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-src-cos.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-src-cos.sh	2011-10-21 10:03:44 UTC (rev 17607)
+++ trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-src-cos.sh	2011-10-21 10:13:27 UTC (rev 17608)
@@ -35,8 +35,15 @@
 
 export BUILDRESULT=$WORKSPACE/build/packages
 
+
 # Create place to build package if necessary
-[ ! -d $WORKSPACE/build/packages ] || mkdir -p $WORKSPACE/build/packages
+if [ ! -d $WORKSPACE/build/packages ]
+then
+	mkdir -p $WORKSPACE/build/packages
+else
+	# Clean only old fusionforge packages
+	rm -f $WORKSPACE/build/packages/fusionforge*rpm || true
+fi
 
 # Erase config
 [ ! -d $WORKSPACE/build/config ] || rm -fr $WORKSPACE/build/config
@@ -105,7 +112,7 @@
 ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
 
 echo "Set use_ssl=no"
-ssh root@$HOST "(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-zbuildbot.ini"
+ssh root@$HOST "(echo [core];echo use_ssl=no;echo use_fti=no) > /etc/gforge/config.ini.d/zzz-zbuildbot.ini"
 #  Install a fake sendmail to catch all outgoing emails.
 # ssh root@$HOST "perl -spi -e s#/usr/sbin/sendmail#/opt/tests/scripts/catch_mail.php# /etc/gforge/local.inc"
 



More information about the evolvis-commits mailing list