Changeset 5378

Timestamp:

28/07/10 13:11:48 (6 weeks ago)

Author:

Roman Tolchenov

Message:

Included the archive search service into finding files. re #1393

Location:

trunk

Files:

• Code/Mantid/API/inc/MantidAPI/IArchiveSearch.h (modified) (2 diffs)
• Code/Mantid/API/src/FileFinder.cpp (modified) (4 diffs)
• Code/Mantid/API/test/FileFinderTest.h (modified) (2 diffs)
• Code/Mantid/Kernel/src/ConfigService.cpp (modified) (1 diff)
• Code/Mantid/Properties/Mantid.properties (modified) (1 diff)
• Test/Instrument/Facilities.xml (modified) (2 diffs)

trunk/Code/Mantid/API/inc/MantidAPI/IArchiveSearch.h

@@ -7 +7 @@
 #include "MantidAPI/DllExport.h"
 
+#include <boost/shared_ptr.hpp>
 #include <string>
 
@@ -59 +60 @@
     };
 
+                ///Typedef for a shared pointer to an IArchiveSearch
+                typedef boost::shared_ptr<IArchiveSearch> IArchiveSearch_sptr;
+
   }
 }

trunk/Code/Mantid/API/src/FileFinder.cpp

@@ -3 +3 @@
 //----------------------------------------------------------------------
 #include "MantidAPI/FileFinder.h"
+#include "MantidAPI/IArchiveSearch.h"
+#include "MantidAPI/ArchiveSearchFactory.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/FacilityInfo.h"
 #include "MantidKernel/InstrumentInfo.h"
+#include "MantidKernel/LibraryManager.h"
+#include "MantidKernel/Glob.h"
 
 #include "Poco/Path.h"
@@ -27 +31 @@
     FileFinderImpl::FileFinderImpl()
     {
+      // Make sure plugins are loaded
+      std::string libpath = Kernel::ConfigService::Instance().getString("plugins.directory");
+      if( !libpath.empty() )
+      {
+        Kernel::LibraryManager::Instance().OpenAllLibraries(libpath);
+      }
     }
 
@@ -41 +51 @@
       for(;it != searchPaths.end(); ++it)
       {
-        Poco::Path path(*it,fName);
-        Poco::File file(path);
-        if (file.exists())
-        {
-          return path.toString();
+        if (fName.find("*") != std::string::npos)
+        {
+          Poco::Path path(*it,fName);
+          Poco::Path pathPattern(path);
+          std::set<std::string> files;
+          Kernel::Glob::glob(pathPattern, files);
+          if ( !files.empty() )
+          {
+            return *files.begin();
+          }
+        }
+        else
+        {
+          Poco::Path path(*it,fName);
+          Poco::File file(path);
+          if (file.exists())
+          {
+            return path.toString();
+          }
         }
       }
@@ -126 +150 @@
         if ( !path.empty() ) return path;
       }
+
+      // Search the archive of the default facility
+      std::string archiveOpt = Kernel::ConfigService::Instance().getString("datasearch.searcharchive");
+      std::transform(archiveOpt.begin(),archiveOpt.end(),archiveOpt.begin(),tolower);
+      if ( !archiveOpt.empty() && archiveOpt != "off" )
+      {
+        IArchiveSearch_sptr arch = ArchiveSearchFactory::Instance().create(
+          Kernel::ConfigService::Instance().Facility().name()
+          );
+        if (arch)
+        {
+          std::string path = arch->getPath(fName);
+          if ( !path.empty() )
+          {
+            std::vector<std::string>::const_iterator ext = exts.begin();
+            for(;ext != exts.end(); ++ext)
+            {
+              Poco::Path pathPattern(path + "." + *ext);
+              if (ext->find("*") != std::string::npos)
+              {
+                continue;
+                std::set<std::string> files;
+                Kernel::Glob::glob(pathPattern, files);
+                std::cerr<<"Searching for:"<<pathPattern.toString()<<'\n';
+                std::cerr<<"Found:"<<files.size()<<'\n';
+              }
+              else
+              {
+                Poco::File file(pathPattern);
+                if (file.exists())
+                {
+                  return file.path();
+                }
+              }
+            }
+          }
+        }
+      }
       return "";
     }

trunk/Code/Mantid/API/test/FileFinderTest.h

@@ -25 +25 @@
     const std::string xmlStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<facilities>"
-      "  <facility name=\"ISIS\" zeropadding=\"5\" FileExtensions=\"nxs,raw,sav,n*,s*\">"
+      "  <facility name=\"ISIS\" zeropadding=\"5\" FileExtensions=\"nxs,raw,sav,n*,N*,s*,S*\">"
       "    <instrument name=\"HRPD\" shortname=\"HRP\">"
       "      <technique>Powder Diffraction</technique>"
@@ -85 +85 @@
   void testFindFile()
   {
+    ConfigService::Instance().setString("datasearch.searcharchive","Off");
     std::string path = FileFinder::Instance().findFile("CSP78173");
     TS_ASSERT(path.find("CSP78173.raw") != std::string::npos);
     Poco::File file(path);
     TS_ASSERT(file.exists());
+    path = FileFinder::Instance().findFile("HRP37129");
+    std::cerr<<"Path: "<<path<<'\n';
+    TS_ASSERT(path.size() > 3);
+    TS_ASSERT_EQUALS(path.substr(path.size()-3),"S02");
+    //ConfigService::Instance().setString("datasearch.searcharchive","On");
+    //path = FileFinder::Instance().findFile("CSP77374");
+    //std::cerr<<"Path: "<<path<<'\n';
+    //path = FileFinder::Instance().findFile("CSP78174");
+    //std::cerr<<"Path: "<<path<<'\n';
   }
 

trunk/Code/Mantid/Kernel/src/ConfigService.cpp

@@ -166 +166 @@
   ConfigServiceImpl::~ConfigServiceImpl()
   {
-    std::cerr << "ConfigService destroyed." << std::endl;
+    //std::cerr << "ConfigService destroyed." << std::endl;
     Kernel::Logger::shutdown();
     delete m_pSysConfig;

trunk/Code/Mantid/Properties/Mantid.properties

@@ -59 +59 @@
 datasearch.directories = 
 
+# Setting this to On enables searching the facilitie's archive automatically
+datasearch.searcharchive = Off
+
 # A default directory to use for saving files
 # Use forward slash / for all paths

trunk/Test/Instrument/Facilities.xml

@@ -2 +2 @@
 <facilities>
 
-<facility name="ISIS" zeropadding="5" FileExtensions="nxs,raw,sav,n*,s*">
+<facility name="ISIS" zeropadding="5" FileExtensions="nxs,raw,sav,n*,N*,s*,S*">
   <archive>
     <archiveSearch plugin="ISISDataSearch" />
@@ -169 +169 @@
 
 <facility name="SNS" FileExtensions="nxs,dat">
-   <instrument name=""> 
-      <technique>technique</technique>
-   </instrument> 
-   
    <instrument name="DAS"> 
       <technique>technique</technique>