Merge branch 'wip-MDL-17327-master-v2' of git://github.com/abgreeve/moodle

mod/data/lib.php

@@ -3457,3 +3457,138 @@ function data_page_type_list($pagetype, $parentcontext, $currentcontext) {
     $module_pagetype = array('mod-data-*'=>get_string('page-mod-data-x', 'data'));
     return $module_pagetype;
 }
+
+/**
+ * Get all of the record ids from a database activity.
+ *
+ * @param int $dataid      The dataid of the database module.
+ * @return array $idarray  An array of record ids
+ */
+function data_get_all_recordids($dataid) {
+    global $DB;
+    $initsql = 'SELECT c.recordid
+                  FROM {data_fields} f,
+                       {data_content} c
+                 WHERE f.dataid = :dataid
+                   AND f.id = c.fieldid
+              GROUP BY c.recordid';
+    $initrecord = $DB->get_recordset_sql($initsql, array('dataid' => $dataid));
+    $idarray = array();
+    foreach ($initrecord as $data) {
+        $idarray[] = $data->recordid;
+    }
+    // Close the record set and free up resources.
+    $initrecord->close();
+    return $idarray;
+}
+
+/**
+ * Get the ids of all the records that match that advanced search criteria
+ * This goes and loops through each criterion one at a time until it either
+ * runs out of records or returns a subset of records.
+ *
+ * @param array $recordids    An array of record ids.
+ * @param array $searcharray   Contains information for the advanced search criteria
+ * @param int $dataid         The data id of the database.
+ * @return array $recordids   An array of record ids.
+ */
+function data_get_advance_search_ids($recordids, $searcharray, $dataid) {
+    $searchcriteria = array_keys($searcharray);
+    // Loop through and reduce the IDs one search criteria at a time.
+    foreach ($searchcriteria as $key) {
+        $recordids = data_get_recordids($key, $searcharray, $dataid, $recordids);
+        // If we don't have anymore IDs then stop.
+        if (!$recordids) {
+            break;
+        }
+    }
+    return $recordids;
+}
+
+/**
+ * Gets the record IDs given the search criteria
+ *
+ * @param string $alias       record alias.
+ * @param array $searcharray  criteria for the search.
+ * @param int $dataid         Data ID for the database
+ * @param array $recordids    An array of record IDs.
+ * @return array $nestarray   An arry of record IDs
+ */
+function data_get_recordids($alias, $searcharray, $dataid, $recordids) {
+    global $DB;
+
+    $nestsearch = $searcharray[$alias];
+    // searching for content outside of mdl_data_content
+    if ($alias < 0) {
+        $alias = '';
+    }
+    list($insql, $params) = $DB->get_in_or_equal($recordids, SQL_PARAMS_NAMED);
+    $nestselect = 'SELECT c' . $alias . '.recordid
+                     FROM {data_content} c' . $alias . ',
+                          {data_fields} f,
+                          {data_records} r,
+                          {user} u ';
+    $nestwhere = 'WHERE u.id = r.userid
+                    AND f.id = c' . $alias . '.fieldid
+                    AND r.id = c' . $alias . '.recordid
+                    AND r.dataid = :dataid
+                    AND c' . $alias .'.recordid ' . $insql . '
+                    AND ';
+
+    $params['dataid'] = $dataid;
+    if (count($nestsearch->params) != 0) {
+        $params = array_merge($params, $nestsearch->params);
+        $nestsql = $nestselect . $nestwhere . $nestsearch->sql;
+    } else {
+        $thing = $DB->sql_like($nestsearch->field, ':search1', false);
+        $nestsql = $nestselect . $nestwhere . $thing . ' GROUP BY c' . $alias . '.recordid';
+        $params['search1'] = "%$nestsearch->data%";
+    }
+    $nestrecords = $DB->get_recordset_sql($nestsql, $params);
+    $nestarray = array();
+    foreach ($nestrecords as $data) {
+        $nestarray[] = $data->recordid;
+    }
+    // Close the record set and free up resources.
+    $nestrecords->close();
+    return $nestarray;
+}
+
+/**
+ * Returns an array with an sql string for advanced searches and the parameters that go with them.
+ *
+ * @param int $sort            DATA_*
+ * @param stdClass $data       data module object
+ * @param array $recordids     An array of record IDs.
+ * @param string $selectdata   information for the select part of the sql statement.
+ * @param string $sortorder    Additional sort parameters
+ * @return array sqlselect     sqlselect['sql] has the sql string, sqlselect['params'] contains an array of parameters.
+ */
+function data_get_advanced_search_sql($sort, $data, $recordids, $selectdata, $sortorder) {
+    global $DB;
+    $nestselectsql = 'SELECT r.id, r.approved, r.timecreated, r.timemodified, r.userid, u.firstname, u.lastname, c.content
+                          AS _order
+                        FROM {data_content} c,
+                             {data_records} r,
+                             {user} u ';
+    $nestfromsql = 'WHERE c.recordid = r.id
+                      AND r.dataid = :dataid
+                      AND r.userid = u.id';
+
+    // Find the field we are sorting on
+    if ($sort > 0 or data_get_field_from_id($sort, $data)) {
+        $nestfromsql .= ' AND c.fieldid = :sort';
+    }
+
+    // If there are no record IDs then return an sql statment that will return no rows.
+    if (count($recordids) != 0) {
+        list($insql, $inparam) = $DB->get_in_or_equal($recordids, SQL_PARAMS_NAMED);
+    } else {
+        list($insql, $inparam) = $DB->get_in_or_equal(array('-1'), SQL_PARAMS_NAMED);
+    }
+    $nestfromsql .= ' AND c.recordid ' . $insql . ' GROUP BY r.id ';
+    $nestfromsql = "$nestfromsql $selectdata";
+    $sqlselect['sql'] = "$nestselectsql $nestfromsql $sortorder";
+    $sqlselect['params'] = $inparam;
+    return $sqlselect;
+}

mod/data/simpletest/test_advanced_search_sql.php

