Changeset 33291

Timestamp:

12/22/11 09:12:31 (1 year ago)

Author:

garak

Message:

[sfSphinxPlugin] updated main lib to version 2.0.2-beta

Files:

• plugins/sfSphinxPlugin/trunk/lib/sfSphinxClient.class.php (modified) (10 diffs, 1 prop)

plugins/sfSphinxPlugin/trunk/lib/sfSphinxClient.class.php

@@ -2 +2 @@
-/**
- * This file is derived from PHP API of the sfSphinx package.
-0
-7      Rick Olson <rick@napalmriot.com>
-0
+1
+8-2011 Sphinx Technologies Inc
+1
- *
- * For the full copyright and license information, please view the LICENSE
@@ -17 +17 @@
- * @package    sfSphinxPlugin
- * @author     Massimiliano Arione <garakkio@gmail.com>
+ * @version    SVN: $Id$
- */
-class sfSphinxClient
@@ -32 +33 @@
-
-  // current client-side command implementation versions
-7
-2
+9
+4
-  const VER_COMMAND_UPDATE     = 0x102;
-  const VER_COMMAND_KEYWORDS   = 0x100;
@@ -65 +66 @@
-  const SPH_RANK_FIELDMASK      = 6;
-  const SPH_RANK_SPH04          = 7;
-
+
+
-
-  // known sort modes
@@ -88 +90 @@
-  const SPH_ATTR_BIGINT    = 6;
-  const SPH_ATTR_STRING    = 7;
-
+
+
-
-  // known grouping functions
@@ -156 +159 @@
-      'sortby'        => '',
-      'min_id'        => 0,
-xFFFFFFFF
+
-      'filters'       => array(),
-      'groupby'       => '',
@@ -549 +552 @@
-
-  /**
+   * @param  integer
+   * @return integer
+   */
+  private function sphFixUint($value)
+  {
+    if (PHP_INT_SIZE >= 8)
+    {
+      // x64 route, workaround broken unpack() in 5.2.2+
+      if ($value < 0)
+      {
+        $value += (1 << 32);
+      }
+
+      return $value;
+    }
+    else
+    {
+      // x32 route, workaround php signed/unsigned braindamage
+      return sprintf('%u', $value);
+    }
+  }
+
+  /**
-   * check if there's an error or not
-   * @return string
@@ -1377 +1403 @@
-          list($doc, $weight) = array_values(unpack('N*N*', substr($response, $p, 8)));
-          $p += 8;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-        $weight = sprintf('%u', $weight);
@@ -1437 +1450 @@
-              list(, $val) = unpack('N*', substr($response, $p, 4));
-              $p += 4;
-sprintf('%u', 
+$this->sphFixUint(
-            }
-          }
@@ -1447 +1460 @@
-          else
-          {
-sprintf('%u', 
+$this->sphFixUint(
-          }
-        }