[Saga-devel] saga SVN commit 3407: /trunk/adaptors/default/

[hkaiser at cct.lsu.edu]

User: hkaiser
Date: 2009/01/30 10:23 AM

Modified:
 /trunk/adaptors/default/advert/
  advertdirectory.cpp
 /trunk/adaptors/default/replica/
  logicaldirectory.cpp

Log:
 Fixing ticket #308

File Changes:

Directory: /trunk/adaptors/default/advert/
==========================================

File [modified]: advertdirectory.cpp
Delta lines: +4 -4
===================================================================
--- trunk/adaptors/default/advert/advertdirectory.cpp	2009-01-30 14:51:29 UTC (rev 3406)
+++ trunk/adaptors/default/advert/advertdirectory.cpp	2009-01-30 16:23:39 UTC (rev 3407)
@@ -683,9 +683,9 @@
             saga::NotImplemented);
     }
 
-    std::string entry(basename.empty() ? "/" : basename);
-    if (entry.find_last_of('/') != entry.size()-1)
-        entry += '/';
+//     std::string entry(basename.empty() ? "/" : basename);
+//     if (entry.find_last_of('/') != entry.size()-1)
+//         entry += '/';
 
     mutex_type::scoped_lock lock(mtx_);
     database_scope db_scope(this, db_);
@@ -708,7 +708,7 @@
     for (std::vector<std::string>::iterator it = entries.begin(); 
          it != end; ++it)
     {
-        ret.push_back(saga::url(entry + *it));
+        ret.push_back(saga::url(/*entry + */*it));
     }
 }
 

Directory: /trunk/adaptors/default/replica/
===========================================

File [modified]: logicaldirectory.cpp
Delta lines: +4 -4
===================================================================
--- trunk/adaptors/default/replica/logicaldirectory.cpp	2009-01-30 14:51:29 UTC (rev 3406)
+++ trunk/adaptors/default/replica/logicaldirectory.cpp	2009-01-30 16:23:39 UTC (rev 3407)
@@ -679,9 +679,9 @@
             saga::NotImplemented);
     }
 
-    std::string entry(basename.empty() ? "/" : basename);
-    if (entry.find_last_of('/') != entry.size()-1)
-        entry += '/';
+//     std::string entry(basename.empty() ? "/" : basename);
+//     if (entry.find_last_of('/') != entry.size()-1)
+//         entry += '/';
 
     mutex_type::scoped_lock lock(mtx_);
     database_scope db_scope(this, db_);
@@ -704,7 +704,7 @@
     for (std::vector<std::string>::iterator it = entries.begin(); 
          it != end; ++it)
     {
-        ret.push_back(saga::url(entry + *it));
+        ret.push_back(saga::url(/*entry + */*it));
     }
 }