[Gzz-commits] fenfire/org/fenfire/swamp Graphs.java Graphs.test

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/07/16 08:25:17

Modified files:
        org/fenfire/swamp: Graphs.java Graphs.test 

Log message:
        Phew! At last I found the bug which blocked the saving.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.test.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/swamp/Graphs.java
diff -u fenfire/org/fenfire/swamp/Graphs.java:1.12 
fenfire/org/fenfire/swamp/Graphs.java:1.13
--- fenfire/org/fenfire/swamp/Graphs.java:1.12  Tue Jun 10 07:17:42 2003
+++ fenfire/org/fenfire/swamp/Graphs.java       Wed Jul 16 08:25:17 2003
@@ -75,7 +75,11 @@
                         if(q instanceof Literal) {      
                             if(dbg)
                                p("Literal! : "+ q);
-                            String s = ((Literal)q).getTextString();
+                            String s;
+                            if (p == org.fenfire.vocab.FF.content)
+                                s = ((Literal)q).getRawXMLString();
+                            else
+                                s = ((Literal)q).getTextString();
                             sub.addProperty(prop, s);
                         } else {
                             if(dbg)
@@ -111,8 +115,13 @@
                 Object pred = Nodes.get(s.getPredicate().toString());
                if(dbg)
                    p("PRED: '"+s.getPredicate().toString()+"'");
+
                 if(s.getObject() instanceof 
com.hp.hpl.mesa.rdf.jena.model.Literal) {
-                    Literal ob = Nodes.getStringLiteral(s.getString());
+                    Literal ob;
+                    if (pred == org.fenfire.vocab.FF.content)
+                        ob = Nodes.getRawXMLLiteral(s.getString());
+                    else
+                        ob = Nodes.getStringLiteral(s.getString());
                    g.add(sub, pred, ob);
                    if(!g.contains(sub,pred,ob)) throw new Error();
                 } else {
Index: fenfire/org/fenfire/swamp/Graphs.test
diff -u fenfire/org/fenfire/swamp/Graphs.test:1.9 
fenfire/org/fenfire/swamp/Graphs.test:1.10
--- fenfire/org/fenfire/swamp/Graphs.test:1.9   Mon Jun 30 09:12:09 2003
+++ fenfire/org/fenfire/swamp/Graphs.test       Wed Jul 16 08:25:17 2003
@@ -107,7 +107,7 @@
     m.write(java.io.FileWriter(file))
     swamp.Graphs.toGraph(m)
 
-    if 1 or dbg:
+    if dbg:
        print open(file).read()
 
     #### Load