[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/swamp Graphs.java Graphs.test
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire/swamp Graphs.java Graphs.test |
Date: |
Wed, 28 May 2003 09:45:51 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/05/28 09:45:50
Modified files:
org/fenfire/swamp: Graphs.java Graphs.test
Log message:
there's a bug in swamp :/
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/swamp/Graphs.java
diff -u fenfire/org/fenfire/swamp/Graphs.java:1.5
fenfire/org/fenfire/swamp/Graphs.java:1.6
--- fenfire/org/fenfire/swamp/Graphs.java:1.5 Wed May 21 14:41:29 2003
+++ fenfire/org/fenfire/swamp/Graphs.java Wed May 28 09:45:50 2003
@@ -32,25 +32,28 @@
import java.util.Iterator;
public class Graphs {
+ public static boolean dbg = true;
+ public static void p(String s) { System.out.println("swamp.Graphs:: "+s); }
public static Model toModel(ConstGraph g) {
try {
Model m = new ModelMem();
- Iterator i=g.findN_XAA_Iter();
- while(i.hasNext()) {
+ for (Iterator i=g.findN_XAA_Iter(); i.hasNext();) {
Object o = i.next();
Resource sub = m.createResource(Nodes.toString(o));
- Iterator j=g.findN_1XA_Iter(o);
- while(j.hasNext()) {
+
+ for (Iterator j=g.findN_1XA_Iter(o); j.hasNext();) {
Object p = j.next();
Property prop = m.createProperty("", Nodes.toString(p));
- Iterator k=g.findN_11X_Iter(o,p);
- while(k.hasNext()) {
+
+ for (Iterator k=g.findN_11X_Iter(o,p); k.hasNext();) {
Object q = k.next();
- if(q instanceof Literal) {
- String s = ((Literal)q).getTextString();
- sub.addProperty(prop, s);
+ if(q instanceof Literal) {
+ p("Literal! : "+ q);
+ String s = ((Literal)q).getTextString();
+ sub.addProperty(prop, s);
} else {
+ p("Resource! : "+ q);
Resource ob = m.createResource(Nodes.toString(q));
sub.addProperty(prop, o);
}
@@ -65,6 +68,15 @@
public static Graph toGraph(Model m) {
try {
+ if (dbg) {
+ p("toGraph!");
+ StmtIterator j=m.listStatements();
+ while(j.hasNext()) {
+ p("And there are: "+
+ ((Statement)j.next()).getString() );
+ }
+ }
+
Graph g = new HashGraph();
StmtIterator i=m.listStatements();
while (i.hasNext()) {
Index: fenfire/org/fenfire/swamp/Graphs.test
diff -u fenfire/org/fenfire/swamp/Graphs.test:1.1
fenfire/org/fenfire/swamp/Graphs.test:1.2
--- fenfire/org/fenfire/swamp/Graphs.test:1.1 Wed May 28 07:57:19 2003
+++ fenfire/org/fenfire/swamp/Graphs.test Wed May 28 09:45:50 2003
@@ -10,18 +10,25 @@
def testFileSaveAndLoad():
g = swamp.impl.HashGraph()
n = swamp.Nodes()
- for i in range(0,100):
- g.add(n.N(), n.N(), n.N())
+ for i in range(0,10):
+ g.add(n.get('a'+str(i)), n.get('b'+str(i)), n.get('c'+str(i)))
#### Save
m = swamp.Graphs.toModel(g)
- m.write(java.io.FileWriter(file))
-
+ # Without 'RDF/XML' this test will throw an exception!
+ m.write(java.io.FileWriter(file), 'RDF/XML')
+ m.write(java.io.PrintWriter(System.out))
#### Load
m = jena.mem.ModelMem()
- m.read(java.io.FileReader(file), None)
+ # this loads nothing!
+ m.read(java.io.FileReader(file), 'RDF/XML')
g = swamp.Graphs.toGraph(m)
+
+ iter = g.findN_XAA_Iter()
+ for i in range(0,10):
+ assert iter.hasNext()
+ assert iter.next() != None
#### clean
os.system('rm '+file)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire/swamp Graphs.java Graphs.test,
Matti Katila <=