[ff-cvs] fenfire/org/fenfire/swamp writer.py writer.test

[Benja Fallenstein]

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

Modified files:
        org/fenfire/swamp: writer.py writer.test 

Log message:
        ARGH, sort properties and objects... (sorry)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/writer.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/writer.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/swamp/writer.py
diff -u fenfire/org/fenfire/swamp/writer.py:1.4 
fenfire/org/fenfire/swamp/writer.py:1.5
--- fenfire/org/fenfire/swamp/writer.py:1.4     Fri Sep  5 06:13:33 2003
+++ fenfire/org/fenfire/swamp/writer.py Fri Sep  5 07:53:07 2003
@@ -65,10 +65,12 @@
     subjects = triples.keys(); subjects.sort()
     for subject in subjects:
         out = out + ("  <rdf:Description rdf:about='%s'>\n" % escape(subject))
-        for property in triples[subject].keys():
+        properties = triples[subject].keys(); properties.sort()
+        for property in properties:
             (namespace_uri, local_name) = property
             prop_tag = "%s:%s" % (prefixByURI[namespace_uri], local_name)
-            for (object_type, object_str) in triples[subject][property]:
+            objects = triples[subject][property]; objects.sort()
+            for (object_type, object_str) in objects:
                 if object_type == URI:
                     out = out + ("    <%s rdf:resource='%s'/>\n" %
                                  (prop_tag, escape(object_str)))
Index: fenfire/org/fenfire/swamp/writer.test
diff -u fenfire/org/fenfire/swamp/writer.test:1.1 
fenfire/org/fenfire/swamp/writer.test:1.2
--- fenfire/org/fenfire/swamp/writer.test:1.1   Fri Sep  5 05:07:53 2003
+++ fenfire/org/fenfire/swamp/writer.test       Fri Sep  5 07:53:07 2003
@@ -44,7 +44,7 @@
         g.add(n.get('foo:a'+str(i)), n.get('foo:b'+str(i)), 
n.get('foo:c'+str(i)))
 
     #### Save
-    m = swamp.writer.write(g, open(file, 'w'))
+    m = swamp.writer.write(g, file)
 
     #### Load
     m = jena.mem.ModelMem()
@@ -70,7 +70,7 @@
         g.add(n.N(), n.N(), n.N() )
 
     #### Save
-    swamp.writer.write(g, java.io.FileWriter(file))
+    swamp.writer.write(g, file)
 
     if dbg:
        print open(file).read()
@@ -99,7 +99,7 @@
     cont.setText(node, 'test', 0)
 
     #### Save
-    swamp.writer.write(g, open(file, 'w'))
+    swamp.writer.write(g, file)
 
     if dbg:
        print open(file).read()