[Saga-devel] saga SVN commit 3406: /trunk/saga/

[hkaiser at cct.lsu.edu]

User: hkaiser
Date: 2009/01/30 08:51 AM

Modified:
 /trunk/saga/impl/engine/
  url.cpp, url.hpp
 /trunk/saga/saga/adaptors/
  file_transfer_spec.cpp

Log:
 Fixing ticket #323

File Changes:

Directory: /trunk/saga/saga/adaptors/
=====================================

File [modified]: file_transfer_spec.cpp
Delta lines: +4 -1
===================================================================
--- trunk/saga/saga/adaptors/file_transfer_spec.cpp	2009-01-30 08:45:23 UTC (rev 3405)
+++ trunk/saga/saga/adaptors/file_transfer_spec.cpp	2009-01-30 14:51:29 UTC (rev 3406)
@@ -29,7 +29,7 @@
         saga::url url_left, url_right;
         TR1::shared_ptr<impl::url> impl_left(impl::runtime::get_impl(url_left));
         TR1::shared_ptr<impl::url> impl_right(impl::runtime::get_impl(url_right));
-        
+
         symbols<file_transfer_operator> ops;
         ops.add (">", copy_local_remote)
                 (">>", append_local_remote)
@@ -50,6 +50,9 @@
         if (!pi.full)
             return false;
 
+        impl_left->set_checked();
+        impl_right->set_checked();
+
         left_url = url_left.get_url();
         right_url = url_right.get_url();
         mode = parsed_mode;

Directory: /trunk/saga/impl/engine/
===================================

File [modified]: url.cpp
Delta lines: +5 -0
===================================================================
--- trunk/saga/impl/engine/url.cpp	2009-01-30 08:45:23 UTC (rev 3405)
+++ trunk/saga/impl/engine/url.cpp	2009-01-30 14:51:29 UTC (rev 3406)
@@ -378,6 +378,11 @@
       was_checked_ = false;
     }
 
+    void url::set_checked(bool checked)
+    {
+        was_checked_ = checked;
+    }
+
     std::string url::get_url (void)
     {
       if (!was_checked_ && !scheme_.empty())

File [modified]: url.hpp
Delta lines: +2 -0
===================================================================
--- trunk/saga/impl/engine/url.hpp	2009-01-30 08:45:23 UTC (rev 3405)
+++ trunk/saga/impl/engine/url.hpp	2009-01-30 14:51:29 UTC (rev 3406)
@@ -117,6 +117,8 @@
        // saga::object related functionality
        saga::object  clone() const;
 
+       // tell the url it has been checked
+       void set_checked(bool checked = true);
     };
 
     std::string unescape_url(std::string const&in);