From e0f4fa453c63412b717bed68955216db7417f58b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 25 May 2011 09:13:26 +0000
Subject: [PATCH] Removed now redundent local implementation of
 getDirectoryContexts()

---
 src/osgPlugins/osga/OSGA_Archive.cpp | 64 ----------------------------
 src/osgPlugins/osga/OSGA_Archive.h   |  5 ---
 2 files changed, 69 deletions(-)

diff --git a/src/osgPlugins/osga/OSGA_Archive.cpp b/src/osgPlugins/osga/OSGA_Archive.cpp
index 79886ef2e..cf9770dad 100644
--- a/src/osgPlugins/osga/OSGA_Archive.cpp
+++ b/src/osgPlugins/osga/OSGA_Archive.cpp
@@ -524,70 +524,6 @@ bool OSGA_Archive::getFileNames(FileNameList& fileNameList) const
     return !fileNameList.empty();
 }
 
-osgDB::DirectoryContents OSGA_Archive::getDirectoryContents(const std::string& dirName) const
-{
-    osgDB::DirectoryContents files;
-    if (dirName.empty() || dirName==".")
-    {
-        getFileNames(files);
-        return files;
-    }
-
-    bool dirNameHasTrailingSlash = false;
-    char d = dirName[dirName.size()-1];
-    if (d=='\\' || d=='/') dirNameHasTrailingSlash = true;
-
-    for(FileNamePositionMap::const_iterator itr=_indexMap.begin();
-        itr!=_indexMap.end();
-        ++itr)
-    {
-        const std::string& filename = itr->first;
-        if (filename.size()>dirName.size())
-        {
-            // check for match of directory name while accounting for potential
-            // differences in types of slashes
-            unsigned int i=0;
-            for(; i<dirName.size(); ++i)
-            {
-                char f = filename[i];
-                char d = dirName[i];
-                if (f=='\\') f='/';
-                if (d=='\\') d='/';
-                if (f!=d) break;
-            }
-
-            if (i==dirName.size())
-            {
-                bool directoryMatched = false;
-                if (!dirNameHasTrailingSlash)
-                {
-                    // no trailing slash on dirName so we won't have matched
-                    // the required slash on filename to make sure the next character is slash.
-                    char f = filename[i];
-
-                    // check for slash
-                    if (f=='\\' || f=='/')
-                    {
-                        // found slash, now need to skip over it.
-                        ++i;
-                        directoryMatched = true;
-                    }
-                }
-                else
-                {
-                    directoryMatched = true;
-                }
-
-                if (directoryMatched)
-                {
-                    files.push_back(filename.substr(i));
-                }
-            }
-        }
-    }
-    return files;
-}
-
 void OSGA_Archive::writeIndexBlocks()
 {
     SERIALIZER();
diff --git a/src/osgPlugins/osga/OSGA_Archive.h b/src/osgPlugins/osga/OSGA_Archive.h
index a8eae332d..6dd13dab3 100644
--- a/src/osgPlugins/osga/OSGA_Archive.h
+++ b/src/osgPlugins/osga/OSGA_Archive.h
@@ -59,11 +59,6 @@ class OSGA_Archive : public osgDB::Archive
         /** Get the full list of file names available in the archive.*/
         virtual bool getFileNames(FileNameList& fileNameList) const;
 
-        /** return the contents of a directory.
-          * returns an empty array on any error.*/
-        virtual osgDB::DirectoryContents getDirectoryContents(const std::string& dirName) const;
-
-
 
         /** Read an osg::Object of specified file name from the Archive.*/
         virtual ReadResult readObject(const std::string& fileName,const Options* options=NULL) const;