Index: openacs-4/packages/project-manager/lib/search-project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/search-project.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/project-manager/lib/search-project.tcl	19 Dec 2005 22:59:20 -0000	1.3
+++ openacs-4/packages/project-manager/lib/search-project.tcl	20 Oct 2006 06:08:17 -0000	1.4
@@ -32,18 +32,23 @@
     set match_projects [db_list_of_lists get_projects { }]
     set match_length [llength $match_projects]
     if { [string equal $match_length 0] } {
-	# No Match just redirect
-	ad_returnredirect $return_url
-    } else {
-	set project_item_id [lindex [lindex $match_projects 0] 0]
-	set object_package_id [lindex [lindex $match_projects 0] 2]
-	
-	# We get the node_id from the package_id and use it 
-	# to get the url of the project-manager
-	set pm_node_id [site_node::get_node_id_from_object_id -object_id $object_package_id]
-	set pm_url [site_node::get_url -node_id $pm_node_id]
-	
-	# Just redirect to the pm_url and project_item_id
-	ad_returnredirect "${pm_url}one?project_item_id=$project_item_id"
+	# No Match, run additional search
+	set match_projects [db_list_of_lists get_projects_by_code { }]
+	set match_length [llength $match_projects]
+	if { [string equal $match_length 0] } {
+	    # No Match just redirect
+	    ad_returnredirect $return_url
+	}
     }
+
+    set project_item_id [lindex [lindex $match_projects 0] 0]
+    set object_package_id [lindex [lindex $match_projects 0] 1]
+    
+    # We get the node_id from the package_id and use it 
+    # to get the url of the project-manager
+    set pm_node_id [site_node::get_node_id_from_object_id -object_id $object_package_id]
+    set pm_url [site_node::get_url -node_id $pm_node_id]
+
+    # Just redirect to the pm_url and project_item_id
+    ad_returnredirect "${pm_url}one?project_item_id=$project_item_id"
 } -has_submit {1}
\ No newline at end of file
Index: openacs-4/packages/project-manager/lib/search-project.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/search-project.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/project-manager/lib/search-project.xql	12 Mar 2006 16:54:57 -0000	1.3
+++ openacs-4/packages/project-manager/lib/search-project.xql	20 Oct 2006 06:08:17 -0000	1.4
@@ -4,18 +4,32 @@
 <fullquery name="get_projects">
     <querytext>
 	select 
-		distinct
 		item_id,
-		object_title,
-		object_package_id
+		o.package_id as object_package_id
 	from
-		pm_projectsx
+		cr_items i, acs_objects o
 	where
-		lower(object_title) like '%${keyword}%'
-		or lower(project_code) like '%${keyword}%'
+		lower(o.title) like '%${keyword}%'
+		and i.latest_revision = o.object_id
+		and i.content_type = 'pm_project'
 	order by
-		object_title asc
+		title asc
     </querytext>
 </fullquery>
 
+<fullquery name="get_projects_by_code">
+    <querytext>
+	select 
+		item_id,
+		o.package_id as object_package_id
+	from
+		cr_items i, acs_objects o, pm_projects p
+	where
+		lower(p.project_code) like '%${keyword}%'
+		and i.latest_revision = o.object_id
+		and o.object_id = p.project_id
+	order by
+		title asc
+    </querytext>
+</fullquery>
 </queryset>
\ No newline at end of file