@@ -0,0 +1,266 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests for data_get_all_recordsids(), data_get_advance_search_ids(), data_get_record_ids(),
+ * and data_get_advanced_search_sql()
+ *
+ * @package    mod_data
+ * @copyright  2012 Adrian Greeve
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');
+}
+
+
+require_once($CFG->dirroot . '/mod/data/lib.php');
+require_once($CFG->dirroot . '/lib/csvlib.class.php');
+
+/**
+ * Unit tests for {@see data_get_all_recordids()}.
+ *                {@see data_get_advanced_search_ids()}
+ *                {@see data_get_record_ids()}
+ *                {@see data_get_advanced_search_sql()}
+ *
+ * @package    mod_data
+ * @copyright  2012 Adrian Greeve
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class data_advanced_search_sql_test extends UnitTestCaseUsingDatabase {
+    /**
+     * @var array $recorddataid An array of data IDs.
+     */
+    public $recorddataid = null;
+    /**
+     * @var int $recordcontentid The content ID.
+     */
+    public $recordcontentid = null;
+    /**
+     * @var int $recordrecordid The record ID.
+     */
+    public $recordrecordid = null;
+    /**
+     * @var int $recordfieldid The field ID.
+     */
+    public $recordfieldid = null;
+    /**
+     * @var array $recordsearcharray An array of stdClass which contains search criteria.
+     */
+    public $recordsearcharray = null;
+    /**
+     * @var stdClass $recorddata A stdClass that contains the data ID
+     */
+    public $recorddata = null;
+
+    // CONSTANTS
+
+    /**
+     * @var int $datarecordcount   The number of records in the database.
+     */
+    public $datarecordcount = 100;
+
+    /**
+     * @var array $datarecordset   Expected record IDs.
+     */
+    public $datarecordset = array('0' => '6');
+
+    /**
+     * @var array $finalrecord   Final record for comparison with test four.
+     */
+    public $finalrecord = array();
+
+    /**
+     * Set up function. In this instance we are setting up database
+     * records to be used in the unit tests.
+     */
+
+    public function setUp() {
+        global $DB, $CFG;
+
+        // Set up test database and appropriate tables.
+        parent::setUp();
+        $this->create_test_tables(array('data', 'data_fields', 'data_records', 'data_content'), 'mod/data');
+        $this->create_test_table('user', 'lib');
+        $this->switch_to_test_db();
+
+        // Set up data for the test database.
+        $tablename = array('0' => 'user',
+                           '1' => 'data_fields',
+                           '2' => 'data_records',
+                           '3' => 'data_content');
+
+        for ($i = 0; $i < 4; $i++) {
+            $filename = $CFG->dirroot . '/mod/data/simpletest/test_' . $tablename[$i] . '.csv';
+            if (file_exists($filename)) {
+                $file = file_get_contents($filename);
+            }
+            $this->insert_data_from_csv($file, $tablename[$i]);
+        }
+
+        // Set up a data record.
+        $datarecord = new stdClass();
+        $datarecord->course = '99999';
+        $datarecord->name = 'test database';
+        $datarecord->intro = 'Test Database for unit testing';
+        $datarecord->introformat = '1';
+        $DB->insert_record('data', $datarecord, false);
+        $dataid = $DB->get_field('data', 'id', array('course' => '99999'));
+        $this->recorddataid = $dataid;
+
+        // Create the search array which contains our advanced search criteria.
+
+        // Latitude and Longitude
+        $search_array = array();
+        $search_array['1'] = new stdClass();
+        $search_array['1']->params = array();
+        $search_array['1']->params['df_latlong1_1'] = '3.721';
+        $search_array['1']->params['df_latlong2_1'] = '46.6126';
+        $search_array['1']->sql = '(c1.fieldid = 1 AND c1.content = :df_latlong1_1 AND c1.content1 = :df_latlong2_1) ';
+        $search_array['1']->data = '3.721,46.6126';
+
+        // Mulitmenu
+        $search_array['2'] = new stdClass();
+        $search_array['2']->params = array();
+        $search_array['2']->params['df_multimenu_1_1a'] = 'Hahn Premium';
+        $search_array['2']->params['df_multimenu_1_1b'] = 'Hahn Premium##%';
+        $search_array['2']->params['df_multimenu_1_1c'] = '%##Hahn Premium';
+        $search_array['2']->params['df_multimenu_1_1d'] = '%##Hahn Premium##%';
+        $search_array['2']->sql = '((c2.fieldid = 2 AND (c2.content = :df_multimenu_1_1a
+                                                        OR c2.content LIKE :df_multimenu_1_1b
+                                                        OR c2.content LIKE :df_multimenu_1_1c
+                                                        OR c2.content LIKE :df_multimenu_1_1d)))';
+        $search_array['2']->data = array();
+        $search_array['2']->data['selected'] = array();
+        $search_array['2']->data['selected']['0'] = 'Hahn Premium';
+        $search_array['2']->data['allrequired'] = '0';
+
+        // Radiobutton
+        $search_array['5'] = new stdClass();
+        $search_array['5']->params = array();
+        $search_array['5']->params['df_radiobutton_1'] = 'Female';
+        $search_array['5']->sql = '(c5.fieldid = 5 AND c5.content = :df_radiobutton_1)';
+        $search_array['5']->data = 'Female';
+
+        // Textbox
+        $search_array['7'] = new stdClass();
+        $search_array['7']->params = array();
+        $search_array['7']->params['df_text_1'] = '%kel%';
+        $search_array['7']->sql = ' (c7.fieldid = 7 AND LOWER(c7.content) LIKE LOWER(:df_text_1) COLLATE utf8_bin ESCAPE \'\\\\\') ';
+        $search_array['7']->data = 'kel';
+
+        // Menu
+        $search_array['9'] = new stdClass();
+        $search_array['9']->params = array();
+        $search_array['9']->params['df_menu_1'] = 'VIC';
+        $search_array['9']->sql = '(c9.fieldid = 9 AND c9.content = :df_menu_1)';
+        $search_array['9']->data = 'VIC';
+        $this->recordsearcharray = $search_array;
+
+        // Normally data_get_advanced_search_sql takes a data module variable
+        // which contains a large amount of information, but all that we
+        // need is the data ID in a certain format.
+        $this->recorddata = new stdClass();
+        $this->recorddata->id = $this->recorddataid;
+
+        // Setting up the comparison stdClass for the last test.
+        $this->finalrecord[6] = new stdClass();
+        $this->finalrecord[6]->id = 6;
+        $this->finalrecord[6]->approved = 1;
+        $this->finalrecord[6]->timecreated = 1234567891;
+        $this->finalrecord[6]->timemodified = 1234567892;
+        $this->finalrecord[6]->userid = 6;
+        $this->finalrecord[6]->firstname = 'Benedict';
+        $this->finalrecord[6]->lastname = 'Horn';
+        $this->finalrecord[6]->_order = 3.721;
+    }
+
+    /**
+     * Tear Down function. Here we remove all the database entries that we created
+     * for testing the unit tests.
+     */
+    public function tearDown() {
+        $this->revert_to_real_db();
+        parent::tearDown();
+    }
+
+    /**
+     * Test 1: The function data_get_all_recordids.
+     *
+     * Test 2: This tests the data_get_advance_search_ids() function. The function takes a set
+     * of all the record IDs in the database and then with the search details ($this->recordsearcharray)
+     * returns a comma seperated string of record IDs that match the search criteria.
+     *
+     * Test 3: This function tests data_get_recordids(). This is the function that is nested in the last
+     * function (@see data_get_advance_search_ids). This function takes a couple of
+     * extra parameters. $alias is the field alias used in the sql query and $commaid
+     * is a comma seperated string of record IDs.
+     *
+     * Test 4: data_get_advanced_search_sql provides an array which contains an sql string to be used for displaying records
+     * to the user when they use the advanced search criteria and the parameters that go with the sql statement. This test
+     * takes that information and does a search on the database, returning a record.
+     */
+    function test_advanced_search_sql_section() {
+        global $DB;
+
+        // Test 1
+        $recordids = data_get_all_recordids($this->recorddataid);
+        $this->assertEqual(count($recordids), $this->datarecordcount);
+
+        // Test 2
+        $key = array_keys($this->recordsearcharray);
+        $alias = $key[0];
+        $newrecordids = data_get_recordids($alias, $this->recordsearcharray, $this->recorddataid, $recordids);
+        $this->assertEqual($this->datarecordset, $newrecordids);
+
+        // Test 3
+        $newrecordids = data_get_advance_search_ids($recordids, $this->recordsearcharray, $this->recorddataid);
+        $this->assertEqual($this->datarecordset, $newrecordids);
+
+        // Test 4
+        $sortorder = 'ORDER BY _order ASC , r.id ASC';
+        $html = data_get_advanced_search_sql('0', $this->recorddata, $newrecordids, '', $sortorder);
+        $allparams = array_merge($html['params'], array('dataid' => $this->recorddataid));
+        $records = $DB->get_records_sql($html['sql'], $allparams);
+        $this->assertEqual($records, $this->finalrecord);
+    }
+
+    /**
+     * Inserts data from a csv file into the data module table specified.
+     *
+     * @param string $file comma seperated value file
+     * @param string $tablename name of the table for the data to be inserted into.
+     */
+    function insert_data_from_csv($file, $tablename) {
+        global $DB;
+        $iid = csv_import_reader::get_new_iid('moddata');
+        $csvdata = new csv_import_reader($iid, 'moddata');
+        $fielddata = $csvdata->load_csv_content($file, 'utf8', 'comma');
+        $columns = $csvdata->get_columns();
+        $columncount = count($columns);
+        $csvdata->init();
+        $fieldinfo = array();
+        for ($j = 0; $j < $fielddata; $j++) {
+            $thing = $csvdata->next();
+            $fieldinfo[$j] = new stdClass();
+            for ($i = 0; $i < $columncount; $i++) {
+                $fieldinfo[$j]->$columns[$i] = $thing[$i];
+            }
+            $DB->insert_record($tablename, $fieldinfo[$j], false);
+        }
+    }
+}

