← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gallery2/hardy-security

« back to all changes in this revision

Viewing changes to modules/search/SearchShowAll.inc

  • Committer: Bazaar Package Importer
  • Author(s): Michael C. Schultheiss
  • Date: 2006-04-16 16:42:35 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060416164235-8uy0u4bfjdxpge2o
Tags: 2.1.1-1
http://bugs.debian.org/362936
http://bugs.debian.org/359000
http://bugs.debian.org/362152
* New upstream release (Closes: #362936)
  + Bugfixes for Postgres7 (Closes: #359000, #362152)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/search/SearchShowAll.inc
3
3
 * $RCSfile: SearchShowAll.inc,v $
4
4
 *
5
5
 * Gallery - a web based photo album viewer and editor
6
 
 * Copyright (C) 2000-2005 Bharat Mediratta
 
6
 * Copyright (C) 2000-2006 Bharat Mediratta
7
7
 *
8
8
 * This program is free software; you can redistribute it and/or modify
9
9
 * it under the terms of the GNU General Public License as published by
21
21
 */
22
22
 
23
23
/**
24
 
 * @version $Revision: 1.31 $ $Date: 2005/08/23 03:49:53 $
 
24
 * @version $Revision: 1.33 $ $Date: 2006/02/04 21:37:37 $
25
25
 * @package Search
26
26
 * @author Bharat Mediratta <bharat@menalto.com>
27
27
 */
29
29
/**
30
30
 * Required classes
31
31
 */
32
 
GalleryCoreApi::relativeRequireOnce('modules/search/classes/SearchUtilities.class');
 
32
GalleryCoreApi::requireOnce('modules/search/classes/SearchUtilities.class');
33
33
 
34
34
/**
35
35
 * @package Search
51
51
 
52
52
        $results['status'] = array();
53
53
        $results['error'] = array();
54
 
        return array(GalleryStatus::success(), $results);
 
54
        return array(null, $results);
55
55
    }
56
56
}
57
57
 
115
115
                }
116
116
 
117
117
                $moduleId = $form['moduleId'];
118
 
                GalleryCoreApi::relativeRequireOnce(
 
118
                GalleryCoreApi::requireOnce(
119
119
                    'modules/search/classes/GallerySearchInterface_1_0.class');
120
120
                list ($ret, $searchInstance) =
121
121
                    GalleryCoreApi::newFactoryInstanceById('GallerySearchInterface_1_0',
122
122
                                                           $form['moduleId']);
123
 
                if ($ret->isError()) {
 
123
                if ($ret) {
124
124
                    return array($ret->wrap(__FILE__, __LINE__), null);
125
125
                }
126
126
 
127
127
                if (!isset($searchInstance)) {
128
 
                    return array(GalleryStatus::error(ERROR_MISSING_OBJECT, __FILE__, __LINE__),
 
128
                    return array(GalleryCoreApi::error(ERROR_MISSING_OBJECT, __FILE__, __LINE__),
129
129
                                 null);
130
130
                }
131
131
 
132
132
                list ($ret, $moduleInfo) = $searchInstance->getSearchModuleInfo();
133
 
                if ($ret->isError()) {
 
133
                if ($ret) {
134
134
                    return array($ret->wrap(__FILE__, __LINE__), null);
135
135
                }
136
136
 
140
140
                            SearchUtilities::sanitizeSearchCriteria($form['searchCriteria']),
141
141
                            ($form['page']-1) * $pageSize,
142
142
                            $pageSize);
143
 
                    if ($ret->isError()) {
 
143
                    if ($ret) {
144
144
                        return array($ret->wrap(__FILE__, __LINE__), null);
145
145
                    }
146
146
                }
160
160
                if (!empty($itemIds)) {
161
161
                    /* Fetch items */
162
162
                    list ($ret, $itemList) = GalleryCoreApi::loadEntitiesById($itemIds);
163
 
                    if ($ret->isError()) {
 
163
                    if ($ret) {
164
164
                        return array($ret->wrap(__FILE__, __LINE__), null);
165
165
                    }
166
166
                    foreach ($itemList as $item) {
167
 
                        $items[$item->getId()] = $item->getMemberData();
 
167
                        $items[$item->getId()] = (array)$item;
168
168
                    }
169
169
 
170
170
                    /* Fetch thumbnails */
171
171
                    list ($ret, $thumbnailList) =
172
172
                        GalleryCoreApi::fetchThumbnailsByItemIds($itemIds);
173
 
                    if ($ret->isError()) {
 
173
                    if ($ret) {
174
174
                        return array($ret->wrap(__FILE__, __LINE__), null);
175
175
                    }
176
176
                    foreach ($thumbnailList as $thumbnail) {
177
 
                        $thumbnails[$thumbnail->getParentId()] = $thumbnail->getMemberData();
 
177
                        $thumbnails[$thumbnail->getParentId()] = (array)$thumbnail;
178
178
                    }
179
179
                }
180
180
            }
184
184
 
185
185
        list ($ret, $rootAlbumId) =
186
186
            GalleryCoreApi::getPluginParameter('module', 'core', 'id.rootAlbum');
187
 
        if ($ret->isError()) {
 
187
        if ($ret) {
188
188
            return array($ret->wrap(__FILE__, __LINE__), null);
189
189
        }
190
190
        list ($ret, $rootAlbum) = GalleryCoreApi::loadEntitiesById($rootAlbumId);
191
 
        if ($ret->isError()) {
 
191
        if ($ret) {
192
192
            return array($ret->wrap(__FILE__, __LINE__), null);
193
193
        }
194
194
 
201
201
            'results' => $results,
202
202
            'thumbnails' => $thumbnails,
203
203
            'items' => $items,
204
 
            'rootAlbum' => $rootAlbum->getMemberData()));
 
204
            'rootAlbum' => (array)$rootAlbum));
205
205
 
206
206
        list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'search');
207
 
        if ($ret->isError()) {
 
207
        if ($ret) {
208
208
            return array($ret->wrap(__FILE__, __LINE__), null);
209
209
        }
210
210
 
 
211
        $template->javascript('modules/search/HighlightResults.js');
211
212
        $template->title($module->translate('Gallery Search'));
212
 
        return array(GalleryStatus::success(),
 
213
        return array(null,
213
214
                     array('body' => 'modules/search/templates/SearchShowAll.tpl'));
214
215
    }
215
216
}