[Gzz-commits] fenfire/org/fenfire util/AlphContent.java util/...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/03/26 18:48:15

Modified files:
        org/fenfire/util: AlphContent.java ShortRDF.java 
        org/fenfire/vocab: ALPH.java 
Added files:
        org/fenfire    : JavaObjector.java NodeTexter.java Obs.java 
                         ObsTrigger.java Space.java 
                         VStreamNodeTexter.java 
        org/fenfire/index: Index.java IndexManager.java 
                           IndexedVStreamNodeTexter.java Indexer.java 
                           XuIndexer.java XuLink.java 
        org/fenfire/index/impl: EnfiladeOverlapIndex.java 
                                SpaceXuIndexer.java 
                                TransientXuIndexer.java 

Log message:
        start...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/JavaObjector.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/NodeTexter.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/Obs.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/ObsTrigger.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/Space.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/VStreamNodeTexter.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/Index.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/IndexManager.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/IndexedVStreamNodeTexter.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/Indexer.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/XuIndexer.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/XuLink.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/EnfiladeOverlapIndex.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/SpaceXuIndexer.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/TransientXuIndexer.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/AlphContent.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/ShortRDF.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/ALPH.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/AlphContent.java
diff -u fenfire/org/fenfire/util/AlphContent.java:1.3 
fenfire/org/fenfire/util/AlphContent.java:1.4
--- fenfire/org/fenfire/util/AlphContent.java:1.3       Wed Mar 26 13:56:00 2003
+++ fenfire/org/fenfire/util/AlphContent.java   Wed Mar 26 18:48:15 2003
@@ -16,7 +16,7 @@
 /** Help class to work with Alph
  */
 public class AlphContent {
-public static final String rcsid = "$Id: AlphContent.java,v 1.3 2003/03/26 
18:56:00 mudyc Exp $";
+public static final String rcsid = "$Id: AlphContent.java,v 1.4 2003/03/26 
23:48:15 mudyc Exp $";
     private static void pa(String s) { System.out.println("AlphContent: "+s); }
 
 
@@ -72,8 +72,10 @@
                String text="";
                
                ArrayList l = (ArrayList)sr.getSpans();
-               for (int i=0; i<l.size(); i++) 
+               for (int i=0; i<l.size(); i++) {
                    text += ((TextSpan)l.get(i)).getText();
+                   pa(i+" Xml: "+ text);
+               }
                return text;
                
            } catch (Exception e) {
@@ -89,34 +91,6 @@
     }} 
 
 
-    /** stupid - just makes a text content 
-     */
-    public void setTextContent(Model model, RDFNode node, String text) 
-    { try {
-       // set node -> enfilade(text)
-       setText(node, text);
-       
-       // get enfilade
-       Enfilade1D enf = getEnfilade(node);
-       SpanSerializer sr = new SpanSerializer();
-
-       String xml = null;
-       Vector v = (Vector)enf.getList();
-       for (int i=0; i<v.size(); i++) {
-           xml = sr.span2xml((Span)v.get(i));
-           xml += " "; 
-       }
-
-       Literal lit = new LiteralImpl(xml);
-       model.add(new StatementImpl((Resource)node, ALPH.content, 
(RDFNode)lit));
-
-    } catch (RDFException e) {
-       pa("Exception ocurred!: "+e);
-       throw new Error("setTextContent got RDFException!");
-    }}
-
-
-
 
     // Old VStreamer or something...
 
@@ -124,10 +98,12 @@
     private SpanMaker spanMaker;
     private Enfilade1D.Maker enfMaker;
     //private XuIndexer xuIndex;
+    private Model model;
 
-    public AlphContent(SpanMaker spanMaker, Enfilade1D.Maker enfMaker) {
+    public AlphContent(SpanMaker spanMaker, Enfilade1D.Maker enfMaker, Model 
model) {
        this.spanMaker = spanMaker;
        this.enfMaker = enfMaker;
+       this.model = model;
     }
 
 
@@ -144,12 +120,27 @@
         else return enf;
     }
 
