From fef0afe183da48e1b6733e54b7293e0e986bdd50 Mon Sep 17 00:00:00 2001
From: mchampan <mchampan>
Date: Fri, 28 Jul 2006 13:27:15 +0000
Subject: [PATCH] Changed $doc->id to $doc->docid to prevent clashes with Zend
 Search's internal $doc->id

---
 search/documents/document.php          | 2 +-
 search/documents/forum_document.php    | 2 +-
 search/documents/glossary_document.php | 8 ++++++--
 search/documents/wiki_document.php     | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/search/documents/document.php b/search/documents/document.php
index e9a9766b649..c5fbe3028e0 100644
--- a/search/documents/document.php
+++ b/search/documents/document.php
@@ -5,7 +5,7 @@
   
   abstract class SearchDocument extends Zend_Search_Lucene_Document {  
     public function __construct(&$doc, &$data, $document_type, $course_id, $group_id) {      
-      $this->addField(Zend_Search_Lucene_Field::Keyword('id', $doc->id));
+      $this->addField(Zend_Search_Lucene_Field::Keyword('docid', $doc->docid));
       $this->addField(Zend_Search_Lucene_Field::Text('title', $doc->title));
       $this->addField(Zend_Search_Lucene_Field::Text('author', $doc->author));
       $this->addField(Zend_Search_Lucene_Field::UnStored('contents', $doc->contents));
diff --git a/search/documents/forum_document.php b/search/documents/forum_document.php
index 7b948d8eede..c3e0da140c6 100644
--- a/search/documents/forum_document.php
+++ b/search/documents/forum_document.php
@@ -8,7 +8,7 @@
   class ForumSearchDocument extends SearchDocument {  
     public function __construct(&$post, $forum_id, $course_id, $group_id) {
       // generic information     
-      $doc->id        = $post['id'];
+      $doc->docid     = $post['id'];
       $doc->title     = $post['subject'];
       $doc->author    = $post['firstname']." ".$post['lastname'];
       $doc->contents  = $post['message'];
diff --git a/search/documents/glossary_document.php b/search/documents/glossary_document.php
index 0305b7229af..7d9db6b5998 100644
--- a/search/documents/glossary_document.php
+++ b/search/documents/glossary_document.php
@@ -12,7 +12,7 @@
   class GlossarySearchDocument extends SearchDocument {  
     public function __construct(&$entry, $glossary_id, $course_id, $group_id) {
       // generic information; required
-      $doc->id        = $entry['id'];
+      $doc->docid     = $entry['id'];
       $doc->title     = $entry['concept'];
                   
       $user = get_recordset('user', 'id', $entry['userid'])->fields;
@@ -60,6 +60,10 @@
     } //foreach
     
     return $documents;
-  } //glossary_get_content_for_index 
+  } //glossary_get_content_for_index
+    
+  function glossary_delete($info) {
+    return $info;            
+  } //glossary_delete  
   
 ?>
\ No newline at end of file
diff --git a/search/documents/wiki_document.php b/search/documents/wiki_document.php
index 812e3fd239b..408c38f69e0 100644
--- a/search/documents/wiki_document.php
+++ b/search/documents/wiki_document.php
@@ -19,7 +19,7 @@
   class WikiSearchDocument extends SearchDocument {  
     public function __construct(&$page, $wiki_id, $course_id, $group_id) {
       // generic information; required
-      $doc->id        = $page->id;
+      $doc->docid     = $page->id;
       $doc->title     = $page->pagename;
       
       //remove '(ip.ip.ip.ip)' from wiki author field