|
@@ -169,12 +169,13 @@ class Base extends ControllerBase {
|
|
|
$this->or_query->keys(implode(' ', $this->keys));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- $exclude_and_results_conditions = $this->or_query->createConditionGroup('AND');
|
|
|
- foreach ($this->results['nids'] as $nid) {
|
|
|
- $exclude_and_results_conditions->addCondition('nid', $nid, '<>');
|
|
|
- }
|
|
|
- $this->or_query->addConditionGroup($exclude_and_results_conditions);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
if (preg_match_all('/[WTRPCMFGSO]\d{4}/i', implode(' ', $this->keys), $matches)) {
|
|
|
|
|
@@ -226,8 +227,12 @@ class Base extends ControllerBase {
|
|
|
$or_results = $this->or_query->execute();
|
|
|
|
|
|
foreach ($or_results as $result) {
|
|
|
- $this->results['uuids'][] = $result->getField('uuid')->getValues()[0];
|
|
|
- $this->results['nids'][] = $result->getField('nid')->getValues()[0];
|
|
|
+ $nid = $result->getField('nid')->getValues()[0];
|
|
|
+
|
|
|
+ if ( !in_array($nid, $this->results['nids']) ) {
|
|
|
+ $this->results['uuids'][] = $result->getField('uuid')->getValues()[0];
|
|
|
+ $this->results['nids'][] = $nid;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|