git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfixes for EC serialization and plotting
[nepi.git]
/
src
/
nepi
/
util
/
serializer.py
diff --git
a/src/nepi/util/serializer.py
b/src/nepi/util/serializer.py
index
9ed216f
..
aaf1aff
100644
(file)
--- a/
src/nepi/util/serializer.py
+++ b/
src/nepi/util/serializer.py
@@
-24,12
+24,12
@@
class SFormats:
XML = "xml"
class ECSerializer(object):
XML = "xml"
class ECSerializer(object):
- def load(self, path, format = SFormats.XML):
+ def load(self,
file
path, format = SFormats.XML):
if format == SFormats.XML:
from nepi.util.parsers.xml_parser import ECXMLParser
parser = ECXMLParser()
if format == SFormats.XML:
from nepi.util.parsers.xml_parser import ECXMLParser
parser = ECXMLParser()
- f = open(path, "r")
+ f = open(
file
path, "r")
xml = f.read()
f.close()
xml = f.read()
f.close()
@@
-46,16
+46,20
@@
class ECSerializer(object):
return sec
return sec
- def save(self, ec, path, format = SFormats.XML):
+ def save(self, ec, dirpath = None, format = SFormats.XML):
+ if not dirpath:
+ import tempfile
+ dirpath = tempfile.mkdtemp()
+
date = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
filename = "%s_%s" % (ec.exp_id, date)
if format == SFormats.XML:
date = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
filename = "%s_%s" % (ec.exp_id, date)
if format == SFormats.XML:
-
path = os.path.join(
path, "%s.xml" % filename)
+
filepath = os.path.join(dir
path, "%s.xml" % filename)
sec = self.serialize(ec, format = format)
sec = self.serialize(ec, format = format)
- f = open(path, "w")
+ f = open(
file
path, "w")
f.write(sec)
f.close()
f.write(sec)
f.close()
- return path
+ return
file
path