fixed serious issue with adding file paths into kb.absFilePaths (dirname was wrongly added, and afterwards getDirs used dirname of dirname)

stamparm · stamparm · commit ea045eaa2fb6 · 2010-02-03T16:40:12.000Z
also, fixed some issues with Windows paths
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -246,7 +246,7 @@ def getDocRoot():
                 if absFilePathWin:
                     docRoot = "C:/%s" % docRoot.replace("\\", "/")
                     
-                docRoot = docRoot.replace("//", "/")
+                docRoot = normalizePath(docRoot)
                 break
 
     if docRoot:
diff --git a/lib/request/basic.py b/lib/request/basic.py
@@ -84,8 +84,7 @@ def parseResponse(page, headers):
                 if re.search("\A[A-Za-z]:", absFilePath):
                     absFilePath = absFilePath.replace("/", "\\")
                 if absFilePath not in kb.absFilePaths:
-                    dirname = directoryPath(absFilePath)
-                    kb.absFilePaths.add(dirname)
+                    kb.absFilePaths.add(absFilePath)
                     
 
 def decodePage(page, encoding):
diff --git a/lib/takeover/web.py b/lib/takeover/web.py
@@ -175,9 +175,10 @@ def webInit(self):
             payload     = agent.payload(newValue=query)
             page        = Request.queryPage(payload)
             
-            requestDir  = normalizePath(directory.replace(kb.docRoot, "/").replace("\\", "/"))
+            requestDir  = directory.replace('\\', '/').replace(kb.docRoot.replace('\\', '/'), "/").replace("//", "/")
             if re.search("\A[A-Za-z]:", requestDir):
                 requestDir = requestDir[2:]
+            requestDir  = normalizePath(requestDir)
             self.webBaseUrl     = "%s://%s:%d%s" % (conf.scheme, conf.hostname, conf.port, requestDir)
             self.webUploaderUrl = "%s/%s" % (self.webBaseUrl, uploaderName)
             self.webUploaderUrl = self.webUploaderUrl.replace("./", "/").replace("\\", "/")
