| Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_QueryResult.php |
| — | — | @@ -25,9 +25,6 @@ |
| 26 | 26 | protected $m_furtherres; // are there more results than the ones given? |
| 27 | 27 | // The following are not part of the result, but specify the input query (needed for further results link): |
| 28 | 28 | protected $m_query; // the query object, must be set on create and is our fallback for all other data |
| 29 | | - protected $m_querystring; // string (inline query) version of query |
| 30 | | - protected $m_extraprintouts; // the additional SMWPrintRequest objects specified outside $m_querystring |
| 31 | | - // Note: these may differ from m_printrequests, since they do not involve requests given in the querystring |
| 32 | 29 | |
| 33 | 30 | /** |
| 34 | 31 | * Initialise the object with an array of SMWPrintRequest objects, which |
| — | — | @@ -38,8 +35,6 @@ |
| 39 | 36 | $this->m_printrequests = $printrequests; |
| 40 | 37 | $this->m_furtherres = $furtherres; |
| 41 | 38 | $this->m_query = $query; |
| 42 | | - $this->m_querystring = $query->getQueryString(); |
| 43 | | - $this->m_extraprintouts = $query->getExtraPrintouts(); |
| 44 | 39 | } |
| 45 | 40 | |
| 46 | 41 | /** |
| — | — | @@ -74,8 +69,7 @@ |
| 75 | 70 | |
| 76 | 71 | |
| 77 | 72 | /** |
| 78 | | - * Return the next result row as an array of |
| 79 | | - * SMWResultArray objects. |
| | 73 | + * Return the next result row as an array of SMWResultArray objects. |
| 80 | 74 | */ |
| 81 | 75 | public function getNext() { |
| 82 | 76 | $result = current($this->m_content); |
| — | — | @@ -111,7 +105,7 @@ |
| 112 | 106 | * returned. |
| 113 | 107 | */ |
| 114 | 108 | public function getQueryString() { |
| 115 | | - return $this->m_querystring; |
| | 109 | + return $this->m_query->getQueryString(); |
| 116 | 110 | } |
| 117 | 111 | |
| 118 | 112 | /** |
| — | — | @@ -142,8 +136,8 @@ |
| 143 | 137 | * message 'smw_iq_moreresults' is used as a caption. |
| 144 | 138 | */ |
| 145 | 139 | public function getQueryLink($caption = false) { |
| 146 | | - $params = array(trim($this->m_querystring)); |
| 147 | | - foreach ($this->m_extraprintouts as $printout) { |
| | 140 | + $params = array(trim($this->m_query->getQueryString())); |
| | 141 | + foreach ($this->m_query->getExtraPrintouts() as $printout) { |
| 148 | 142 | $params[] = $printout->getSerialisation(); |
| 149 | 143 | } |
| 150 | 144 | if ( count($this->m_query->sortkeys)>0 ) { |
| — | — | @@ -234,8 +228,7 @@ |
| 235 | 229 | |
| 236 | 230 | |
| 237 | 231 | /** |
| 238 | | - * Would there be more query results that were |
| 239 | | - * not shown due to a limit? |
| | 232 | + * Would there be more query results that were not shown due to a limit? |
| 240 | 233 | */ |
| 241 | 234 | public function hasFurtherResults() { |
| 242 | 235 | return $this->furtherres; |