[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire/org/fenfire fenpdf/importpdf.py swamp/G...
From: |
Tuomas J. Lukka |
Subject: |
[ff-cvs] fenfire/org/fenfire fenpdf/importpdf.py swamp/G... |
Date: |
Sat, 06 Sep 2003 08:46:54 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/09/06 08:46:54
Modified files:
org/fenfire/fenpdf: importpdf.py
org/fenfire/swamp: Graphs.test writer.py writer.test
Log message:
Arch: speed up writer, fix importpdf exception
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/importpdf.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/writer.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/writer.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/fenpdf/importpdf.py
diff -u fenfire/org/fenfire/fenpdf/importpdf.py:1.4
fenfire/org/fenfire/fenpdf/importpdf.py:1.5
--- fenfire/org/fenfire/fenpdf/importpdf.py:1.4 Tue Aug 26 06:06:38 2003
+++ fenfire/org/fenfire/fenpdf/importpdf.py Sat Sep 6 08:46:54 2003
@@ -28,7 +28,7 @@
blocks.append(
importPDF(fen, treetime, f)
)
- except exception:
+ except :
print "EXCEPTION LOADING",f,":",sys.exc_info()
blocks = [b for b in blocks if b != None ]
return blocks
Index: fenfire/org/fenfire/swamp/Graphs.test
diff -u fenfire/org/fenfire/swamp/Graphs.test:1.10
fenfire/org/fenfire/swamp/Graphs.test:1.11
--- fenfire/org/fenfire/swamp/Graphs.test:1.10 Wed Jul 16 08:25:17 2003
+++ fenfire/org/fenfire/swamp/Graphs.test Sat Sep 6 08:46:54 2003
@@ -119,3 +119,5 @@
assert 'test' == cont.getText(fen.graph, node)
+ #### clean
+ os.system('rm '+file)
Index: fenfire/org/fenfire/swamp/writer.py
diff -u fenfire/org/fenfire/swamp/writer.py:1.6
fenfire/org/fenfire/swamp/writer.py:1.7
--- fenfire/org/fenfire/swamp/writer.py:1.6 Fri Sep 5 07:56:18 2003
+++ fenfire/org/fenfire/swamp/writer.py Sat Sep 6 08:46:54 2003
@@ -18,6 +18,7 @@
# MA 02111-1307 USA
#
+from __future__ import nested_scopes
"""
An RDF/XML writer for Swamp ConstGraphs.
@@ -49,7 +50,11 @@
Write a ConstGraph to a file, given the filename.
"""
- out = ""
+ out = []
+ def w(s):
+ """Add a string to the output.
+ """
+ out.append(s)
(triples, namespace_uris) = readTriples(graph)
@@ -57,14 +62,14 @@
prefixes = uriByPrefix.keys()
prefixes.sort()
- out = out + ("<rdf:RDF\n")
+ w("<rdf:RDF\n")
for prefix in prefixes:
- out = out + (" xmlns:%s='%s'\n" % (prefix,
escape(uriByPrefix[prefix])))
- out = out + (">\n\n")
+ w(" xmlns:%s='%s'\n" % (prefix, escape(uriByPrefix[prefix])))
+ w(">\n\n")
subjects = triples.keys(); subjects.sort()
for subject in subjects:
- out = out + (" <rdf:Description rdf:about='%s'>\n" % escape(subject))
+ w(" <rdf:Description rdf:about='%s'>\n" % escape(subject))
properties = triples[subject].keys(); properties.sort()
for property in properties:
(namespace_uri, local_name) = property
@@ -72,18 +77,19 @@
objects = triples[subject][property]; objects.sort()
for (object_type, object_str) in objects:
if object_type == URI:
- out = out + (" <%s rdf:resource='%s'/>\n" %
+ w(" <%s rdf:resource='%s'/>\n" %
(prop_tag, escape(object_str)))
else:
- out = out + (" <%s>%s</%s>\n" %
+ w(" <%s>%s</%s>\n" %
(prop_tag, escape(object_str), prop_tag))
- out = out + (" </rdf:Description>\n\n")
+ w(" </rdf:Description>\n\n")
- out = out + ("</rdf:RDF>\n")
+ w("</rdf:RDF>\n")
file = open(filename, 'w')
- file.write(out)
+ for str in out:
+ file.write(str)
file.close()
Index: fenfire/org/fenfire/swamp/writer.test
diff -u fenfire/org/fenfire/swamp/writer.test:1.2
fenfire/org/fenfire/swamp/writer.test:1.3
--- fenfire/org/fenfire/swamp/writer.test:1.2 Fri Sep 5 07:53:07 2003
+++ fenfire/org/fenfire/swamp/writer.test Sat Sep 6 08:46:54 2003
@@ -113,3 +113,6 @@
assert 'test' == cont.getText(fen.graph, node)
+ #### clean
+ os.system('rm '+file)
+
- [ff-cvs] fenfire/org/fenfire fenpdf/importpdf.py swamp/G...,
Tuomas J. Lukka <=