Only sign the URLs if they match the apiBase. This still needs more work, since you...

diff --git a/TODO.txt b/TODO.txt
index 763dcd495119cc9b592f2da07a0ab17d4626bf65..f51da1b213a98a0fc6b9b784a967fa5d23280ee5 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -75,7 +75,6 @@ Potlatch 2: main outstanding issues
 * Have a remove button for removing loaded traces
 * Have a check button for simplifying traces
 * Refactor the importer.as so that downloading the files can be done via the connection, not just directly
-* if(true) in importer.as#56 might actually be breaking other things. Fix it, or do the above
 
 Requested enhancements
 ----------------------

diff --git a/net/systemeD/potlatch2/utils/Importer.as b/net/systemeD/potlatch2/utils/Importer.as
index 80b654cb689df6df24a8f0bee97f70d9dc860e2c..1f1d75d6f2eca660b012b5104eebe31594546c83 100644 (file)
--- a/net/systemeD/potlatch2/utils/Importer.as
+++ b/net/systemeD/potlatch2/utils/Importer.as
@@ -34,10 +34,11 @@ package net.systemeD.potlatch2.utils {
 
                        var sp:uint=0;
                        for each (var fn:String in filenames) {
-                               Globals.vars.root.addDebug("requesting file "+fn); 
+                               Globals.vars.root.addDebug("requesting file "+fn);
+                var conn:Connection = Connection.getConnectionInstance();
 
-                if ( true ) {
-                  fn = Connection.getConnectionInstance().signOAuthGet(fn);
+                if ( fn.indexOf(conn.apiBase) == 0 ) {
+                  fn = conn.signOAuthGet(fn);
                 }
                                var request:DebugURLRequest = new DebugURLRequest(fn);
                                var loader:ExtendedURLLoader = new ExtendedURLLoader();