ZP-115

- added: implemented call to ISearchProvider->TerminateSearch() triggered on save of the device manager using process loop detection data

git-svn-id: https://z-push.org/svn/z-push/trunk@1322 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/lib/core/devicemanager.php

@@ -167,6 +167,12 @@ class DeviceManager {
             }
         }
 
+        // remove old search data
+        $oldpid = $this->loopdetection->ProcessLoopDetectionGetOutdatedSearchPID();
+        if ($oldpid) {
+            ZPush::GetBackend()->GetSearchProvider()->TerminateSearch($oldpid);
+        }
+
         // we terminated this process
         if ($this->loopdetection)
             $this->loopdetection->ProcessLoopDetectionTerminate();

src/lib/core/loopdetection.php

@@ -263,6 +263,26 @@ class LoopDetection extends InterProcessData {
         }
     }
 
+    /**
+     * Gets the PID of an outdated search process
+     *
+     * Returns false if there isn't any process
+     *
+     * @access public
+     * @return boolean
+     *
+     */
+    public function ProcessLoopDetectionGetOutdatedSearchPID() {
+        $stack = $this->getProcessStack();
+        if (count($stack) > 1) {
+            $se = $stack[0];
+            if ($se['cc'] == ZPush::COMMAND_SEARCH) {
+                return $se['pid'];
+            }
+        }
+        return false;
+    }
+
     /**
      * Inserts or updates the current process entry on the stack
      *