* When the reportnumber (rn) is used in the name of a file,
substitute any occurence of '/' with '-' to not conflict
with the path delimiter in Unix.
---
.../lib/functions/Insert_Modify_Record.py | 2 +-
modules/websubmit/lib/functions/Insert_Record.py | 2 +-
modules/websubmit/lib/functions/Move_to_Done.py | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/modules/websubmit/lib/functions/Insert_Modify_Record.py
b/modules/websubmit/lib/functions/Insert_Modify_Record.py
index 7effc4e..81ffe2e 100644
--- a/modules/websubmit/lib/functions/Insert_Modify_Record.py
+++ b/modules/websubmit/lib/functions/Insert_Modify_Record.py
@@ -38,7 +38,7 @@ def Insert_Modify_Record(parameters, curdir, form,
user_info=None):
else:
raise InvenioWebSubmitFunctionError("Could not find record file")
initialfile = "%s/%s" % (curdir,recfile)
- finalfile = "%s/%s_%s" % (CFG_TMPDIR,rn,time.strftime("%Y-%m-%d_%H:%M:%S"))
+ finalfile = "%s/%s_%s" % (CFG_TMPDIR, rn.replace('/', '-'),
time.strftime("%Y-%m-%d_%H:%M:%S"))
shutil.copy(initialfile,finalfile)
task_low_level_submission('bibupload', 'websubmit.Insert_Modify_Record',
'-c', finalfile)
return ""
diff --git a/modules/websubmit/lib/functions/Insert_Record.py
b/modules/websubmit/lib/functions/Insert_Record.py
index bad1f11..fba194e 100644
--- a/modules/websubmit/lib/functions/Insert_Record.py
+++ b/modules/websubmit/lib/functions/Insert_Record.py
@@ -36,7 +36,7 @@ def Insert_Record(parameters, curdir, form, user_info=None):
else:
raise InvenioWebSubmitFunctionError("Could not find record file")
initialfile = "%s/%s" % (curdir,recfile)
- finalfile = "%s/%s_%s" % (CFG_TMPDIR,rn,time.strftime("%Y-%m-%d_%H:%M:%S"))
+ finalfile = "%s/%s_%s" % (CFG_TMPDIR, rn.replace('/', '-'),
time.strftime("%Y-%m-%d_%H:%M:%S"))
shutil.copy(initialfile,finalfile)
task_low_level_submission('bibupload', 'websubmit.Insert_Record', '-r',
'-i', finalfile)
return ""
diff --git a/modules/websubmit/lib/functions/Move_to_Done.py
b/modules/websubmit/lib/functions/Move_to_Done.py
index 0eaa31b..d21a983 100644
--- a/modules/websubmit/lib/functions/Move_to_Done.py
+++ b/modules/websubmit/lib/functions/Move_to_Done.py
@@ -47,8 +47,7 @@ def Move_to_Done(parameters, curdir, form, user_info=None):
except:
raise InvenioWebSubmitFunctionError("Cannot create done directory
%s" % DONEDIR)
# Moves the files to the done diectory and creates an archive
- rn = rn.replace("/","-")
- namedir = "%s_%s" % (rn,time.strftime("%Y%m%d%H%M%S"))
+ namedir = "%s_%s" % (rn.replace("/", "-"), time.strftime("%Y%m%d%H%M%S"))
FINALDIR = "%s/%s" % (DONEDIR,namedir)
os.rename(curdir,FINALDIR)
if CFG_PATH_TAR != "" and CFG_PATH_GZIP != "":
--
1.6.3.3
