[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire swamp/Graphs.java swamp/Gra...
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] fenfire/org/fenfire swamp/Graphs.java swamp/Gra... |
Date: |
Thu, 05 Jun 2003 14:36:19 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Benja Fallenstein <address@hidden> 03/06/05 14:36:19
Modified files:
org/fenfire/swamp: Graphs.java Graphs.test
org/fenfire/util: URN5Namespace.java
Log message:
fix swamp test
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/URN5Namespace.java.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.7
fenfire/org/fenfire/swamp/Graphs.java:1.8
--- fenfire/org/fenfire/swamp/Graphs.java:1.7 Wed May 28 12:20:22 2003
+++ fenfire/org/fenfire/swamp/Graphs.java Thu Jun 5 14:36:19 2003
@@ -29,78 +29,78 @@
import org.fenfire.swamp.impl.*;
import com.hp.hpl.mesa.rdf.jena.model.*;
import com.hp.hpl.mesa.rdf.jena.mem.*;
-import com.hp.hpl.mesa.rdf.jena.common.*;
import java.util.Iterator;
public class Graphs {
- public static boolean dbg = false;
+ public static boolean dbg = true;
public static void p(String s) { System.out.println("swamp.Graphs:: "+s); }
- final private static String urn5 = //"urn5";
- "http://www.iana.org/assignments/urn-informal/urn-5";
-
public static Model toModel(ConstGraph g) {
- try {
- Model m = new ModelMem();
- for (Iterator i=g.findN_XAA_Iter(); i.hasNext();) {
- Object o = i.next();
- //Resource sub = m.createResource("", Nodes.toString(o));
- Resource sub = new ResourceImpl(urn5, Nodes.toString(o), m);
-
- for (Iterator j=g.findN_1XA_Iter(o); j.hasNext();) {
- Object p = j.next();
- Property prop = m.createProperty(urn5, Nodes.toString(p));
-
- for (Iterator k=g.findN_11X_Iter(o,p); k.hasNext();) {
- Object q = k.next();
- if(q instanceof Literal) {
- if (dbg) p("Literal! : "+ q);
+ try {
+ Model m = new ModelMem();
+ for (Iterator i=g.findN_XAA_Iter(); i.hasNext();) {
+ Object o = i.next();
+ Resource sub = m.createResource(Nodes.toString(o));
+
+ for (Iterator j=g.findN_1XA_Iter(o); j.hasNext();) {
+ 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));
+
+ for (Iterator k=g.findN_11X_Iter(o,p); k.hasNext();) {
+ Object q = k.next();
+ if(q instanceof Literal) {
+ p("Literal! : "+ q);
String s = ((Literal)q).getTextString();
sub.addProperty(prop, s);
- } else {
- if (dbg) p("Resource! : "+ q);
- //Resource ob = m.createResource("",
Nodes.toString(q));
- Resource ob = new ResourceImpl(urn5,
Nodes.toString(q), m);
- sub.addProperty(prop, ob);
- }
- }
- }
- }
- if (dbg) m.write(new java.io.PrintWriter(System.out));
- return m;
- } catch(Exception e) {
- throw new Error("Exception converting graph "+e);
- }
+ } else {
+ p("Resource! : "+ q);
+ Resource ob = m.createResource(Nodes.toString(q));
+ sub.addProperty(prop, o);
+ }
+ }
+ }
+ }
+ return m;
+ } catch(Exception e) {
+ throw new Error("Exception converting graph "+e);
+ }
}
public static Graph toGraph(Model m) {
- try {
+ try {
if (dbg) {
p("toGraph!");
StmtIterator j=m.listStatements();
while(j.hasNext()) {
- p("And there are: ");
- p(" "+ j.next() );
+ p("And there are: "+
+ ((Statement)j.next()).getString() );
}
- p("ok?!");
}
- Graph g = new HashGraph();
- StmtIterator i=m.listStatements();
- while (i.hasNext()) {
- Statement s = i.next();
- Object sub = Nodes.get(s.getSubject().toString());
- Object pred = Nodes.get(s.getPredicate().toString());
- if(s.getObject() instanceof
com.hp.hpl.mesa.rdf.jena.model.Literal) {
- Literal ob = Nodes.getStringLiteral(s.getString());
- } else {
- Object ob = Nodes.get(s.getObject().toString());
+ Graph g = new HashGraph();
+ StmtIterator i=m.listStatements();
+ while (i.hasNext()) {
+ Statement s = i.next();
+ Object sub = Nodes.get(s.getSubject().toString());
+ Object pred = Nodes.get(s.getPredicate().toString());
+ System.out.println("PRED: '"+s.getPredicate().toString()+"'");
+ if(s.getObject() instanceof
com.hp.hpl.mesa.rdf.jena.model.Literal) {
+ Literal ob = Nodes.getStringLiteral(s.getString());
g.add(sub, pred, ob);
- }
- }
- return g;
- } catch(Exception e) {
- throw new Error("Exception converting graph" + e);
- }
+ if(!g.contains(sub,pred,ob)) throw new Error();
+ } else {
+ Object ob = Nodes.get(s.getObject().toString());
+ g.add(sub, pred, ob);
+ if(!g.contains(sub,pred,ob)) throw new Error();
+ }
+ }
+ return g;
+ } catch(Exception e) {
+ throw new Error("Exception converting graph");
+ }
}
}
Index: fenfire/org/fenfire/swamp/Graphs.test
diff -u fenfire/org/fenfire/swamp/Graphs.test:1.3
fenfire/org/fenfire/swamp/Graphs.test:1.4
--- fenfire/org/fenfire/swamp/Graphs.test:1.3 Wed May 28 12:20:22 2003
+++ fenfire/org/fenfire/swamp/Graphs.test Thu Jun 5 14:36:19 2003
@@ -9,14 +9,14 @@
def testFileSaveAndLoadSimple():
- """ Makes resources as aesy as 'a0', 'a1' and such
+ """ Makes resources as aesy as 'foo:a0', 'foo:a1' and such
"""
g = swamp.impl.HashGraph()
n = swamp.Nodes()
for i in range(0,10):
- g.add(n.get('a'+str(i)), n.get('b'+str(i)), n.get('c'+str(i)))
+ g.add(n.get('foo:a'+str(i)), n.get('foo:b'+str(i)),
n.get('foo:c'+str(i)))
#### Save
m = swamp.Graphs.toModel(g)
@@ -52,6 +52,8 @@
m.write(java.io.FileWriter(file))
swamp.Graphs.toGraph(m)
+ print open(file).read()
+
#### Load
m = jena.mem.ModelMem()
m = m.read(java.io.FileReader(file), None)
@@ -59,6 +61,7 @@
iter = g.findN_XAA_Iter()
for i in range(0,10):
+ print "<%s>" % i
assert iter.hasNext()
assert iter.next() != None
Index: fenfire/org/fenfire/util/URN5Namespace.java
diff -u fenfire/org/fenfire/util/URN5Namespace.java:1.1
fenfire/org/fenfire/util/URN5Namespace.java:1.2
--- fenfire/org/fenfire/util/URN5Namespace.java:1.1 Fri Mar 7 11:47:22 2003
+++ fenfire/org/fenfire/util/URN5Namespace.java Thu Jun 5 14:36:19 2003
@@ -107,7 +107,7 @@
synchronized public String generateId() {
long num = nextNumber ++;
- return "urn:urn-5:" + namespace + ":" + num;
+ return "urn:urn-5:" + namespace + ":_" + num;
}
/** Get the first part of a Storm data block id.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire swamp/Graphs.java swamp/Gra...,
Benja Fallenstein <=