[Gzz-commits] fenfire/org/fenfire impl/SimpleNodeContent.java...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/15 12:02:08

Modified files:
        org/fenfire/impl: SimpleNodeContent.java 
        org/fenfire/index/impl: SpaceXuIndexer.java 
Removed files:
        org/fenfire/index: IndexManager.java 

Log message:
        Further towards compilation. Xuindexer will not work for the demo but 
it's not important - transclusions are the more important thing to show.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/SimpleNodeContent.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/SpaceXuIndexer.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/impl/SimpleNodeContent.java
diff -u fenfire/org/fenfire/impl/SimpleNodeContent.java:1.2 
fenfire/org/fenfire/impl/SimpleNodeContent.java:1.3
--- fenfire/org/fenfire/impl/SimpleNodeContent.java:1.2 Sun Apr 13 03:49:05 2003
+++ fenfire/org/fenfire/impl/SimpleNodeContent.java     Tue Apr 15 12:02:08 2003
@@ -20,7 +20,7 @@
 
 public class SimpleNodeContent implements NodeContent {
     public static boolean dbg = true;
-public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.2 
2003/04/13 07:49:05 tjl Exp $";
+public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.3 
2003/04/15 16:02:08 tjl Exp $";
     private static void pa(String s) { System.out.println("AlphContent: "+s); }
     SpanReader spanReader = new SpanReader();
 
@@ -52,19 +52,10 @@
        return get(node, null);
     }
 
-    public org.nongnu.alph.Enfilade1D get(Object node, Obs o) {
-       Object c = fen.constgraph.find1_11X(node, FF.content, o);
-       if(dbg) pa("Getting content: "+node+" "+c);
-       if(c == null) return empty;
-
-       if(!(c instanceof Literal))  {
-           if(dbg) pa("Was not literal: "+c);
-           throw new Error("Content not literal");
-       }
-
+    public org.nongnu.alph.Enfilade1D enfiladeFromLiteral(Literal l) {
        try {
            saxParser.parse(new StringBufferInputStream(
-                       ((Literal)c).getRawXMLString()), spanReader);
+                       (l).getRawXMLString()), spanReader);
 
        } catch (Exception e) {
            pa("Exception!: "+e);
@@ -75,9 +66,26 @@
        spanReader.clear();
        return enf;
     }
+    public Literal literalFromEnfilade(org.nongnu.alph.Enfilade1D enf) {
+       String ser = SpanSerializer.serialize(enf);
+       return Nodes.getRawXMLLiteral(ser);
+    }
+
+    public org.nongnu.alph.Enfilade1D get(Object node, Obs o) {
+       Object c = fen.constgraph.find1_11X(node, FF.content, o);
+       if(dbg) pa("Getting content: "+node+" "+c);
+       if(c == null) return empty;
+
+       if(!(c instanceof Literal))  {
+           if(dbg) pa("Was not literal: "+c);
+           throw new Error("Content not literal");
+       }
+       return enfiladeFromLiteral((Literal)c);
+    }
+
 
-    public void set(Object node, org.nongnu.alph.Enfilade1D vstream) {
-       String ser = SpanSerializer.serialize(vstream);
-       fen.graph.set1_11X(node, FF.content, Nodes.getRawXMLLiteral(ser));
+    public void set(Object node, org.nongnu.alph.Enfilade1D enf) {
+       Literal lit = literalFromEnfilade(enf);
+       fen.graph.set1_11X(node, FF.content, lit);
     }
 }
Index: fenfire/org/fenfire/index/impl/SpaceXuIndexer.java
diff -u fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.5 
fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.6
--- fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.5      Tue Apr 15 
10:59:08 2003
+++ fenfire/org/fenfire/index/impl/SpaceXuIndexer.java  Tue Apr 15 12:02:08 2003
@@ -1,20 +1,20 @@
-//(c): Benja Fallenstein and Matti J. Katila
+//(c): Benja Fallenstein and Matti J. Katila and Tuomas J. Lukka
 
 package org.fenfire.index.impl;
 import org.fenfire.*;
 import org.fenfire.impl.*;
+import org.fenfire.swamp.*;
 import org.fenfire.vocab.*;
 import org.fenfire.util.*;
 import org.fenfire.index.*;
 import org.nongnu.alph.*;
-import com.hp.hpl.mesa.rdf.jena.model.*;
 import java.util.*;
 
 
 /** An index of xanadu links stored in a space.
  */
 public class SpaceXuIndexer implements XuIndexer {
-public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.5 2003/04/15 
14:59:08 tjl Exp $";
+public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.6 2003/04/15 
16:02:08 tjl Exp $";
     public static final boolean dbg = true;
     protected static void pa(String s) { System.out.println(s); }
 
@@ -23,8 +23,6 @@
     protected MyIndex forwardIndex = new MyIndex(1),
                       backwardIndex = new MyIndex(2);
 
-    protected Map linksByNode = new HashMap(),
-                  nodesByLink = new HashMap();
 
     public SpaceXuIndexer(Fen fen) {
         this.fen = fen;
@@ -52,12 +50,9 @@
            }
            */
 
-           for(Iterator i=all.iterator(); i.hasNext(); ) {
-               RDFNode n = (RDFNode)i.next();
 
                // XXX ????
                
-           }
 
            return res;
          }
@@ -66,7 +61,8 @@
     public Index getForwardIndex() { return forwardIndex; }
     public Index getBackwardIndex() { return backwardIndex; }
 
-    protected Object getLinkForNode(RDFNode node) {
+    /*
+    protected Object getLinkForNode(Object node) {
        Object res = linksByNode.get(node);
        if (res == null) {
            if(ShortRDF.isNodeType(space.getModel(), node, ALPH.xuType)) {
@@ -86,37 +82,26 @@
        }
        return res;
     }
+    */
 
-    /**                                      ,--ALPH:xuLinkFrom -> from 
+    /**                                      ,--ALPH:xuLinkFrom -> enfilade 
      *      ALPH.xuType <--RDF:type --- id--<
-     *                                       '--ALPH:xuLinkTo-> to
+     *                                       '--ALPH:xuLinkTo-> enfilade
      */
     public void add(XuLink l) {
-       Model mod = space.getModel();
-       RDFNode id = ShortRDF.newNode(mod, ALPH.xuType);
-       RDFNode from = ShortRDF.newNode(mod, id, ALPH.xuLinkFrom, 
ALPH.xuLinkType);
-       RDFNode to = ShortRDF.newNode(mod, id, ALPH.xuLinkTo, ALPH.xuLinkType);
+       Object idnode = RDFUtil.N(fen, ALPH.xuType);
+
+       Literal from = ((org.fenfire.impl.SimpleNodeContent)fen.txt)
+                           .literalFromEnfilade(l.from);
+       Literal to = ((org.fenfire.impl.SimpleNodeContent)fen.txt)
+                           .literalFromEnfilade(l.to);
 
-       texter.setEnfilade(from, l.from);
-       texter.setEnfilade(to, l.to);
+       fen.graph.add(idnode, ALPH.xuLinkFrom, from);
+       fen.graph.add(idnode, ALPH.xuLinkTo, to);
 
-       linksByNode.put(id, l);
-       nodesByLink.put(l, id);
     }
 
     public void remove(XuLink l) {
-       /*
-        Cell c = (Cell)nodesByLink.get(l);
-        if(c != null) {
-           c.s(link, 2).delete();
-           c.s(link, 1).delete();
-           c.delete();
-           nodesByLink.remove(l);
-           linksByNode.remove(c);
-       }
-       */
-
-       // XXX
        pa("Not implemented!!!!");
     }
 }