From c22aaf5af2af5c5eb00bd524851c638b5db3c96a Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 4 Mar 2011 16:44:32 +0100 Subject: [PATCH] Avoiding warning messages --- .../lib/search/xapian/XapianIndexer.class.php | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) mode change 100644 => 100755 main/inc/lib/search/xapian/XapianIndexer.class.php diff --git a/main/inc/lib/search/xapian/XapianIndexer.class.php b/main/inc/lib/search/xapian/XapianIndexer.class.php old mode 100644 new mode 100755 index 1661f3517f..9c59993c3f --- a/main/inc/lib/search/xapian/XapianIndexer.class.php +++ b/main/inc/lib/search/xapian/XapianIndexer.class.php @@ -101,28 +101,31 @@ abstract class XapianIndexer { */ function index() { try { - foreach ($this->chunks as $chunk) { - $doc = new XapianDocument(); - $this->indexer->set_document($doc); - - foreach ($chunk->terms as $term) { - /* FIXME: think of getting weight */ - $doc->add_term($term['flag'] . $term['name'], 1); - } - - // free-form index all data array (title, content, etc) - foreach ($chunk->data as $key => $value) { - $this->indexer->index_text($value, 1); + if (!empty($this->chunks)) { + foreach ($this->chunks as $chunk) { + $doc = new XapianDocument(); + $this->indexer->set_document($doc); + if (!empty($chunk->terms)) { + foreach ($chunk->terms as $term) { + /* FIXME: think of getting weight */ + $doc->add_term($term['flag'] . $term['name'], 1); + } + } + + // free-form index all data array (title, content, etc) + if (!empty($chunk->data)) { + foreach ($chunk->data as $key => $value) { + $this->indexer->index_text($value, 1); + } + } + $doc->set_data($chunk->xapian_data, 1); + $did = $this->db->add_document($doc); + + //write to disk + $this->db->flush(); + + return $did; } - - $doc->set_data($chunk->xapian_data, 1); - - $did = $this->db->add_document($doc); - - //write to disk - $this->db->flush(); - - return $did; } } catch (Exception $e) {