mod/data/simpletest/test_data_fields.csv

@@ -0,0 +1,21 @@
+id,dataid,type,name,description,param1,param2,param3,param4,param5
+1,1,latlong,location,Your current location,,-1,,NULL,NULL
+2,1,multimenu,beer,Which beer is good?,,,,NULL,NULL
+3,1,checkbox,month,One month or Two,,,,NULL,NULL
+4,1,number,tfn,Tax file number,,,,NULL,NULL
+5,1,radiobutton,gender,Male or Female,,,,NULL,NULL
+6,1,url,webpage,Your webpage,,,,NULL,NULL
+7,1,text,firstname,Your first name,,,,NULL,NULL
+8,1,textarea,about,About you,,60,35,1,NULL
+9,1,menu,state,State,,,,NULL,NULL
+10,1,text,address,address of the participant,,,,NULL,NULL
+11,1,menu,Sport,Favourite sport,,,,NULL,NULL
+12,1,text,suburb,suburb,,,,NULL,NULL
+13,1,text,mobile,mobile number,,,,NULL,NULL
+14,1,text,phone,phone number,,,,NULL,NULL
+15,1,text,email,email address,,,,NULL,NULL
+16,1,text,license,Driver's license,,,,NULL,NULL
+17,1,text,passport,Passport number,,,,NULL,NULL
+18,1,menu,browser,prefered browser,,,,NULL,NULL
+19,1,menu,OS,Operating System,,,,NULL,NULL
+20,1,text,nickname,Nick name,,,,NULL,NULL

mod/data/simpletest/test_data_records.csv

