Changeset 3003a0c0d5bbc65f6c4134bf7f96d20eaaa65339

Timestamp:

10/08/11 11:56:05 (8 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

3ee918f972a91be207cf67e3793a87a5cce5e711

Parents:

5511ea68dc1694dc8f00a8a4e8fb8b2973bdf048

git-author:

Xemle <xemle@phtagr.org> / 2011-10-08T11:48:14Z+0200

git-committer:

Xemle <xemle@phtagr.org> / 2011-10-08T11:56:05Z+0200

Message:

Improve negated autocomplete of explorer

Files:

• controllers/explorer_controller.php (modified) (8 diffs)

controllers/explorer_controller.php

@@ -220 +220 @@
   function _getAssociation($type, $value) {
     $result = array();
+    $isNegated = false;
+    $normalized = $value;
+    if ($value && $value[0] = '-') {
+      $normalized = trim(substr($value, 1));
+      $isNegated = true;
+    }
+    if (!$normalized) {
+      return $result;
+    }
     switch ($type) {
       case 'tag':
         $data = $this->Media->Tag->find('all', array(
-          'conditions' => array('name LIKE' => $value.'%'), 
+          'conditions' => array('name LIKE' => $normalized.'%'), 
           'limit' => 10
           ));
@@ -230 +239 @@
       case 'category':
         $data = $this->Media->Category->find('all', array(
-          'conditions' => array('name LIKE' => $value.'%'),
+          'conditions' => array('name LIKE' => $normalized.'%'),
           'limit' => 10
           ));
@@ -237 +246 @@
       case 'location':
         $data = $this->Media->Location->find('all', array(
-          'conditions' => array('name LIKE' => $value.'%'),
+          'conditions' => array('name LIKE' => $normalized.'%'),
           'limit' => 10
           ));
@@ -244 +253 @@
       case 'city':
         $data = $this->Media->Location->find('all', array(
-          'conditions' => array('name LIKE' => $value.'%', 'type' => LOCATION_CITY),
+          'conditions' => array('name LIKE' => $normalized.'%', 'type' => LOCATION_CITY),
           'limit' => 10
           ));
@@ -251 +260 @@
       case 'sublocation':
         $data = $this->Media->Location->find('all', array(
-          'conditions' => array('name LIKE' => $value.'%', 'type' => LOCATION_SUBLOCATION),
+          'conditions' => array('name LIKE' => $normalized.'%', 'type' => LOCATION_SUBLOCATION),
           'limit' => 10
           ));
@@ -258 +267 @@
       case 'state':
         $data = $this->Media->Location->find('all', array(
-          'conditions' => array('name LIKE' => $value.'%', 'type' => LOCATION_STATE),
+          'conditions' => array('name LIKE' => $normalized.'%', 'type' => LOCATION_STATE),
           'limit' => 10
           ));
@@ -265 +274 @@
       case 'country':
         $data = $this->Media->Location->find('all', array(
-          'conditions' => array('name LIKE' => $value.'%', 'type' => LOCATION_COUNTRY),
+          'conditions' => array('name LIKE' => $normalized.'%', 'type' => LOCATION_COUNTRY),
           'limit' => 10
           ));
@@ -288 +297 @@
         $this->redirect(404);
         break;
+    }
+    if ($isNegated && count($result)) {
+      $tmp = array();
+      foreach ($result as $name) {
+        $tmp[] = '-' . $name;
+      }
+      $result = $tmp;
     }
     return $result;