Changed fetchPopularTags to send request to Situare server instead of local DB

[situare] / src / situareservice / situarecommon.h

diff --git a/src/situareservice/situarecommon.h b/src/situareservice/situarecommon.h
index a341f9d..c5258d4 100644 (file)
--- a/src/situareservice/situarecommon.h
+++ b/src/situareservice/situarecommon.h
@@ -25,12 +25,16 @@
 #include <QString>
 
 // Situare server constants
-const QString SITUARE_URL = "http://client.situare.net/";
-const QString API_KEY = "4197c64da2fb6b927236feaea32d7d81";
-
-// Test server constants
-const QString SITUARE_TEST_URL = "http://emmerichgn.facebook.joyent.us/";
-const QString TEST_API_KEY = "cf77865a5070f2c2ba3b52cbf3371579";
+#ifdef USE_PRODUCTION_SERVER
+    // Production server
+    const QString SITUARE_URL = "http://client.situare.net/";
+    const QString API_KEY = "4197c64da2fb6b927236feaea32d7d81";
+#else
+    // Test server
+    const QString SITUARE_URL = "http://emmerichgn.facebook.joyent.us/";
+    const QString API_KEY = "cf77865a5070f2c2ba3b52cbf3371579";
+    const QString APP_ID = "286811277465";
+#endif
 
 // Situare JSON callback data
 const QString NORMAL_SIZE_PROFILE_IMAGE = "pic";
@@ -38,8 +42,12 @@ const QString NORMAL_SIZE_PROFILE_IMAGE = "pic";
 // Situare PHP scripts
 const QString UPDATE_LOCATION = "updateLocation.php";
 const QString REVERSE_GEO = "reversegeo.php";
-const QString GET_LOCATIONS =
-        QString("getLocations.php?extra_user_data=%1").arg(NORMAL_SIZE_PROFILE_IMAGE);
+const QString GET_LOCATIONS = "getLocations.php";
+const QString GET_MESSAGES = "getMessages.php";
+const QString SEND_MESSAGE = "sendMessage.php";
+const QString REMOVE_MESSAGE = "removeMessage.php";
+const QString GET_PEOPLE_WITH_SIMILAR_INTEREST = "getInterestingPeople.php";
+const QString GET_POPULAR_TAGS = "getPopularTags.php";
 
 // Cookies
 const QString COOKIE = "Cookie";