@@ -0,0 +1,101 @@
+id,userid,groupid,dataid,timecreated,timemodified,approved
+1,1,0,1,1234567891,1234567892,1
+2,2,0,1,1234567891,1234567892,1
+3,3,0,1,1234567891,1234567892,1
+4,4,0,1,1234567891,1234567892,1
+5,5,0,1,1234567891,1234567892,1
+6,6,0,1,1234567891,1234567892,1
+7,7,0,1,1234567891,1234567892,1
+8,8,0,1,1234567891,1234567892,1
+9,9,0,1,1234567891,1234567892,1
+10,10,0,1,1234567891,1234567892,1
+11,11,0,1,1234567891,1234567892,1
+12,12,0,1,1234567891,1234567892,1
+13,13,0,1,1234567891,1234567892,1
+14,14,0,1,1234567891,1234567892,1
+15,15,0,1,1234567891,1234567892,1
+16,16,0,1,1234567891,1234567892,1
+17,17,0,1,1234567891,1234567892,1
+18,18,0,1,1234567891,1234567892,1
+19,19,0,1,1234567891,1234567892,1
+20,20,0,1,1234567891,1234567892,1
+21,21,0,1,1234567891,1234567892,1
+22,22,0,1,1234567891,1234567892,1
+23,23,0,1,1234567891,1234567892,1
+24,24,0,1,1234567891,1234567892,1
+25,25,0,1,1234567891,1234567892,1
+26,26,0,1,1234567891,1234567892,1
+27,27,0,1,1234567891,1234567892,1
+28,28,0,1,1234567891,1234567892,1
+29,29,0,1,1234567891,1234567892,1
+30,30,0,1,1234567891,1234567892,1
+31,31,0,1,1234567891,1234567892,1
+32,32,0,1,1234567891,1234567892,1
+33,33,0,1,1234567891,1234567892,1
+34,34,0,1,1234567891,1234567892,1
+35,35,0,1,1234567891,1234567892,1
+36,36,0,1,1234567891,1234567892,1
+37,37,0,1,1234567891,1234567892,1
+38,38,0,1,1234567891,1234567892,1
+39,39,0,1,1234567891,1234567892,1
+40,40,0,1,1234567891,1234567892,1
+41,41,0,1,1234567891,1234567892,1
+42,42,0,1,1234567891,1234567892,1
+43,43,0,1,1234567891,1234567892,1
+44,44,0,1,1234567891,1234567892,1
+45,45,0,1,1234567891,1234567892,1
+46,46,0,1,1234567891,1234567892,1
+47,47,0,1,1234567891,1234567892,1
+48,48,0,1,1234567891,1234567892,1
+49,49,0,1,1234567891,1234567892,1
+50,50,0,1,1234567891,1234567892,1
+51,51,0,1,1234567891,1234567892,1
+52,52,0,1,1234567891,1234567892,1
+53,53,0,1,1234567891,1234567892,1
+54,54,0,1,1234567891,1234567892,1
+55,55,0,1,1234567891,1234567892,1
+56,56,0,1,1234567891,1234567892,1
+57,57,0,1,1234567891,1234567892,1
+58,58,0,1,1234567891,1234567892,1
+59,59,0,1,1234567891,1234567892,1
+60,60,0,1,1234567891,1234567892,1
+61,61,0,1,1234567891,1234567892,1
+62,62,0,1,1234567891,1234567892,1
+63,63,0,1,1234567891,1234567892,1
+64,64,0,1,1234567891,1234567892,1
+65,65,0,1,1234567891,1234567892,1
+66,66,0,1,1234567891,1234567892,1
+67,67,0,1,1234567891,1234567892,1
+68,68,0,1,1234567891,1234567892,1
+69,69,0,1,1234567891,1234567892,1
+70,70,0,1,1234567891,1234567892,1
+71,71,0,1,1234567891,1234567892,1
+72,72,0,1,1234567891,1234567892,1
+73,73,0,1,1234567891,1234567892,1
+74,74,0,1,1234567891,1234567892,1
+75,75,0,1,1234567891,1234567892,1
+76,76,0,1,1234567891,1234567892,1
+77,77,0,1,1234567891,1234567892,1
+78,78,0,1,1234567891,1234567892,1
+79,79,0,1,1234567891,1234567892,1
+80,80,0,1,1234567891,1234567892,1
+81,81,0,1,1234567891,1234567892,1
+82,82,0,1,1234567891,1234567892,1
+83,83,0,1,1234567891,1234567892,1
+84,84,0,1,1234567891,1234567892,1
+85,85,0,1,1234567891,1234567892,1
+86,86,0,1,1234567891,1234567892,1
+87,87,0,1,1234567891,1234567892,1
+88,88,0,1,1234567891,1234567892,1
+89,89,0,1,1234567891,1234567892,1
+90,90,0,1,1234567891,1234567892,1
+91,91,0,1,1234567891,1234567892,1
+92,92,0,1,1234567891,1234567892,1
+93,93,0,1,1234567891,1234567892,1
+94,94,0,1,1234567891,1234567892,1
+95,95,0,1,1234567891,1234567892,1
+96,96,0,1,1234567891,1234567892,1
+97,97,0,1,1234567891,1234567892,1
+98,98,0,1,1234567891,1234567892,1
+99,99,0,1,1234567891,1234567892,1
+100,100,0,1,1234567891,1234567892,1

mod/data/simpletest/test_user.csv

