[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py swamp/Grap...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Benja Fallenstein <address@hidden>      03/06/09 18:45:36

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/swamp: Graphs.java 

Log message:
        fix serialization bugs... which doesn't mean that deserialization works!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.69 
fenfire/org/fenfire/demo/buoyoing.py:1.70
--- fenfire/org/fenfire/demo/buoyoing.py:1.69   Mon Jun  9 17:49:12 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Mon Jun  9 18:45:36 2003
@@ -108,6 +108,8 @@
     fen.graph.add(Nodes.get(paperHome), RDF.type, CANVAS2D.Canvas);
     noteHome = Nodes.get(ppAct.newNote(paperHome, 0, 0, 'HOME'))
 
+    ppAct.assocNotes(noteHome, 1, noteA1)
+
 
 textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
 #textnodeview = ff.view.lava.RSTText(fen.txtfunc, textstyle, 1)
Index: fenfire/org/fenfire/swamp/Graphs.java
diff -u fenfire/org/fenfire/swamp/Graphs.java:1.9 
fenfire/org/fenfire/swamp/Graphs.java:1.10
--- fenfire/org/fenfire/swamp/Graphs.java:1.9   Fri Jun  6 16:04:33 2003
+++ fenfire/org/fenfire/swamp/Graphs.java       Mon Jun  9 18:45:36 2003
@@ -46,9 +46,23 @@
                     Object p = j.next();
 
                    String s0 = Nodes.toString(p);
-                   int i0 = s0.lastIndexOf(':')+1;
-                    Property prop = m.createProperty(s0.substring(0, i0), 
-                                                    s0.substring(i0));
+                   boolean hadAlpha = false;
+                   int i0 = s0.length()-1;
+                   Property prop;
+                   while(true) {
+                       char c0 = s0.charAt(i0);
+                       if(Character.isLetter(c0)) hadAlpha = true;
+                       else if(Character.isDigit(c0)) hadAlpha = false;
+                       else if(hadAlpha) {
+                           prop = m.createProperty(s0.substring(0, i0+1), 
+                                            s0.substring(i0+1));
+                           break;
+                       } else
+                           throw new Error("Cannot serialize URI: "+s0);
+                       i0--;
+                       if(i0 < 0)
+                           throw new Error("Cannot serialize URI: "+s0);
+                   }
 
                     for (Iterator k=g.findN_11X_Iter(o,p); k.hasNext();) {
                         Object q = k.next();
@@ -61,7 +75,7 @@
                             if(dbg)
                                p("Resource! : "+ q);
                             Resource ob = m.createResource(Nodes.toString(q));
-                            sub.addProperty(prop, o);
+                            sub.addProperty(prop, ob);
                         }
                     }
                 }