Changeset 6072 for trunk/gui

Timestamp:

Feb 28, 2016, 3:09:59 AM (9 years ago)

Author:

ldelgass

Message:

Send files to server for local/relative paths in stylesheet.

File:

• trunk/gui/scripts/mapviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/mapviewer.tcl

@@ -120 +120 @@
     private method Select {option x y}
     private method SendFiles { path }
+    private method SendStylesheetFiles { stylesheet }
     private method SetHeading { {value 0} }
     private method SetLayerOpacity { dataobj layer {value 100} }
@@ -2396 +2397 @@
 }
 
+itcl::body Rappture::MapViewer::SendStylesheetFiles { stylesheet } {
+    set files [Rappture::Map::getFilesFromStylesheet $stylesheet]
+    foreach file $files {
+        SendFiles $file
+    }
+}
+
 itcl::body Rappture::MapViewer::SendFiles { path } {
-    if {[string range $path 0 7] != "local://"} {
+    set isRelative [expr {[string first "://" $path] < 0 &&
+                          [string index $path 0] != "/"}]
+    if {[string range $path 0 7] != "local://" &&
+       !$isRelative} {
         return
     }
     DebugTrace "Local path: $path"
-    set path [string range $path 8 end]
+    if {!$isRelative} {
+        set path [string range $path 8 end]
+    }
     set basename [file rootname $path]
     set files [glob -path $basename .*]
@@ -2544 +2557 @@
             set format ""
             set wfsType ""
+            SendStylesheetFiles $info(stylesheet)
             if { [info exists info(ogr.connection)] } {
                 set cmd [list map layer add $tag feature db $format $info(ogr.layer) $info(ogr.connection) $info(cache) $info(stylesheet) $script $selectors]