diff options
| author | Javier Fernandez <jfernandez@igalia.com> | 2013-04-02 11:31:39 +0000 |
|---|---|---|
| committer | Javier Fernandez <jfernandez@igalia.com> | 2013-04-11 13:20:04 +0000 |
| commit | 907373e6f13d7eee8b08247f7a9d206251021d8a (patch) | |
| tree | 835f2a83a2546dffe6452e877a06879963cac74c | |
| parent | a882f0f8fb9a884c2a83cb24197daa8bb2902e0d (diff) | |
Fixed bug in the zip publisher url.
* Enable again the "delete" operation in the FileAccess class.
Change-Id: I3e3fe9d743433bb30126b1b4d21bec0fa25db825
| -rw-r--r-- | wizards/com/sun/star/wizards/common/FileAccess.py | 3 | ||||
| -rw-r--r-- | wizards/com/sun/star/wizards/web/WWD_Events.py | 15 |
2 files changed, 12 insertions, 6 deletions
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py index 4a2b2cc81251..74e5fcf7f66a 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.py +++ b/wizards/com/sun/star/wizards/common/FileAccess.py @@ -249,8 +249,9 @@ class FileAccess(object): return None def delete(self, filename): + print ("DEBUG !!! FileAccess.delete -- filename: ", filename) try: - #self.xInterface.kill(filename) + self.xInterface.kill(filename) return True except Exception: traceback.print_exc() diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py b/wizards/com/sun/star/wizards/web/WWD_Events.py index 472890a3a006..9ca6772de501 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Events.py +++ b/wizards/com/sun/star/wizards/web/WWD_Events.py @@ -529,9 +529,9 @@ class WWD_Events(WWD_Startup): result = True # 1. check local publish target p = self.getPublisher(LOCAL_PUBLISHER) + fileAccess = self.getFileAccess() # should publish ? if (p.cp_Publish): - fileAccess = self.getFileAccess() path = fileAccess.getPath(p.url, None) # target exists? if fileAccess.exists(p.url, False): @@ -824,17 +824,22 @@ class WWD_Events(WWD_Startup): zip publisher is using another url form... ''' p = self.getPublisher(ZIP_PUBLISHER) + print ("DEBUG !!! finishWizard2 - zip URL: ", p.cp_URL) + #remove the 'file://' prefix + url1 = p.cp_URL.replace("file://", "") #replace the '%' with '%25' - url1 = p.cp_URL.replace("%25", "%") + url1 = url1.replace("%", "%25") #replace all '/' with '%2F' - url1 = url1.replace("%F", "/") - p.url = "vnd.sun.star.zip://" + url1 + "/"; + url1 = url1.replace("/", "%2F") + + p.url = "vnd.sun.star.zip://" + url1 + "/" + print ("DEBUG !!! finishWizard2 - zip url: ", p.url) ''' and now ftp... ''' p = self.getPublisher(FTP_PUBLISHER) - p.url = FTPDialog.getFullURL1(p); + p.url = FTPDialog.getFullURL1(p) ''' first we check the publishing targets. If they exist we warn and ask what to do. a False here means the user said "cancel" |