Merge branch 'master' into 0.9.x

Conflicts:
	actions/publictagcloud.php
	classes/Memcached_DataObject.php

3 files changed, 162 insertions, 2 deletions

diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index b5b474f13..9e4478dbb 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -132,7 +132,6 @@ class PublictagcloudAction extends Action
             $this->elementStart('dd');
             $this->elementStart('ul', 'tags xoxo tag-cloud');
             foreach ($tw as $tag => $weight) {
-                common_log(LOG_DEBUG, "$weight/$sum");
                 if ($sum) {
                     $weightedSum = $weight/$sum;
                 } else {
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index a77e43d38..a3a69e667 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -21,7 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class Memcached_DataObject extends DB_DataObject
 {
-   /**
+    /**
      * Destructor to free global memory resources associated with
      * this data object when it's unset or goes out of scope.
      * DB_DataObject doesn't do this yet by itself.
@@ -36,6 +36,42 @@ class Memcached_DataObject extends DB_DataObject
     }
 
     /**
+     * Magic function called at serialize() time.
+     *
+     * We use this to drop a couple process-specific references
+     * from DB_DataObject which can cause trouble in future
+     * processes.
+     *
+     * @return array of variable names to include in serialization.
+     */
+    function __sleep()
+    {
+        $vars = array_keys(get_object_vars($this));
+        $skip = array('_DB_resultid', '_link_loaded');
+        return array_diff($vars, $skip);
+    }
+
+    /**
+     * Magic function called at unserialize() time.
+     *
+     * Clean out some process-specific variables which might
+     * be floating around from a previous process's cached
+     * objects.
+     *
+     * Old cached objects may still have them.
+     */
+    function __wakeup()
+    {
+        // Refers to global state info from a previous process.
+        // Clear this out so we don't accidentally break global
+        // state in *this* process.
+        $this->_DB_resultid = null;
+
+        // We don't have any local DBO refs, so clear these out.
+        $this->_link_loaded = false;
+    }
+
+    /**
      * Wrapper for DB_DataObject's static lookup using memcached
      * as backing instead of an in-process cache array.
      *
diff --git a/scripts/updatelocation.php b/scripts/updatelocation.php
new file mode 100644
index 000000000..4110660ab
--- /dev/null
+++ b/scripts/updatelocation.php
@@ -0,0 +1,125 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:af';
+$longoptions = array('id=', 'nickname=', 'all', 'force');
+
+$helptext = <<<END_OF_UPDATELOCATION_HELP
+updatelocation.php [options]
+set the location for a profile
+
+  -i --id       ID of user to update
+  -n --nickname nickname of the user to update
+  -f --force    force update even if user already has a location
+  -a --all      update all
+
+END_OF_UPDATELOCATION_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+try {
+    $user = null;
+
+    if (have_option('i', 'id')) {
+        $id = get_option_value('i', 'id');
+        $user = User::staticGet('id', $id);
+        if (empty($user)) {
+            throw new Exception("Can't find user with id '$id'.");
+        }
+        updateLocation($user);
+    } else if (have_option('n', 'nickname')) {
+        $nickname = get_option_value('n', 'nickname');
+        $user = User::staticGet('nickname', $nickname);
+        if (empty($user)) {
+            throw new Exception("Can't find user with nickname '$nickname'");
+        }
+        updateLocation($user);
+    } else if (have_option('a', 'all')) {
+        $user = new User();
+        if ($user->find()) {
+            while ($user->fetch()) {
+                updateLocation($user);
+            }
+        }
+    } else {
+        show_help();
+        exit(1);
+    }
+} catch (Exception $e) {
+    print $e->getMessage()."\n";
+    exit(1);
+}
+
+function updateLocation($user)
+{
+    $profile = $user->getProfile();
+
+    if (empty($profile)) {
+        throw new Exception("User has no profile: " . $user->nickname);
+    }
+
+    if (empty($profile->location)) {
+        if (have_option('v', 'verbose')) {
+            print "No location string for '".$user->nickname."'\n";
+        }
+        return;
+    }
+
+    if (!empty($profile->location_id) && !have_option('f', 'force')) {
+        if (have_option('v', 'verbose')) {
+            print "Location ID already set for '".$user->nickname."'\n";
+        }
+        return;
+    }
+
+    $loc = Location::fromName($profile->location);
+
+    if (empty($loc)) {
+        if (have_option('v', 'verbose')) {
+            print "No structured location for string '".$profile->location."' for user '".$user->nickname."'\n";
+        }
+        return;
+    } else {
+        $orig = clone($profile);
+
+        $profile->lat         = $loc->lat;
+        $profile->lon         = $loc->lon;
+        $profile->location_id = $loc->location_id;
+        $profile->location_ns = $loc->location_ns;
+
+        $result = $profile->update($orig);
+
+        if (!$result) {
+            common_log_db_error($profile, 'UPDATE', __FILE__);
+        }
+
+        if (!have_option('q', 'quiet')) {
+            print "Location ID " . $profile->location_id . " set for user " . $user->nickname . "\n";
+        }
+    }
+
+    $profile->free();
+    unset($loc);
+    unset($profile);
+
+    return;
+}