[Gforge-commits] gforge/common/search ForumsSearchQuery.class, 1.1, 1.2 TrackersSearchQuery.class, 1.1, 1.2 SearchQuery.class, 1.3, 1.4 FrsSearchQuery.class, 1.1, 1.2 TasksSearchQuery.class, 1.1, 1.2 DocsSearchQuery.class, 1.1, 1.2

[gsmet]

Update of /cvsroot/gforge/gforge/common/search
In directory db.perdue.net:/tmp/cvs-serv14667/common/search

Modified Files:
        ForumsSearchQuery.class TrackersSearchQuery.class 
        SearchQuery.class FrsSearchQuery.class TasksSearchQuery.class 
        DocsSearchQuery.class 
Log Message:
finalized Grand Unified Search work based on Dominik Haas' patch [#833]

Index: ForumsSearchQuery.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/search/ForumsSearchQuery.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ForumsSearchQuery.class     12 Oct 2004 22:06:25 -0000      1.1
+++ ForumsSearchQuery.class     12 Dec 2004 19:18:16 -0000      1.2
@@ -59,7 +59,7 @@
                        . 'AND forum_group_list.is_public <> 9 '                
        
                        . 'AND forum.group_forum_id IN (SELECT group_forum_id 
FROM forum_group_list WHERE group_id = '.$this->groupId.') ';
                if ($this->sections != SEARCH__ALL_SECTIONS) {
-                       $sql .= 'AND forum_group_list.forum_name IN 
('.$this->sections.') ';
+                       $sql .= 'AND forum_group_list.group_forum_id IN 
('.$this->sections.') ';
                }
                if (!$this->showNonPublic) {
                        $sql .= 'AND forum_group_list.is_public = 1 ';

Index: TrackersSearchQuery.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/search/TrackersSearchQuery.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TrackersSearchQuery.class   12 Oct 2004 22:06:25 -0000      1.1
+++ TrackersSearchQuery.class   12 Dec 2004 19:18:16 -0000      1.2
@@ -59,7 +59,7 @@
                        . 'AND artifact_group_list.group_artifact_id = 
artifact.group_artifact_id '
                        . 'AND artifact_group_list.group_id = 
'.$this->groupId.' ';
                if ($this->sections != SEARCH__ALL_SECTIONS) {
-                       $sql .= 'AND artifact_group_list.name in 
('.$this->sections.') ';
+                       $sql .= 'AND artifact_group_list.group_artifact_id in 
('.$this->sections.') ';
                }
                if (!$this->showNonPublic) {
                        $sql .= 'AND artifact_group_list.is_public = 1 ';
@@ -88,7 +88,7 @@
                $sections = array();
                $res = db_query($sql);
                while($data = db_fetch_array($res)) {
-                       $sections[$data['doc_group']] = $data['groupname'];
+                       $sections[$data['group_artifact_id']] = $data['name'];
                }
                return $sections;
        }

Index: SearchQuery.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/search/SearchQuery.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SearchQuery.class   12 Oct 2004 22:06:25 -0000      1.3
+++ SearchQuery.class   12 Dec 2004 19:18:16 -0000      1.4
@@ -125,6 +125,7 @@
                        $this->offset,
                        SYS_DB_SEARCH
                );
+
                $this->rowsTotalCount = db_numrows($this->result);
                $this->rowsCount = min($this->rowsPerPage, 
$this->rowsTotalCount);
        }

Index: FrsSearchQuery.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/search/FrsSearchQuery.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FrsSearchQuery.class        12 Oct 2004 22:06:25 -0000      1.1
+++ FrsSearchQuery.class        12 Dec 2004 19:18:16 -0000      1.2
@@ -59,7 +59,7 @@
                        . ' AND frs_package.group_id='.$this->groupId;
                
                if ($this->sections != SEARCH__ALL_SECTIONS) {
-                       $sql .= ' AND frs_package.name IN ('.$this->sections.') 
';
+                       $sql .= ' AND frs_package.package_id IN 
('.$this->sections.') ';
                }
                if(!$this->showNonPublic) {
                        $sql .= ' AND is_public=1';

Index: TasksSearchQuery.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/search/TasksSearchQuery.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TasksSearchQuery.class      12 Oct 2004 22:06:25 -0000      1.1
+++ TasksSearchQuery.class      12 Dec 2004 19:18:16 -0000      1.2
@@ -59,7 +59,7 @@
                        . ' AND project_task.group_project_id = 
project_group_list.group_project_id '
                        . ' AND project_group_list.group_id  ='.$this->groupId;
                if ($this->sections != SEARCH__ALL_SECTIONS) {
-                       $sql .= 'AND project_group_list.project_name in 
('.$this->sections.') ';
+                       $sql .= 'AND project_group_list.group_project_id in 
('.$this->sections.') ';
                }
                if (!$this->showNonPublic) {
                        $sql .= 'AND project_group_list.is_public = 1 ';

Index: DocsSearchQuery.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/search/DocsSearchQuery.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DocsSearchQuery.class       12 Oct 2004 22:06:25 -0000      1.1
+++ DocsSearchQuery.class       12 Dec 2004 19:18:16 -0000      1.2
@@ -57,7 +57,7 @@
                        .' WHERE doc_data.doc_group = doc_groups.doc_group'
                        .' AND doc_data.group_id ='.$this->groupId;
                if ($this->sections != SEARCH__ALL_SECTIONS) {
-                       $sql .= ' AND doc_groups.groupname IN 
('.$this->sections.') ';
+                       $sql .= ' AND doc_groups.doc_group IN 
('.$this->sections.') ';
                }
                if ($this->showNonPublic) {
                        $sql .= ' AND doc_data.stateid IN (1, 4, 5)';