@@ -0,0 +1,101 @@
+id,auth,confirmed,username,password,idnumber,firstname,lastname,email,icq,skype,yahoo,aim,msn,phone1,phone2,institution,department,address,city,country,lang,theme,lasttip,secret
+1,manual,1,IvySmith,test,,Drew,Sherman,quam@Sedidrisus.edu,,,,,,(02) 5897 5042,(01) 3691 7729,,,P.O. Box 883 5044 Elit Rd.,Bandon,AU,en,,,
+2,manual,1,KimSmall,test,,Alma,Whitehead,Praesent.luctus.Curabitur@acmattis.org,,,,,,(09) 4788 9110,(03) 4001 7143,,,P.O. Box 323 4354 Suspendisse Street,Brunswick,AU,en,,,
+3,manual,0,IolaStewart,test,,Kyra,Hansen,dignissim.lacus.Aliquam@aliquetmetusurna.ca,,,,,,(08) 5408 5094,(00) 2738 9848,,,312-3019 Pede. Street,Malden,AU,en,,,
+4,manual,1,GretchenMorse,test,,Hamish,Randolph,commodo.at@lectusrutrumurna.edu,,,,,,(03) 2367 7727,(06) 3774 4779,,,P.O. Box 186 6931 Congue Ave,Kent,AU,en,,,
+5,manual,0,MaggieGarrett,test,,Roary,Knox,enim.commodo@musProinvel.com,,,,,,(09) 7976 6827,(02) 7649 3366,,,Ap #436-645 Arcu. St.,Jackson,AU,en,,,
+6,manual,0,JoleneClayton,test,,Benedict,Horn,pede.Suspendisse@nuncsed.ca,,,,,,(05) 3850 8485,(03) 2830 3758,,,Ap #435-9468 Pede Avenue,Edina,AU,en,,,
+7,manual,0,SybilMorris,test,,Vladimir,Landry,mus.Aenean@diam.ca,,,,,,(01) 5505 2453,(00) 9481 9876,,,P.O. Box 709 1437 Scelerisque Street,Oxnard,AU,en,,,
+8,manual,1,FullerHines,test,,Kylynn,Clarke,ornare@eleifend.com,,,,,,(02) 4437 3176,(02) 9268 7721,,,Ap #946-7281 Per Av.,Oneida,AU,en,,,
+9,manual,0,AbrahamLewis,test,,Stephanie,Nieves,erat@dapibusrutrumjusto.org,,,,,,(01) 6923 6307,(06) 8413 4680,,,Ap #662-8586 Tristique Av.,Centennial,AU,en,,,
+10,manual,1,NicoleVega,test,,Yvette,Strong,Donec@Cumsociis.ca,,,,,,(07) 5184 2930,(01) 4324 4631,,,Ap #659-5861 Duis Street,Sanford,AU,en,,,
+11,manual,0,NasimHenry,test,,Briar,Reynolds,faucibus.Morbi.vehicula@ornareIn.org,,,,,,(09) 7148 9918,(07) 7361 6202,,,P.O. Box 355 5406 Vitae Road,Hammond,AU,en,,,
+12,manual,1,ReubenBecker,test,,Summer,Walton,ullamcorper.viverra.Maecenas@magnisdis.edu,,,,,,(00) 6038 5363,(03) 3882 3790,,,P.O. Box 382 5041 Nullam Rd.,Fairfield,AU,en,,,
+13,manual,1,NoelleMaynard,test,,Nash,Yang,Aliquam@accumsansed.org,,,,,,(07) 4147 7419,(05) 3223 3586,,,1795 In Avenue,Norton,AU,en,,,
+14,manual,0,BreeHess,test,,James,Campos,fringilla@metusvitaevelit.ca,,,,,,(06) 5346 3252,(00) 6667 6176,,,5910 Aliquam Ave,Williamsport,AU,en,,,
+15,manual,1,AimeeLuna,test,,Preston,Oneill,lectus.convallis@lectusa.edu,,,,,,(05) 1867 8735,(04) 4700 7952,,,P.O. Box 449 2405 Blandit St.,Durango,AU,en,,,
+16,manual,1,RinaHarris,test,,Melinda,Johnson,et.netus.et@lacinia.com,,,,,,(00) 4117 9659,(02) 8359 2194,,,781-9145 Lacus. Rd.,Peoria,AU,en,,,
+17,manual,0,LilahOneal,test,,Aurora,Slater,Curae;.Donec@natoquepenatibus.org,,,,,,(05) 6740 1704,(08) 5256 9815,,,Ap #449-7950 Phasellus St.,Loudon,AU,en,,,
+18,manual,0,ArethaMurray,test,,Channing,Livingston,in.tempus.eu@facilisis.edu,,,,,,(08) 9516 6244,(08) 3188 2982,,,192-4359 Ac Av.,Bozeman,AU,en,,,
+19,manual,1,JamesWoodard,test,,Whitney,Beck,Aliquam@sodales.com,,,,,,(01) 1147 1337,(01) 8887 4132,,,Ap #366-8429 Lacus. St.,La Puente,AU,en,,,
+20,manual,0,SheilaHerring,test,,Tanek,Buckner,ornare.Fusce.mollis@egetlaoreetposuere.ca,,,,,,(06) 2987 5030,(02) 6449 6876,,,P.O. Box 975 6899 Egestas Avenue,New London,AU,en,,,
+21,manual,1,PenelopeRodriguez,test,,Shaine,Weber,consectetuer.adipiscing.elit@diamDuismi.ca,,,,,,(06) 6787 7986,(06) 6854 2994,,,P.O. Box 566 5021 Nullam St.,Jenks,AU,en,,,
+22,manual,1,BreeDixon,test,,Linda,Russo,Phasellus@suscipit.com,,,,,,(09) 5018 1758,(04) 6271 2268,,,317-6333 Diam Av.,Kent,AU,en,,,
+23,manual,0,DominiqueHale,test,,Honorato,Olson,rutrum.justo.Praesent@sagittis.org,,,,,,(06) 7014 1238,(02) 3301 6159,,,287-3327 Eget Rd.,Rohnert Park,AU,en,,,
+24,manual,1,RafaelWhitaker,test,,Garth,Moss,ac@dui.edu,,,,,,(00) 3157 5733,(03) 8448 8786,,,687-9088 Pede Avenue,Concord,AU,en,,,
+25,manual,1,ArielGraham,test,,Christopher,Becker,pede@Integersemelit.ca,,,,,,(07) 5913 5794,(08) 5006 8839,,,829 Ac St.,Shawnee,AU,en,,,
+26,manual,0,AliceMacias,test,,Clementine,Osborn,ac.tellus@utlacus.com,,,,,,(05) 9756 8754,(04) 2458 7143,,,2923 Molestie St.,Moline,AU,en,,,
+27,manual,0,MaiteHansen,test,,Nell,Maddox,enim@velnislQuisque.ca,,,,,,(06) 5012 2556,(01) 8327 2071,,,P.O. Box 327 6655 Tellus Rd.,Covina,AU,en,,,
+28,manual,1,DemetriaHart,test,,Clarke,Malone,aliquet.libero@euplacerat.ca,,,,,,(00) 1156 2705,(03) 5166 2722,,,1419 Massa. Avenue,Medford,AU,en,,,
+29,manual,1,MedgeMalone,test,,Dustin,Sharpe,adipiscing@molestietellusAenean.org,,,,,,(02) 5878 5256,(03) 2729 1434,,,5925 Ac Ave,McKeesport,AU,en,,,
+30,manual,0,HerrodFlynn,test,,Illana,Osborn,ipsum.Phasellus@Duis.edu,,,,,,(08) 2546 5592,(07) 9806 9153,,,437-6559 Semper Rd.,Elko,AU,en,,,
+31,manual,1,IrisPatel,test,,Vivian,Wade,sagittis@molestietellusAenean.edu,,,,,,(08) 7755 4957,(08) 4025 9527,,,4592 Quisque Road,Brunswick,AU,en,,,
+32,manual,1,ZacheryEnglish,test,,Georgia,Flowers,nunc@atpretiumaliquet.ca,,,,,,(02) 1381 3822,(06) 3072 5030,,,179-5643 Sed Av.,Grand Island,AU,en,,,
+33,manual,0,HilelVazquez,test,,Lester,Clark,enim@Morbiquisurna.ca,,,,,,(02) 8935 3794,(09) 6220 4053,,,918-1768 Turpis. Ave,North Charleston,AU,en,,,
+34,manual,0,ActonOwen,test,,Ima,Beck,rutrum@ligulaDonecluctus.com,,,,,,(09) 1691 7961,(02) 5648 4433,,,P.O. Box 283 7606 Est Road,New Brunswick,AU,en,,,
+35,manual,1,JacksonNoel,test,,Brian,Rodgers,magna.Phasellus@sempertellusid.ca,,,,,,(04) 5434 5018,(00) 6881 8752,,,Ap #427-799 Sollicitudin St.,Decatur,AU,en,,,
+36,manual,1,UrielleMorrison,test,,Avye,Davidson,ullamcorper.Duis@rhoncusDonecest.ca,,,,,,(04) 2392 1761,(02) 2146 2165,,,112-2355 Libero St.,Independence,AU,en,,,
+37,manual,0,GrahamCraig,test,,Xerxes,Mullins,Duis.ac.arcu@amet.com,,,,,,(02) 2844 7812,(03) 3515 1387,,,245-1493 Mauris Rd.,Watertown,AU,en,,,
+38,manual,0,CraigBuck,test,,Savannah,Romero,justo.eu.arcu@mollisvitae.edu,,,,,,(06) 6413 6736,(09) 2213 8035,,,P.O. Box 160 5531 Faucibus Road,Signal Hill,AU,en,,,
+39,manual,1,YeoCarson,test,,Keiko,Patton,natoque.penatibus.et@sodalespurusin.ca,,,,,,(09) 3576 9809,(05) 3408 1245,,,Ap #624-3292 Vulputate St.,Pine Bluff,AU,en,,,
+40,manual,1,KaiRobles,test,,Aiko,Bradshaw,Nulla.interdum@fames.ca,,,,,,(01) 5038 7688,(05) 8452 1261,,,P.O. Box 978 7511 Posuere Av.,Belpre,AU,en,,,
+41,manual,0,NevadaFaulkner,test,,Perry,Duffy,pellentesque.a.facilisis@utnullaCras.ca,,,,,,(09) 2290 8488,(05) 4814 1502,,,P.O. Box 813 4025 Risus St.,Indianapolis,AU,en,,,
+42,manual,1,GretchenParrish,test,,Jasmine,Luna,dapibus@eleifendnon.ca,,,,,,(02) 8855 9204,(01) 6241 5620,,,Ap #293-3429 Magnis Street,Boise,AU,en,,,
+43,manual,0,OctaviusMcknight,test,,Cruz,Yates,massa.lobortis.ultrices@dolordolor.ca,,,,,,(00) 8336 2884,(01) 5606 8900,,,969-1084 Amet St.,Everett,AU,en,,,
+44,manual,1,EvangelineWeeks,test,,Regan,Glenn,Sed.neque@et.org,,,,,,(09) 9479 4147,(02) 1718 7692,,,P.O. Box 586 829 Euismod Av.,Oswego,AU,en,,,
+45,manual,0,HolmesMclean,test,,Fatima,Kim,vel.quam.dignissim@quis.edu,,,,,,(00) 2583 2779,(07) 7276 1314,,,1717 Etiam Rd.,Valdosta,AU,en,,,
+46,manual,1,JonahMassey,test,,Kane,Roberson,velit@mauriselitdictum.edu,,,,,,(07) 4732 6592,(05) 7518 2288,,,8858 Morbi St.,Allentown,AU,en,,,
+47,manual,1,MannixHead,test,,Nicole,Becker,dolor.quam.elementum@duiaugue.org,,,,,,(05) 2113 6523,(02) 1075 9578,,,P.O. Box 203 7026 Convallis St.,Enid,AU,en,,,
+48,manual,1,ZenaMathis,test,,Phelan,Saunders,enim.commodo.hendrerit@facilisislorem.com,,,,,,(02) 6102 2278,(07) 9890 3424,,,P.O. Box 624 7962 Erat Ave,Franklin,AU,en,,,
+49,manual,0,DrakeStrong,test,,Vaughan,Bryant,Morbi.neque@adipiscinglobortisrisus.edu,,,,,,(09) 7787 6351,(05) 4728 3996,,,P.O. Box 748 3303 Erat. Ave,Sherrill,AU,en,,,
+50,manual,1,PatrickEaton,test,,Solomon,Church,dolor.sit@odio.com,,,,,,(02) 2023 5044,(00) 7227 1679,,,545-1745 Sed St.,Marquette,AU,en,,,
+51,manual,0,YoshiJustice,test,,Brynne,Moses,mauris.elit@Proinmi.com,,,,,,(09) 6211 9234,(04) 8378 7422,,,2109 Nunc. Road,Manchester,AU,en,,,
+52,manual,1,ClarkeCantu,test,,Emerald,Cervantes,lectus.pede@elitafeugiat.com,,,,,,(02) 2349 1442,(04) 7635 6969,,,Ap #202-2439 Nullam Road,Athens,AU,en,,,
+53,manual,1,DaquanHorton,test,,Acton,Langley,purus.Nullam.scelerisque@vulputate.edu,,,,,,(00) 8632 5915,(02) 6402 7954,,,Ap #896-3104 Dolor Road,Cumberland,AU,en,,,
+54,manual,1,TuckerBurgess,test,,Isabelle,Trevino,lorem@Suspendissealiquet.org,,,,,,(07) 3962 5712,(08) 2860 1876,,,Ap #245-2486 Enim. St.,Dalton,AU,en,,,
+55,manual,1,FullerClayton,test,,Dai,Reed,tempor@bibendum.org,,,,,,(04) 2593 1040,(08) 9370 9193,,,332-2765 Molestie St.,Saint Paul,AU,en,,,
+56,manual,1,AxelMitchell,test,,Noel,Phillips,mauris@mattisornarelectus.com,,,,,,(00) 7168 4613,(01) 9635 4785,,,P.O. Box 637 6345 Risus Rd.,Compton,AU,en,,,
+57,manual,0,LucyGreer,test,,Ciaran,Wilcox,dignissim@leoMorbineque.ca,,,,,,(04) 7661 9356,(04) 6622 7336,,,867-3078 Risus Rd.,Batavia,AU,en,,,
+58,manual,0,AliceRoman,test,,Russell,Mendoza,et@etarcuimperdiet.ca,,,,,,(09) 1319 9708,(02) 8744 5000,,,942-3942 Dolor. Rd.,Port Arthur,AU,en,,,
+59,manual,0,RinaBeach,test,,Nola,Jefferson,non@luctusaliquet.com,,,,,,(05) 3531 1831,(08) 4627 7435,,,106 Non Ave,Aliquippa,AU,en,,,
+60,manual,0,AustinBlanchard,test,,Beatrice,Buck,interdum.ligula.eu@ultricies.com,,,,,,(03) 1818 8493,(09) 9461 7392,,,Ap #955-8074 Sed St.,Pascagoula,AU,en,,,
+61,manual,0,VivianCallahan,test,,Risa,Lambert,imperdiet.erat.nonummy@mi.org,,,,,,(08) 6869 6444,(08) 6357 6741,,,9860 Mi Ave,Winnemucca,AU,en,,,
+62,manual,1,SteelGoodman,test,,Quentin,Carney,augue@ametfaucibusut.org,,,,,,(04) 7540 8325,(02) 2122 2677,,,3450 Malesuada Rd.,Annapolis,AU,en,,,
+63,manual,0,EmeryRandall,test,,Rachel,Henry,eu.tellus@duinectempus.edu,,,,,,(03) 4194 7641,(01) 7951 2387,,,665-1453 Accumsan Rd.,Yukon,AU,en,,,
+64,manual,1,UmaMurphy,test,,Nathaniel,Meyer,auctor.Mauris@In.ca,,,,,,(04) 8469 7940,(02) 5507 8148,,,P.O. Box 420 6272 Cras Road,Johnson City,AU,en,,,
+65,manual,0,KellyRutledge,test,,Clementine,Fischer,eu.augue.porttitor@mi.com,,,,,,(03) 5899 6068,(05) 6154 3005,,,P.O. Box 882 9530 Fames Street,Marshall,AU,en,,,
+66,manual,1,AltheaPope,test,,Amir,Solis,nec@orciUt.edu,,,,,,(06) 1249 9761,(01) 7511 3580,,,Ap #657-3808 Porttitor St.,Appleton,AU,en,,,
+67,manual,1,LeonardBuchanan,test,,Laura,Carpenter,arcu.Curabitur@dictumProin.org,,,,,,(04) 8873 3925,(05) 4504 1266,,,P.O. Box 440 296 Eget Road,Clearwater,AU,en,,,
+68,manual,1,KarenRamos,test,,Nissim,Lane,facilisis.Suspendisse@Donecvitaeerat.edu,,,,,,(04) 6866 5273,(07) 7610 9546,,,P.O. Box 133 9115 Aliquam St.,Worland,AU,en,,,
+69,manual,1,LoisFields,test,,Glenna,Farmer,neque@placerat.edu,,,,,,(02) 9287 3158,(06) 7442 3625,,,Ap #340-8064 Nam Rd.,Truth or Consequences,AU,en,,,
+70,manual,1,KylanJacobson,test,,Chadwick,Delaney,suscipit.est.ac@molestiesodales.ca,,,,,,(02) 7424 9186,(03) 2040 9298,,,195-2623 Justo. Av.,Indianapolis,AU,en,,,
+71,manual,0,BreeBruce,test,,Martin,Paul,non@sedliberoProin.com,,,,,,(01) 5063 4682,(08) 1253 4339,,,7698 Praesent Ave,Las Vegas,AU,en,,,
+72,manual,0,RonanPruitt,test,,Georgia,Palmer,augue.eu@Nulla.edu,,,,,,(07) 7874 7429,(05) 1259 8932,,,3800 Gravida Ave,Narragansett,AU,en,,,
+73,manual,1,AmberYoung,test,,Cassidy,Welch,In@lacusEtiambibendum.com,,,,,,(05) 1362 5043,(07) 4202 1731,,,632-5186 Suspendisse Street,New London,AU,en,,,
+74,manual,1,CullenLeonard,test,,Alfreda,Horn,conubia.nostra.per@id.edu,,,,,,(03) 3642 1305,(09) 3421 6465,,,153-5390 Egestas. Street,Walla Walla,AU,en,,,
+75,manual,1,JaelNavarro,test,,Summer,Mcclure,eu@luctus.com,,,,,,(01) 9026 4298,(06) 4528 9934,,,9444 Faucibus Av.,Rutland,AU,en,,,
+76,manual,1,AlanaDorsey,test,,Fiona,Lawrence,ornare.sagittis.felis@Sedid.edu,,,,,,(09) 4995 9847,(00) 2406 2705,,,P.O. Box 222 9741 Mauris Road,Miami Beach,AU,en,,,
+77,manual,1,DariusJoyner,test,,Belle,Oneal,Proin@eteros.com,,,,,,(03) 1168 1699,(05) 2890 3738,,,3671 Lacus. Ave,Somersworth,AU,en,,,
+78,manual,1,IvoryMelton,test,,Warren,Willis,elit.Aliquam@amet.ca,,,,,,(02) 1989 2372,(06) 5895 7485,,,874-1689 A Avenue,Riverside,AU,en,,,
+79,manual,0,ArielJensen,test,,Rashad,Vincent,luctus.ut@pede.ca,,,,,,(06) 2286 6234,(04) 5323 9606,,,7131 Lobortis Street,Stanton,AU,en,,,
+80,manual,1,TamaraFoster,test,,Keegan,Haynes,ornare.libero.at@ac.ca,,,,,,(03) 2762 7021,(07) 5493 5738,,,9677 Phasellus St.,North Adams,AU,en,,,
+81,manual,0,KyleeFischer,test,,Byron,Dean,aliquet.metus.urna@dolor.ca,,,,,,(05) 2339 7567,(09) 8432 8453,,,P.O. Box 499 9897 Et St.,Baldwin Park,AU,en,,,
+82,manual,0,KaseemReyes,test,,Naomi,Giles,adipiscing.fringilla.porttitor@magnis.com,,,,,,(04) 6657 4255,(07) 1996 2463,,,437-7680 Cursus. Rd.,Beacon,AU,en,,,
+83,manual,1,MufutauKerr,test,,Emma,Blankenship,Donec.consectetuer.mauris@rutrum.com,,,,,,(01) 3114 8049,(05) 3052 7318,,,Ap #554-9210 Lorem St.,Auburn Hills,AU,en,,,
+84,manual,1,OctaviaLott,test,,Jenette,Britt,auctor.velit.eget@ante.ca,,,,,,(06) 8017 5642,(08) 8533 6682,,,2368 Lacinia St.,Vancouver,AU,en,,,
+85,manual,1,JaelDorsey,test,,Violet,French,condimentum.eget.volutpat@Fuscefeugiat.edu,,,,,,(00) 2561 1519,(01) 3109 9851,,,P.O. Box 695 177 Aliquet Ave,Cicero,AU,en,,,
+86,manual,1,ZoeSalazar,test,,Ginger,Dudley,eget@tempusrisus.edu,,,,,,(04) 9597 3899,(08) 8550 2069,,,P.O. Box 451 392 Etiam Street,Temple City,AU,en,,,
+87,manual,0,ChancellorRay,test,,Matthew,Glover,vel.est.tempor@mieleifend.ca,,,,,,(04) 8626 6657,(00) 1078 7877,,,425-1352 Vel Ave,Daly City,AU,en,,,
+88,manual,0,PhoebeDillard,test,,Willa,Potts,convallis.est@sagittis.ca,,,,,,(06) 3549 8028,(04) 9901 4559,,,P.O. Box 535 1355 Quam Rd.,New Bedford,AU,en,,,
+89,manual,1,IvorJohnson,test,,Gisela,Collins,non.dui@enimcommodohendrerit.com,,,,,,(09) 9847 9225,(09) 2899 3827,,,P.O. Box 411 8361 Pellentesque. Road,Corinth,AU,en,,,
+90,manual,1,KatellPreston,test,,Ingrid,Holcomb,metus@pedeNuncsed.edu,,,,,,(08) 6549 2704,(07) 7884 6019,,,631-981 Netus St.,West Palm Beach,AU,en,,,
+91,manual,1,TuckerShepard,test,,Colorado,Oconnor,ac@sedleo.org,,,,,,(07) 9191 3502,(03) 9563 1267,,,Ap #490-6519 Est St.,LaGrange,AU,en,,,
+92,manual,1,IndiraMann,test,,Olympia,Hansen,arcu.Vestibulum@magnaatortor.com,,,,,,(04) 6551 2796,(04) 4165 5667,,,P.O. Box 324 3023 Eu Avenue,Dalton,AU,en,,,
+93,manual,0,DaceyKing,test,,Bevis,Witt,rutrum.eu@tellusnonmagna.org,,,,,,(09) 1133 2706,(01) 8513 5210,,,5999 Diam Ave,Duarte,AU,en,,,
+94,manual,1,DeniseSmith,test,,Halla,Beasley,eget.venenatis.a@ligulaeu.org,,,,,,(00) 8069 2515,(05) 2398 2095,,,312-2526 Aliquam St.,Ketchikan,AU,en,,,
+95,manual,1,KionaPark,test,,Ruby,Mcfarland,feugiat.placerat@dapibus.com,,,,,,(06) 4966 1622,(07) 9386 4992,,,516-4865 Tincidunt Rd.,Fremont,AU,en,,,
+96,manual,0,GarrettGentry,test,,Blossom,Sherman,ligula.Nullam@magna.org,,,,,,(00) 8236 3649,(02) 5369 1091,,,352-6296 Lectus Ave,El Paso,AU,en,,,
+97,manual,1,HopCruz,test,,Zeus,Osborn,est.Nunc@non.ca,,,,,,(00) 2698 3154,(02) 3879 4419,,,Ap #133-748 A Ave,Lahaina,AU,en,,,
+98,manual,1,OrsonKane,test,,Josiah,Vazquez,mi@sempertellus.ca,,,,,,(06) 1993 5621,(07) 9815 6079,,,442 Penatibus Street,Merced,AU,en,,,
+99,manual,1,EatonAlvarado,test,,Teegan,Curry,id.nunc@dapibusligulaAliquam.ca,,,,,,(04) 4824 6003,(06) 7029 8741,,,Ap #635-8275 Semper Road,Hammond,AU,en,,,
+100,manual,0,AidanHicks,test,,Bevis,Alston,congue.elit@lacusEtiambibendum.ca,,,,,,(00) 1662 9400,(09) 5933 1946,,,Ap #950-1916 Arcu. Rd.,Kenosha,AU,en,,,