-    public final void setEnfilade(RDFNode node, Enfilade1D vstream) {
+    private final void setEnfilade(RDFNode node, Enfilade1D vstream) {
        setMap(node, vstream);
 
-       // XXX
-       // node.createProperty(ALPH.content,  enf.toXml() );
-
+       try {
+           SpanSerializer sr = new SpanSerializer();
+           
+           String xml = "";
+           ArrayList l = (ArrayList)vstream.getList();
+           for (int i=0; i<l.size(); i++) {
+               xml = sr.span2xml((Span)l.get(i));
+               xml += " "; 
+           }
+           pa("Xml: "+xml);
+           
+           Literal lit = new LiteralImpl(xml);
+           model.add(new StatementImpl((Resource)node, ALPH.content, 
(RDFNode)lit));
+       
+       } catch (RDFException e) {
+           pa("Exception ocurred!: "+e);
+           throw new Error("setTextContent got RDFException!");
+       }
     }
 
     public String getText(RDFNode node) {
Index: fenfire/org/fenfire/util/ShortRDF.java
diff -u fenfire/org/fenfire/util/ShortRDF.java:1.5 
fenfire/org/fenfire/util/ShortRDF.java:1.6
--- fenfire/org/fenfire/util/ShortRDF.java:1.5  Wed Mar 26 09:00:25 2003
+++ fenfire/org/fenfire/util/ShortRDF.java      Wed Mar 26 18:48:15 2003
@@ -8,7 +8,7 @@
 
 
 public class ShortRDF {
-public static final String rcsid = "$Id: ShortRDF.java,v 1.5 2003/03/26 
14:00:25 mudyc Exp $";
+public static final String rcsid = "$Id: ShortRDF.java,v 1.6 2003/03/26 
23:48:15 mudyc Exp $";
     private static void pa(String s) { System.out.println("ShortRDF"+s); }
 
     public static Resource getRes(Model model, RDFNode node, Property 
predicate) 
@@ -71,5 +71,40 @@
        pa("Exception ocurred!: "+e);
        throw new Error("ShortRDF has RDFException!");
     }}
+
+
+    static public RDFNode newNode(Model model) {
+       return newNode(model, null);
+    }
+    static public RDFNode newNode(Model model, RDFNode object) 
+    { try {
+       String uri = URN5Namespace.instance.generateId();
+       if (object == null) {
+           return model.createResource(uri);
+       } else {
+           Resource res = model.createResource(uri);
+           res.addProperty(RDF.type, (Resource)object);
+           return res;
+       }
+    } catch (RDFException e) {
+       pa("Exception ocurred!: "+e);
+       throw new Error("ShortRDF has RDFException!");
+    }}
+
+    static public RDFNode newNode(Model model, RDFNode node, Property 
property) 
+    { try {
+       String uri = URN5Namespace.instance.generateId();
+        Resource res = model.createResource(uri);
+
+       ((Resource)node).addProperty(property, res);
+       return res;
+
+    } 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.1 
fenfire/org/fenfire/vocab/ALPH.java:1.2
--- fenfire/org/fenfire/vocab/ALPH.java:1.1     Wed Mar 26 07:18:51 2003
+++ fenfire/org/fenfire/vocab/ALPH.java Wed Mar 26 18:48:15 2003
@@ -5,14 +5,23 @@
 import com.hp.hpl.mesa.rdf.jena.common.*;
 
 public class ALPH {
-public static final String rcsid = "$Id: ALPH.java,v 1.1 2003/03/26 12:18:51 
mudyc Exp $";
+public static final String rcsid = "$Id: ALPH.java,v 1.2 2003/03/26 23:48:15 
mudyc Exp $";
     protected static void pa(String s) { System.out.println("ALPH: "+s); }
     
     static public Property content;
+    static public Property xuLinkFrom;
+    static public Property xuLinkTo;
+
+    static public Resource xuType;
     
     static {
        try {
            content = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#content";);
+           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";);
+
        } catch (RDFException e) {
            pa("Failed: "+e);
        }