Changeset 6382

Timestamp:

Jun 16, 2016, 3:31:43 PM (8 years ago)

Author:

ldelgass

Message:

Use hub url if supplied to get idata URL

Location:

geovis/trunk

Files:

• IData.cpp (modified) (2 diffs)
• IData.h (modified) (1 diff)

geovis/trunk/IData.cpp

@@ -35 +35 @@
 };
 #endif
-static const char *serviceURL = "http://mygeohub.org/api/idata/collection/";
-static std::string g_iDataUsername;
+
+static const char *defaultHubURL = "https://mygeohub.org";
+static const std::string servicePath = "/api/idata/collection/";
+static std::string serviceURL;
+static std::string iDataUsername;
 
 using namespace IData;
 using namespace osgEarth;
 
-void IData::iDataInit(const char *username, const char *hub)
-{
-    TRACE("user: %s hub: %s", username, hub);
+void IData::iDataInit(const char *username, const char *hubURL)
+{
+    TRACE("user: %s hub: %s", username, hubURL);
     static bool first = true;
-    g_iDataUsername = username;
+    std::ostringstream oss;
+    std::string hubHost;
+    if (hubURL != NULL) {
+        hubHost = hubURL;
+    } else {
+        hubHost = defaultHubURL;
+    }
+    oss << hubHost << servicePath;
+    serviceURL = oss.str();
+    iDataUsername = username;
     if (first) {
         curl_global_init(CURL_GLOBAL_DEFAULT);
@@ -73 +85 @@
 {
     std::ostringstream oss;
-    oss << serviceURL << commandNames[cmd] << "?username=" << g_iDataUsername;
+    oss << serviceURL << commandNames[cmd] << "?username=" << iDataUsername;
     for (std::vector<std::string>::iterator itr = params.begin();
          itr != params.end(); ++itr) {

geovis/trunk/IData.h

@@ -67 +67 @@
 };
 
-extern void iDataInit(const char *username, const char *hub = NULL);
+extern void iDataInit(const char *username, const char *hubURL = NULL);
 extern void iDataCleanup();
 extern void getCollectionList(std::vector<Collection>& list);