|
@@ -120,7 +120,7 @@ discard block |
|
|
block discarded – undo |
120
|
120
|
$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery( |
121
|
121
|
'tx_dlf_collections.index_name AS index_name, tx_dlf_collections.index_search as index_query, tx_dlf_collections.uid AS uid,tx_dlf_collections.label AS label,tx_dlf_collections.thumbnail AS thumbnail,tx_dlf_collections.description AS description,tx_dlf_collections.priority AS priority', |
122
|
122
|
'tx_dlf_collections', |
123
|
|
- $selectedCollections . $showUserDefinedCollections .' AND tx_dlf_collections.pid='.intval($this->conf['pages']). tx_dlf_helper::whereClause('tx_dlf_collections'), |
|
123
|
+ $selectedCollections.$showUserDefinedCollections.' AND tx_dlf_collections.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_collections'), |
124
|
124
|
'', |
125
|
125
|
$orderBy, |
126
|
126
|
'' |
|
@@ -152,15 +152,15 @@ discard block |
|
|
block discarded – undo |
152
|
152
|
$solr_query = ''; |
153
|
153
|
|
154
|
154
|
if ($collection['index_query'] != "") { |
155
|
|
- $solr_query .= '(' . $collection['index_query'] . ')'; |
|
155
|
+ $solr_query .= '('.$collection['index_query'].')'; |
156
|
156
|
} else { |
157
|
|
- $solr_query .= 'collection:' . '"' . $collection['index_name'] .'"'; |
|
157
|
+ $solr_query .= 'collection:'.'"'.$collection['index_name'].'"'; |
158
|
158
|
} |
159
|
159
|
|
160
|
|
- $partOfNothing = $solr->search_raw($solr_query . ' partof:0', $parameters); |
161
|
|
- $partOfSomething = $solr->search_raw($solr_query . ' AND NOT partof:0', $parameters); |
|
160
|
+ $partOfNothing = $solr->search_raw($solr_query.' partof:0', $parameters); |
|
161
|
+ $partOfSomething = $solr->search_raw($solr_query.' AND NOT partof:0', $parameters); |
162
|
162
|
|
163
|
|
- $titles = array(); |
|
163
|
+ $titles = array (); |
164
|
164
|
|
165
|
165
|
foreach ($partOfNothing as $doc) { |
166
|
166
|
$titles[] = $doc->uid; |
|
@@ -283,7 +283,7 @@ discard block |
|
|
block discarded – undo |
283
|
283
|
$collection = $GLOBALS['TYPO3_DB']->exec_SELECTquery( |
284
|
284
|
'tx_dlf_collections.index_name AS index_name, tx_dlf_collections.index_search as index_query, tx_dlf_collections.label AS collLabel, tx_dlf_collections.description AS collDesc, tx_dlf_collections.thumbnail AS collThumb, tx_dlf_collections.fe_cruser_id', |
285
|
285
|
'tx_dlf_collections', |
286
|
|
- 'tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.uid='. intval($id) . ' ' . $additionalWhere . tx_dlf_helper::whereClause('tx_dlf_collections'), |
|
286
|
+ 'tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.uid='.intval($id).' '.$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_collections'), |
287
|
287
|
'', |
288
|
288
|
'', |
289
|
289
|
'1' |
|
@@ -293,9 +293,9 @@ discard block |
|
|
block discarded – undo |
293
|
293
|
$solr_query = ""; |
294
|
294
|
while ($collectionData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($collection)) { |
295
|
295
|
if ($collectionData['index_query'] != "") { |
296
|
|
- $solr_query .= '(' . $collectionData['index_query'] . ')'; |
|
296
|
+ $solr_query .= '('.$collectionData['index_query'].')'; |
297
|
297
|
} else { |
298
|
|
- $solr_query .= 'collection:' . '"' . $collectionData['index_name'] . '"'; |
|
298
|
+ $solr_query .= 'collection:'.'"'.$collectionData['index_name'].'"'; |
299
|
299
|
} |
300
|
300
|
} |
301
|
301
|
|
|
@@ -312,7 +312,7 @@ discard block |
|
|
block discarded – undo |
312
|
312
|
$documents = $GLOBALS['TYPO3_DB']->exec_SELECTquery( |
313
|
313
|
'tx_dlf_documents.uid AS uid, tx_dlf_documents.metadata_sorting AS metadata_sorting, tx_dlf_documents.volume_sorting AS volume_sorting, tx_dlf_documents.partof AS partof', |
314
|
314
|
'tx_dlf_documents', |
315
|
|
- 'tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.uid IN (' . implode(',', $documentSet).')' . $additionalWhere . tx_dlf_helper::whereClause('tx_dlf_documents'), |
|
315
|
+ 'tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.uid IN ('.implode(',', $documentSet).')'.$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_documents'), |
316
|
316
|
'', |
317
|
317
|
'', |
318
|
318
|
'' |