[Gzz-commits] fenfire ./TODO org/fenfire/Space.java org/fenfi...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/03/26 21:26:40

Modified files:
        .              : TODO 
        org/fenfire    : Space.java 
        org/fenfire/index/impl: SpaceXuIndexer.java 
        org/fenfire/util: ShortRDF.java 
        org/fenfire/vocab: ALPH.java 
Added files:
        org/fenfire/impl: AbstractSpace.java IdentityManager.java 
                          ModularNodeTexter.java ModularSpace.java 
                          SimpleVStreamTexter.java 
        org/fenfire/util: InitialStringSearcher.java StringSearcher.java 

Log message:
        not enough time..  must sleep a bit

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/TODO.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/Space.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/AbstractSpace.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/IdentityManager.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/ModularNodeTexter.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/ModularSpace.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/SimpleVStreamTexter.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/SpaceXuIndexer.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/InitialStringSearcher.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/StringSearcher.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/ShortRDF.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/ALPH.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/TODO
diff -u fenfire/TODO:1.2 fenfire/TODO:1.3
--- fenfire/TODO:1.2    Wed Mar 26 02:47:55 2003
+++ fenfire/TODO        Wed Mar 26 21:26:40 2003
@@ -1,5 +1,37 @@
 Tasks for fenfire generally
 
+    mudyc's night before demo and Tuomas's train trip:
+
+       -(Benja)  I don't understand your code...
+        package org.fenfire.index.impl.SpaceXuIndexer;
+           -search XXX
+            -also implement remove if needed
+
+       -(tuomas) What's EnfiladeAligner.Instance startEnfiladeAligner(RDFNode 
node);
+           -see package org.fenfire.VStreamNodeTexter
+           -grep  XXX
+       
+           -also in SimpleVStreamTexter
+
+
+
+
+
+       Still left:
+       -modularspace
+
+
+
+
+
+
+
+
+
+
+
+
+
     mudyc:
        - vital abstractions into an utility class:
                
Index: fenfire/org/fenfire/Space.java
diff -u fenfire/org/fenfire/Space.java:1.1 fenfire/org/fenfire/Space.java:1.2
--- fenfire/org/fenfire/Space.java:1.1  Wed Mar 26 18:48:14 2003
+++ fenfire/org/fenfire/Space.java      Wed Mar 26 21:26:40 2003
@@ -14,7 +14,7 @@
  */
 
 public interface Space {
-String rcsid = "$Id: Space.java,v 1.1 2003/03/26 23:48:14 mudyc Exp $";
+String rcsid = "$Id: Space.java,v 1.2 2003/03/27 02:26:40 mudyc Exp $";
 
     /** There are many plases where model is needed
      * and this provides it.
@@ -22,15 +22,15 @@
     Model getModel();
 
 
-    /** Get a node by its ID.
+    /** Get a subject node by its ID.
      * @diagram zzstruct
      */
-    RDFNode getNode(String urn);
+    //       RDFNode getSubjNode(String urn);
 
     /** Get the node representing a given global identity.
      * @diagram zzstruct
      */
-    RDFNode getIdentity(String s);
+    // XXX RDFNode getIdentity(String s);
 
     /** Get the canonical node representing a given node's
      *  global identity.
@@ -49,7 +49,7 @@
      *   May be null.
      */
     // XXX RDFNode zzclone(RDFNode nodeToClone, RDFNode cloneInSlice);
-    RDFNode zzclone(RDFNode nodeToClone);
+    RDFNode clone(RDFNode nodeToClone);
 
     /** Create a new span containing the given character.
      * The node argument is for use when the space is in several
Index: fenfire/org/fenfire/index/impl/SpaceXuIndexer.java
diff -u fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.1 
fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.2
--- fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.1      Wed Mar 26 
18:48:14 2003
+++ fenfire/org/fenfire/index/impl/SpaceXuIndexer.java  Wed Mar 26 21:26:40 2003
@@ -2,6 +2,7 @@
 
 package org.fenfire.index.impl;
 import org.fenfire.*;
+import org.fenfire.impl.*;
 import org.fenfire.vocab.*;
 import org.fenfire.util.*;
 import org.fenfire.index.*;
@@ -13,7 +14,7 @@
 /** An index of xanadu links stored in a space.
  */
 public class SpaceXuIndexer implements XuIndexer {
-public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.1 2003/03/26 
23:48:14 mudyc Exp $";
+public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.2 2003/03/27 
02:26:40 mudyc Exp $";
     public static final boolean dbg = true;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println(s); }
Index: fenfire/org/fenfire/util/ShortRDF.java
diff -u fenfire/org/fenfire/util/ShortRDF.java:1.6 
fenfire/org/fenfire/util/ShortRDF.java:1.7
--- fenfire/org/fenfire/util/ShortRDF.java:1.6  Wed Mar 26 18:48:15 2003
+++ fenfire/org/fenfire/util/ShortRDF.java      Wed Mar 26 21:26:40 2003
@@ -8,7 +8,7 @@
 
 
 public class ShortRDF {
-public static final String rcsid = "$Id: ShortRDF.java,v 1.6 2003/03/26 
23:48:15 mudyc Exp $";
+public static final String rcsid = "$Id: ShortRDF.java,v 1.7 2003/03/27 
02:26:40 mudyc Exp $";
     private static void pa(String s) { System.out.println("ShortRDF"+s); }
 
     public static Resource getRes(Model model, RDFNode node, Property 
predicate) 
@@ -91,6 +91,8 @@
        throw new Error("ShortRDF has RDFException!");
     }}
 
