[Saga-devel] saga SVN commit 3302: /trunk/tools/shell/

[hkaiser at cct.lsu.edu]

User: hkaiser
Date: 2009/01/15 11:19 AM

Modified:
 /trunk/tools/shell/
  pwd.cpp, rep_find.cpp, rep_list.cpp, saga-shell.cpp

Log:
 More unescaping in the shell

File Changes:

Directory: /trunk/tools/shell/
==============================

File [modified]: pwd.cpp
Delta lines: +1 -1
===================================================================
--- trunk/tools/shell/pwd.cpp	2009-01-15 16:37:49 UTC (rev 3301)
+++ trunk/tools/shell/pwd.cpp	2009-01-15 17:19:26 UTC (rev 3302)
@@ -16,7 +16,7 @@
   }
 
   // easy... ;-)
-  p.out += cwd_.get_url ().get_string ();
+  p.out += saga::url::unescape(cwd_.get_url().get_string());
   p.out += "\n";
 
   return SUCCESS;

File [modified]: rep_find.cpp
Delta lines: +2 -4
===================================================================
--- trunk/tools/shell/rep_find.cpp	2009-01-15 16:37:49 UTC (rev 3301)
+++ trunk/tools/shell/rep_find.cpp	2009-01-15 17:19:26 UTC (rev 3302)
@@ -28,10 +28,8 @@
   // iterate over replica locations
   for ( std::size_t i = 0; i < list.size (); ++i )
   {
-    p.out += "  " 
-;
-    p.out += list[i].get_string ()
-;
+    p.out += "  ";
+    p.out += saga::url::unescape(list[i].get_string());
     p.out += "\n";
   }
 

File [modified]: rep_list.cpp
Delta lines: +2 -4
===================================================================
--- trunk/tools/shell/rep_list.cpp	2009-01-15 16:37:49 UTC (rev 3301)
+++ trunk/tools/shell/rep_list.cpp	2009-01-15 17:19:26 UTC (rev 3302)
@@ -52,10 +52,8 @@
     // iterate over replica locations
     for ( std::size_t i = 0; i < list.size (); ++i )
     {
-      p.out += " \t " 
-;
-      p.out += list[i].get_string ()
-;
+      p.out += " \t " ;
+      p.out += saga::url::unescape(list[i].get_string());
       p.out += "\n";
     }
 

File [modified]: saga-shell.cpp
Delta lines: +1 -1
===================================================================
--- trunk/tools/shell/saga-shell.cpp	2009-01-15 16:37:49 UTC (rev 3301)
+++ trunk/tools/shell/saga-shell.cpp	2009-01-15 17:19:26 UTC (rev 3302)
@@ -493,7 +493,7 @@
 //
 void shell::set_prompt (void)
 {
-  prompt_ = cwd_.get_url ().get_string () + " # ";
+  prompt_ = saga::url::unescape(cwd_.get_url().get_string()) + " # ";
 }