mod/data/view.php

@@ -559,7 +559,7 @@ if ($showactivity) {
                 $where .= ' AND u.id = ' . $USER->id;
                 $params['myid2'] = $USER->id;
             }
-
+            $i = 0;
             if (!empty($advanced)) {                                                  //If advanced box is checked.
                 foreach($search_array as $key => $val) {                              //what does $search_array hold?
                     if ($key == DATA_FIRSTNAME or $key == DATA_LASTNAME) {
@@ -586,30 +586,34 @@ if ($showactivity) {
     /// To actually fetch the records
 
         $fromsql    = "FROM $tables $advtables $where $advwhere $groupselect $approveselect $searchselect $advsearchselect";
-        $sqlselect  = "SELECT $what $fromsql $sortorder";
         $sqlcount   = "SELECT $count $fromsql";   // Total number of records when searching
         $sqlmax     = "SELECT $count FROM $tables $where $groupselect $approveselect"; // number of all recoirds user may see
         $allparams  = array_merge($params, $advparams);
 
-    /// Work out the paging numbers and counts
+        $recordids = data_get_all_recordids($data->id);
+        $newrecordids = data_get_advance_search_ids($recordids, $search_array, $data->id);
+        $totalcount = (count($newrecordids));
+        $selectdata = $groupselect . $approveselect;
 
-        $totalcount = $DB->count_records_sql($sqlcount, $allparams);
+        if (!empty($advanced)) {
+            $advancedsearchsql = data_get_advanced_search_sql($sort, $data, $newrecordids, $selectdata, $sortorder);
+            $sqlselect = $advancedsearchsql['sql'];
+            $allparams = array_merge($allparams, $advancedsearchsql['params']);
+        } else {
+            $sqlselect  = "SELECT $what $fromsql $sortorder";
+        }
+
+        /// Work out the paging numbers and counts
         if (empty($searchselect) && empty($advsearchselect)) {
             $maxcount = $totalcount;
         } else {
-            $maxcount = $DB->count_records_sql($sqlmax, $params);
+            $maxcount = count($recordids);
         }
 
         if ($record) {     // We need to just show one, so where is it in context?
             $nowperpage = 1;
             $mode = 'single';
-
-            $page = 0;
-            // TODO: Improve this because we are executing $sqlselect twice (here and some lines below)!
-            if ($allrecordids = $DB->get_fieldset_sql($sqlselect, $allparams)) {
-                $page = (int)array_search($record->id, $allrecordids);
-                unset($allrecordids);
-            }
+            $page = (int)array_search($record->id, $recordids);
 
         } else if ($mode == 'single') {  // We rely on ambient $page settings
             $nowperpage = 1;