[casacore] r21234 committed - Fix non-working measures.directory entry

[casa...@googlecode.com]

Revision: 21234
Author: Malte.Marquarding
Date: Mon Apr 2 23:07:35 2012
Log: Fix non-working measures.directory entry
http://code.google.com/p/casacore/source/detail?r=21234

Modified:
/trunk/measures/Measures/MeasIERS.cc
/trunk/measures/Measures/MeasTable.cc

=======================================
--- /trunk/measures/Measures/MeasIERS.cc Tue Oct 18 00:39:05 2011
+++ /trunk/measures/Measures/MeasIERS.cc Mon Apr 2 23:07:35 2012
@@ -404,11 +404,13 @@
Bool found = False;
String mdir;
if (Aipsrc::find(mdir, "measures.directory")) {
- mdir += "/";
- ldir = mdir + udir;
+ mdir.trim();
+ Path mpath = Path(mdir);
+ mpath.append(udir);
+ ldir = mpath.absoluteName()+"/";
searched.resize(searched.nelements()+1, True);
searched[searched.nelements()-1] = ldir;
- if (Table::isReadable(ldir + name)) {
+ if (Table::isReadable(ldir+name)) {
found = True;
}
}
=======================================
--- /trunk/measures/Measures/MeasTable.cc Tue Oct 18 00:39:05 2011
+++ /trunk/measures/Measures/MeasTable.cc Mon Apr 2 23:07:35 2012
@@ -4182,7 +4182,9 @@
{
String mdir;
Aipsrc::find(mdir, "measures.directory");
- Path lPath(mdir + "/" + antRespPath);
+ mdir.trim();
+ Path lPath(mdir);
+ lPath.append(antRespPath);
absPathName = lPath.absoluteName();
isValid = Table::isReadable(absPathName);
}