Changeset 4383 for trunk/packages

Timestamp:

Jun 11, 2014, 2:44:37 PM (10 years ago)

Author:

ldelgass

Message:

Fix error message for missing file

File:

• trunk/packages/vizservers/geovis/RendererCmd.cpp (modified) (6 diffs)

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -785 +785 @@
         std::string url;
         if (objc > 6) {
-            url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[5])));
+            char *urlIn = Tcl_GetString(objv[5]);
+            url = g_renderer->getCanonicalPath(std::string(urlIn));
             if (url.empty()) {
                 Tcl_AppendResult(interp, "file not found: \"",
-                                 url.c_str(), "\"", (char*)NULL);
+                                 urlIn, "\"", (char*)NULL);
                 return TCL_ERROR;
             }
@@ -841 +842 @@
     } else if (type[0] == 'e' && strcmp(type, "elevation") == 0) {
         char *driver = Tcl_GetString(objv[4]);
-        std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[5])));
+        char *urlIn = Tcl_GetString(objv[5]);
+        std::string url = g_renderer->getCanonicalPath(std::string(urlIn));
         if (url.empty()) {
             Tcl_AppendResult(interp, "file not found: \"",
-                             url.c_str(), "\"", (char*)NULL);
+                             urlIn, "\"", (char*)NULL);
             return TCL_ERROR;
         }
@@ -869 +871 @@
     } else if (type[0] == 'p' && strcmp(type, "point") == 0) {
         osgEarth::Drivers::OGRFeatureOptions opts;
-        std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[4])));
+        char *urlIn = Tcl_GetString(objv[4]);
+        std::string url = g_renderer->getCanonicalPath(std::string(urlIn));
         if (url.empty()) {
             Tcl_AppendResult(interp, "file not found: \"",
-                             url.c_str(), "\"", (char*)NULL);
+                             urlIn, "\"", (char*)NULL);
             return TCL_ERROR;
         }
@@ -896 +899 @@
     } else if (type[0] == 'p' && strcmp(type, "polygon") == 0) {
         osgEarth::Drivers::OGRFeatureOptions opts;
-        std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[4])));
+        char *urlIn = Tcl_GetString(objv[4]);
+        std::string url = g_renderer->getCanonicalPath(std::string(urlIn));
         if (url.empty()) {
             Tcl_AppendResult(interp, "file not found: \"",
-                             url.c_str(), "\"", (char*)NULL);
+                             urlIn, "\"", (char*)NULL);
             return TCL_ERROR;
         }
@@ -921 +925 @@
     } else if (type[0] == 'l' && strcmp(type, "line") == 0) {
         osgEarth::Drivers::OGRFeatureOptions opts;
-        std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[4])));
+        char *urlIn = Tcl_GetString(objv[4]);
+        std::string url = g_renderer->getCanonicalPath(std::string(urlIn));
         if (url.empty()) {
             Tcl_AppendResult(interp, "file not found: \"",
-                             url.c_str(), "\"", (char*)NULL);
+                             urlIn, "\"", (char*)NULL);
             return TCL_ERROR;
         }
@@ -953 +958 @@
    } else if (type[0] == 't' && strcmp(type, "text") == 0) {
         osgEarth::Drivers::OGRFeatureOptions opts;
-        std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[4])));
+        char *urlIn = Tcl_GetString(objv[4]);
+        std::string url = g_renderer->getCanonicalPath(std::string(urlIn));
         if (url.empty()) {
             Tcl_AppendResult(interp, "file not found: \"",
-                             url.c_str(), "\"", (char*)NULL);
+                             urlIn, "\"", (char*)NULL);
             return TCL_ERROR;
         }