+    /** old -pred-> new
+     */
     static public RDFNode newNode(Model model, RDFNode node, Property 
property) 
     { try {
        String uri = URN5Namespace.instance.generateId();
@@ -104,7 +106,52 @@
        throw new Error("ShortRDF has RDFException!");
     }}
 
-    
+    /** New -pred-> old
+     */
+    static public RDFNode newNodeToNode(Model model, RDFNode node, Property 
property) 
+    { try {
+       String uri = URN5Namespace.instance.generateId();
+        Resource res = model.createResource(uri);
 
+       ((Resource)res).addProperty(property, (Resource)node);
+       return res;
 
+    } catch (RDFException e) {
+       pa("Exception ocurred!: "+e);
+       throw new Error("ShortRDF has RDFException!");
+    }}
+
+
+    static public RDFNode getDataNode(Model model, RDFNode node)
+    {
+       if (isNodeType(model, node, ALPH.dataType))
+           return node;
+
+       if (!isNodeType(model, node, ALPH.cloneType))
+           throw new Error("Wrong type!");
+
+       RDFNode data = getRes(model, (Resource)node, ALPH.clone);
+       if (!isNodeType(model, node, ALPH.dataType))
+       throw new Error("Wrong type!");
+       return data;
+    }
+
+    static public RDFNode getDataClone(Model model, RDFNode node)
+    { try {
+       if (isNodeType(model, node, ALPH.dataType)) {
+           RDFNode res =  newNodeToNode(model, (Resource)node, ALPH.clone);
+           return ((Resource)res).addProperty(RDF.type, ALPH.cloneType);
+       } 
+
+       if (!isNodeType(model, node, ALPH.cloneType))
+           throw new Error("Wrong type!");
+
+       Resource res = getRes(model, node, ALPH.clone);
+       res =  (Resource) newNodeToNode(model, (Resource)res, ALPH.clone);
+       return res.addProperty(RDF.type, ALPH.cloneType);
+    } catch (RDFException e) {
+       pa("Exception ocurred!: "+e);
+       throw new Error("ShortRDF has RDFException!");
+    }}
+    
 }
Index: fenfire/org/fenfire/vocab/ALPH.java
diff -u fenfire/org/fenfire/vocab/ALPH.java:1.2 
fenfire/org/fenfire/vocab/ALPH.java:1.3
--- fenfire/org/fenfire/vocab/ALPH.java:1.2     Wed Mar 26 18:48:15 2003
+++ fenfire/org/fenfire/vocab/ALPH.java Wed Mar 26 21:26:40 2003
@@ -5,22 +5,28 @@
 import com.hp.hpl.mesa.rdf.jena.common.*;
 
 public class ALPH {
-public static final String rcsid = "$Id: ALPH.java,v 1.2 2003/03/26 23:48:15 
mudyc Exp $";
+public static final String rcsid = "$Id: ALPH.java,v 1.3 2003/03/27 02:26:40 
mudyc Exp $";
     protected static void pa(String s) { System.out.println("ALPH: "+s); }
     
     static public Property content;
+    static public Property clone;
     static public Property xuLinkFrom;
     static public Property xuLinkTo;
 
     static public Resource xuType;
+    static public Resource cloneType;
+    static public Resource dataType;
     
     static {
        try {
            content = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#content";);
+           clone = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#clone";);
            xuLinkFrom = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#xuLinkFrom";);
            xuLinkTo = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#xuLinkTo";);
 
            xuType = new 
ResourceImpl("http://fenfire.org/vocabulary/alph.html#xuType";);
+           cloneType = new 
ResourceImpl("http://fenfire.org/vocabulary/alph.html#cloneType";);
+           dataType = new 
ResourceImpl("http://fenfire.org/vocabulary/alph.html#dataType";);
 
        } catch (RDFException e) {
            pa("Failed: "+e);