Add redirection of log as an option.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8209
a592a061-630c-0410-9148-
cb99ea01b6c8
+2003-12-05 José Matos <jamatos@lyx.org>
+
+ * error.py:
+ * parser_tools.py: quiet encoding warning in python 2.3.
+
+ * lyx2lyx: add logfile as an option.
+
2003-12-03 José Matos <jamatos@lyx.org>
* lyx2lyx: update copyright date
2003-12-03 José Matos <jamatos@lyx.org>
* lyx2lyx: update copyright date
# This file is part of lyx2lyx
# This file is part of lyx2lyx
-# Copyright (C) 2002 José Matos <jamatos@lyx.org>
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2002-2003 José Matos <jamatos@lyx.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
opt.output = sys.stdout
opt.input = sys.stdin
opt.output = sys.stdout
opt.input = sys.stdin
opt.start = None
opt.end = None
opt.quiet = 0
opt.start = None
opt.end = None
opt.quiet = 0
-l, --list list all available formats
-d, --debug level level=0..2 (O_ no debug information,2_verbose)
default: level=1
-l, --list list all available formats
-d, --debug level level=0..2 (O_ no debug information,2_verbose)
default: level=1
+ -e, --err error_file name of the error file or else goes to stderr
-f, --from version initial version (optional)
-t, --to version final version (optional)
-o, --output name name of the output file or else goes to stdout
-f, --from version initial version (optional)
-t, --to version final version (optional)
-o, --output name name of the output file or else goes to stdout
- _options = ["help", "version", "list", "debug=", "from=", "to=", "output=", "quiet"]
+ _options = ["help", "version", "list", "debug=", "err=", "from=", "to=", "output=", "quiet"]
- opts, args = getopt.getopt(argv[1:], "d:f:hlo:qt:v", _options)
+ opts, args = getopt.getopt(argv[1:], "d:e:f:hlo:qt:v", _options)
except getopt.error:
usage()
sys.exit(2)
except getopt.error:
usage()
sys.exit(2)
opt.start = lyxformat(a)
if o in ("-t", "--to"):
opt.end = lyxformat(a)
opt.start = lyxformat(a)
if o in ("-t", "--to"):
opt.end = lyxformat(a)
+ if o in ("-e","--err"):
+ opt.err = open(a, "w")
if not opt.end:
opt.end = lst_ft[len(lst_ft)-1]
if not opt.end:
opt.end = lst_ft[len(lst_ft)-1]
if result:
fmt = int(result.group(1) + result.group(2))
else:
if result:
fmt = int(result.group(1) + result.group(2))
else:
- sys.stderr.write(str(fmt) + ": " + error.invalid_format)
+ opt.err.write(str(fmt) + ": " + error.invalid_format)
sys.exit(2)
if fmt in lst_ft:
return fmt
sys.exit(2)
if fmt in lst_ft:
return fmt
- sys.stderr.write(fmt + ": " + error.format_not_supported)
+ opt.err.write(fmt + ": " + error.format_not_supported)
sys.exit(1)
def read_file(file, header, body):
sys.exit(1)
def read_file(file, header, body):
while 1:
line = file.readline()
if not line:
while 1:
line = file.readline()
if not line:
- sys.stderr.write(error.invalid_file)
+ opt.err.write(error.invalid_file)
sys.exit(3)
line = line[:-1]
sys.exit(3)
line = line[:-1]
body.append(line[:-1])
if not fmt:
body.append(line[:-1])
if not fmt:
- sys.stderr.write(error.invalid_file)
+ opt.err.write(error.invalid_file)
if opt.start:
if opt.start != fmt:
if opt.start:
if opt.start != fmt:
- sys.stderr.write("%s: %s %s\n" % (warning.dont_match, opt.start, fmt))
+ opt.err.write("%s: %s %s\n" % (warning.dont_match, opt.start, fmt))
# This file is part of lyx2lyx
# This file is part of lyx2lyx
-# Copyright (C) 2002 Dekel Tsur <dekel@lyx.org>, José Matos <jamatos@lyx.org>
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2002-2003 Dekel Tsur <dekel@lyx.org>, José Matos <jamatos@lyx.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License