fenfire-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[ff-cvs] fenfire/org/fenfire demo/mm.py fenmm/textmm.py ...


From: Benja Fallenstein
Subject: [ff-cvs] fenfire/org/fenfire demo/mm.py fenmm/textmm.py ...
Date: Fri, 05 Sep 2003 06:13:34 -0400

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Benja Fallenstein <address@hidden>      03/09/05 06:13:33

Modified files:
        org/fenfire/demo: mm.py 
        org/fenfire/fenmm: textmm.py 
        org/fenfire/fenpdf: fenpdfcontext.py 
        org/fenfire/swamp: writer.py 

Log message:
        safer save: first write to string, then write string out. (takes longer 
now.)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/textmm.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/writer.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.56 fenfire/org/fenfire/demo/mm.py:1.57
--- fenfire/org/fenfire/demo/mm.py:1.56 Fri Sep  5 05:48:40 2003
+++ fenfire/org/fenfire/demo/mm.py      Fri Sep  5 06:13:30 2003
@@ -525,14 +525,14 @@
         elif key == "Ctrl-S":
             """Save the structure."""
             p("going to save")
-            ff.swamp.writer.write(fen.graph, open(FILE, 'w'))
+            ff.swamp.writer.write(fen.graph, FILE)
         elif key == "Alt-Q":
             """Quit without saving."""
             java.lang.System.exit(43)
         elif key == "Ctrl-Q":
             """Save the structure and quit."""
             p("going to save")
-            ff.swamp.writer.write(fen.graph, open(FILE, 'w'))
+            ff.swamp.writer.write(fen.graph, FILE)
         elif key == "Return":
             """Add a linebreak."""
             self.context.insertText("\n")
Index: fenfire/org/fenfire/fenmm/textmm.py
diff -u fenfire/org/fenfire/fenmm/textmm.py:1.4 
fenfire/org/fenfire/fenmm/textmm.py:1.5
--- fenfire/org/fenfire/fenmm/textmm.py:1.4     Fri Sep  5 05:48:40 2003
+++ fenfire/org/fenfire/fenmm/textmm.py Fri Sep  5 06:13:32 2003
@@ -83,7 +83,7 @@
 def save():
     """Save the structure."""
     print "Saving the RDF graph to file %s." % FILE
-    ff.swamp.writer.write(fen.graph, open(FILE, 'w'));
+    ff.swamp.writer.write(fen.graph, FILE);
 
 def quit():
     java.lang.System.exit(0)
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.31 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.32
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.31    Fri Sep  5 05:48:41 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Fri Sep  5 06:13:32 2003
@@ -154,7 +154,7 @@
 
     def save(self):
        print "SAVING..."
-        ff.swamp.writer.write(self.fen.graph, open(self.filename, 'w'));
+        ff.swamp.writer.write(self.fen.graph, self.filename);
        print "DONE"
     
     def clean(self):
Index: fenfire/org/fenfire/swamp/writer.py
diff -u fenfire/org/fenfire/swamp/writer.py:1.3 
fenfire/org/fenfire/swamp/writer.py:1.4
--- fenfire/org/fenfire/swamp/writer.py:1.3     Fri Sep  5 05:59:56 2003
+++ fenfire/org/fenfire/swamp/writer.py Fri Sep  5 06:13:33 2003
@@ -44,13 +44,12 @@
 }
 
 
-def write(graph, file):
+def write(graph, filename):
     """
-    Write a ConstGraph to a file and close that file.
-
-    The file can also be a Java Writer-- the interface used
-    is simply ``file.write(string)`` and ``file.close()``.
+    Write a ConstGraph to a file, given the filename.
     """
+
+    out = ""
     
     (triples, namespace_uris) = readTriples(graph)
 
@@ -58,29 +57,31 @@
     prefixes = uriByPrefix.keys()
     prefixes.sort()
 
-    file.write("<rdf:RDF\n")
+    out = out + ("<rdf:RDF\n")
     for prefix in prefixes:
-        file.write("  xmlns:%s='%s'\n" % (prefix, escape(uriByPrefix[prefix])))
-    file.write(">\n\n")
+        out = out + ("  xmlns:%s='%s'\n" % (prefix, 
escape(uriByPrefix[prefix])))
+    out = out + (">\n\n")
 
     subjects = triples.keys(); subjects.sort()
     for subject in subjects:
-        file.write("  <rdf:Description rdf:about='%s'>\n" % escape(subject))
+        out = out + ("  <rdf:Description rdf:about='%s'>\n" % escape(subject))
         for property in triples[subject].keys():
             (namespace_uri, local_name) = property
             prop_tag = "%s:%s" % (prefixByURI[namespace_uri], local_name)
             for (object_type, object_str) in triples[subject][property]:
                 if object_type == URI:
-                    file.write("    <%s rdf:resource='%s'/>\n" %
-                               (prop_tag, escape(object_str)))
+                    out = out + ("    <%s rdf:resource='%s'/>\n" %
+                                 (prop_tag, escape(object_str)))
                 else:
-                    file.write("    <%s>%s</%s>\n" %
-                               (prop_tag, escape(object_str), prop_tag))
+                    out = out + ("    <%s>%s</%s>\n" %
+                                 (prop_tag, escape(object_str), prop_tag))
 
-        file.write("  </rdf:Description>\n\n")
+        out = out + ("  </rdf:Description>\n\n")
                     
 
-    file.write("</rdf:RDF>\n")
+    out = out + ("</rdf:RDF>\n")
+    file = open(filename, 'w')
+    file.write(out)
     file.close()
 
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]