[cpp-xmltooling COMMIT] in /branches/REL_1/xmltooling/util: PathResolver.cpp PathResolver.h

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan 23 21:46:32 2012
New Revision: 954

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=954&view=rev
Log:
Add cache file type to path resolver

Modified:
    branches/REL_1/xmltooling/util/PathResolver.cpp
    branches/REL_1/xmltooling/util/PathResolver.h

Modified: branches/REL_1/xmltooling/util/PathResolver.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/util/PathResolver.cpp?rev=954&r1=953&r2=954&view=diff
==============================================================================
--- branches/REL_1/xmltooling/util/PathResolver.cpp (original)
+++ branches/REL_1/xmltooling/util/PathResolver.cpp Mon Jan 23 21:46:32 2012
@@ -38,6 +38,7 @@
     setXMLDir("/usr/share/xml");
     setRunDir("/var/run");
     setCfgDir("/etc");
+    setCacheDir("/var/cache");
 }
 
 PathResolver::~PathResolver()
@@ -77,6 +78,11 @@
 void PathResolver::setCfgDir(const char* dir)
 {
     m_cfg = dir;
+}
+
+void PathResolver::setCacheDir(const char* dir)
+{
+    m_cache = dir;
 }
 
 bool PathResolver::isAbsolute(const char* s) const
@@ -139,6 +145,16 @@
                 }
                 break;
 
+            case XMLTOOLING_CACHE_FILE:
+                s = m_cache + '/' + (pkgname ? pkgname : m_defaultPackage) + '/' + s;
+                if (!isAbsolute(m_cache.c_str())) {
+                    if (prefix || m_defaultPrefix != "/usr")
+                        s = string(prefix ? prefix : m_defaultPrefix) + '/' + s;
+                    else
+                        s = string("/") + s;
+                }
+                break;
+
             default:
                 throw XMLToolingException("Unknown file type to resolve.");
         }

Modified: branches/REL_1/xmltooling/util/PathResolver.h
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/util/PathResolver.h?rev=954&r1=953&r2=954&view=diff
==============================================================================
--- branches/REL_1/xmltooling/util/PathResolver.h (original)
+++ branches/REL_1/xmltooling/util/PathResolver.h Mon Jan 23 21:46:32 2012
@@ -48,7 +48,8 @@
             XMLTOOLING_LOG_FILE,
             XMLTOOLING_XML_FILE,
             XMLTOOLING_RUN_FILE,
-            XMLTOOLING_CFG_FILE
+            XMLTOOLING_CFG_FILE,
+            XMLTOOLING_CACHE_FILE
         };
 
         /**
@@ -106,6 +107,14 @@
         virtual void setCfgDir(const char* dir);
 
         /**
+         * Set the cache directory to use when resolving files.
+         * <p>If relative, the default prefix will be prepended.
+         *
+         * @param dir    the cache directory to use
+         */
+        virtual void setCacheDir(const char* dir);
+
+        /**
          * Changes the input filename into an absolute pathname to the same file.
          *
          * @param s         filename to resolve
@@ -120,7 +129,7 @@
     private:
         bool isAbsolute(const char* s) const;
 
-        std::string m_defaultPackage,m_defaultPrefix,m_lib,m_log,m_xml,m_run,m_cfg;
+        std::string m_defaultPackage,m_defaultPrefix,m_lib,m_log,m_xml,m_run,m_cfg,m_cache;
     };
 };