LocalLogReader: append '.logreq' inside reader (for compatibility wit…

…h SshLogReader)
rhicspin · Aug 3, 2014 · c97ab79 · c97ab79
1 parent 88a5575
commit c97ab79
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/examples/query.cxx b/examples/query.cxx
@@ -17,7 +17,7 @@ int main(void)
 {
    opencdev::LocalLogReader log_reader("/star/u/veprbl/run_fy13");
    opencdev::result_t result;
-   log_reader.query_fill("RHIC/Polarimeter/Blue/biasReadbacks.logreq", 17104, &result);
+   log_reader.query_fill("RHIC/Polarimeter/Blue/biasReadbacks", 17104, &result);
 
    cout << std::fixed << std::setprecision(1);
 

diff --git a/src/LocalLogReader_p.cxx b/src/LocalLogReader_p.cxx
@@ -20,7 +20,7 @@ namespace opencdev {
 
 string  LocalLogReaderPrivate::get_logreq_path(const string &logger)
 {
-   return (fs::path(CAD_LOGREQ_BASE)/fs::path(logger)).string();
+   return (fs::path(CAD_LOGREQ_BASE)/fs::path(logger + ".logreq")).string();
 }
 
 string  LocalLogReaderPrivate::get_sdds_path(const string &rel_path)

diff --git a/tests/copy.cpp b/tests/copy.cpp
@@ -14,11 +14,11 @@ BOOST_AUTO_TEST_CASE(double_free_test)
 
    {
        opencdev::LocalLogReader log_reader2(log_reader);
-       log_reader2.query_timerange("RHIC/Polarimeter/Yellow/biasReadbacks.logreq", 0, 1, &result);
+       log_reader2.query_timerange("RHIC/Polarimeter/Yellow/biasReadbacks", 0, 1, &result);
        BOOST_CHECK(result.size() == 0);
    }
 
-   log_reader.query_timerange("RHIC/Polarimeter/Yellow/biasReadbacks.logreq", 0, 1, &result);
+   log_reader.query_timerange("RHIC/Polarimeter/Yellow/biasReadbacks", 0, 1, &result);
    BOOST_CHECK(result.size() == 0);
 }
 

diff --git a/tests/fill_query.cpp b/tests/fill_query.cpp
@@ -17,7 +17,7 @@ BOOST_AUTO_TEST_CASE(check_load)
    opencdev::LocalLogReader log_reader(TEST_DATA_PATH);
    opencdev::result_t result;
 
-   log_reader.query_fill("RHIC/Polarimeter/Yellow/biasReadbacks.logreq", 17201, &result);
+   log_reader.query_fill("RHIC/Polarimeter/Yellow/biasReadbacks", 17201, &result);
 
    /*
     * Obtained by running

diff --git a/tests/sdds.cpp b/tests/sdds.cpp
@@ -14,7 +14,7 @@ BOOST_AUTO_TEST_CASE(check_gzip_load)
    opencdev::result_t result;
 
    // Reads 17201/RHIC/Polarimeter/Yellow/biasReadbacks/2013-03-09.2301.30.sdds
-   log_reader.query_fill("RHIC/Polarimeter/Yellow/biasReadbacks.logreq", 17201, &result);
+   log_reader.query_fill("RHIC/Polarimeter/Yellow/biasReadbacks", 17201, &result);
 
    BOOST_CHECK_EQUAL(result.size(), 12);
 }
@@ -25,7 +25,7 @@ BOOST_AUTO_TEST_CASE(check_ascii)
    opencdev::result_t result;
 
    // Reads 17602/RHIC/Polarimeter/Yellow/biasReadbacks/2013-07-02.1825.15.sdds
-   log_reader.query_timerange("RHIC/Polarimeter/Yellow/biasReadbacks.logreq", 1375347602, 1375354830, &result);
+   log_reader.query_timerange("RHIC/Polarimeter/Yellow/biasReadbacks", 1375347602, 1375354830, &result);
 
    BOOST_CHECK_EQUAL(result.size(), 12);
 }

diff --git a/tests/timerange_query.cpp b/tests/timerange_query.cpp
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE(check_query)
    opencdev::LocalLogReader log_reader(TEST_DATA_PATH);
    opencdev::result_t result;
 
-   log_reader.query_timerange("RHIC/Polarimeter/Yellow/biasReadbacks.logreq", starttime, endtime, &result);
+   log_reader.query_timerange("RHIC/Polarimeter/Yellow/biasReadbacks", starttime, endtime, &result);
 
    BOOST_CHECK_EQUAL(result.size(), reference_column_count);
 
@@ -119,7 +119,7 @@ BOOST_AUTO_TEST_CASE(check_query_mean)
    opencdev::LocalLogReader log_reader(TEST_DATA_PATH);
    opencdev::mean_result_t result;
 
-   log_reader.query_timerange_mean("RHIC/Polarimeter/Yellow/biasReadbacks.logreq", starttime, endtime, &result);
+   log_reader.query_timerange_mean("RHIC/Polarimeter/Yellow/biasReadbacks", starttime, endtime, &result);
 
    BOOST_CHECK_EQUAL(result.size(), reference_column_count);