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 8440c5f..c5258d4 100644 (file)
--- a/src/situareservice/situarecommon.h
+++ b/src/situareservice/situarecommon.h
@@ -25,16 +25,29 @@
 #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";
 
 // Situare PHP scripts
 const QString UPDATE_LOCATION = "updateLocation.php";
 const QString REVERSE_GEO = "reversegeo.php";
+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";
@@ -43,9 +56,6 @@ const QString EXPIRES = "expires";
 const QString SESSION_KEY = "session_key";
 const QString SESSION_SECRET = "ss";
 
-const QString USER_AGENT = "User-Agent";
-const QString AGENT = "Agent";
-
 // Locales
 const QString LOCALE = "locale";
 const QString EN_LOCALE = "en_EN";
@@ -56,6 +66,7 @@ const QString AMBERSAND_MARK = "&";
 const QString EQUAL_MARK = "=";
 const QString UNDERLINE_MARK = "_";
 const QString BREAK_MARK = ";";
+const QString OPENING_BRACE_MARK = "{";
 
 // Coordinates
 const QString LATITUDE = "lat";
@@ -66,10 +77,13 @@ const QString PUBLISH = "publish";
 const QString PUBLISH_TRUE = "true";
 const QString PUBLISH_FALSE = "false";
 const QString DATA = "data";
+const QString JSON_FORMAT = "&format=json";
 
-// Situare error messages
+// Situare server error messages
 const QString ERROR_LAT = "Wrong lat value: . Latitude must be between -90 and 90!";
 const QString ERROR_LON = "Wrong lon value: . Longitude must be between -180 and 180!";
 const QString ERROR_SESSION = "<br />\n<b>Fatal error</b>:"; // starts with
 
+const QString SILHOUETTE_URL = "http://static.ak.fbcdn.net/pics/q_silhouette.gif";
+
 #endif // SITUARECOMMON_H