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

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/03/26 13:56:01

Modified files:
        org/fenfire/util: AlphContent.java 
        org/fenfire/vocab: SPATIAL.java 

Log message:
        xml reader, test is vital of course

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/AlphContent.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/SPATIAL.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.2 
fenfire/org/fenfire/util/AlphContent.java:1.3
--- fenfire/org/fenfire/util/AlphContent.java:1.2       Wed Mar 26 11:05:59 2003
+++ fenfire/org/fenfire/util/AlphContent.java   Wed Mar 26 13:56:00 2003
@@ -9,12 +9,15 @@
 import com.hp.hpl.mesa.rdf.jena.common.*;
 
 import java.util.*;
+import java.io.*;
+import javax.xml.parsers.*;
+
 
 /** Help class to work with Alph
  */
 public class AlphContent {
-public static final String rcsid = "$Id: AlphContent.java,v 1.2 2003/03/26 
16:05:59 mudyc Exp $";
-    private static void pa(String s) { System.out.println("Alph: "+s); }
+public static final String rcsid = "$Id: AlphContent.java,v 1.3 2003/03/26 
18:56:00 mudyc Exp $";
+    private static void pa(String s) { System.out.println("AlphContent: "+s); }
 
 
     // Static helpers..
@@ -25,19 +28,25 @@
      */
     public Span getSpan(Model model, RDFNode node) 
     { try {
-       Selector selector = new SelectorImpl((Resource)node, ALPH.content, 
(RDFNode) null);
-        StmtIterator iter = model.listStatements(selector);
-       if (iter.hasNext()) {
-           Statement stmt = iter.next();
-           //return stmt.getInt();
-           // XXX how do you get the span??
-         
 
-           
+       NodeIterator iter = model.listObjectsOfProperty((Resource)node, 
ALPH.content);
+       if (iter.hasNext()) {
+           Literal lit = (Literal)iter.next();
 
-           return null;
+           try {
+               SpanReader sr = new SpanReader();
+               SAXParser parser = 
SAXParserFactory.newInstance().newSAXParser();
+               parser.parse(new StringBufferInputStream(lit.getString()), sr);
+
+               ArrayList l = (ArrayList)sr.getSpans();
+               return (Span)l.get(0);
+               
+           } catch (Exception e) {
+               pa("Exception!: "+e);
+               throw new Error("getspan has an Exception!");
+           } 
        }
-       else throw new Error("No available resources!");
+       else throw new Error("No available content!");
 
     } catch (RDFException e) {
        pa("Exception ocurred!: "+e);
@@ -48,19 +57,31 @@
     /** helper to present text contents on screen
      * Content MUST be TextSpan so check it put first.
      */
-    public Span getString(Model model, RDFNode node) 
+    public String getString(Model model, RDFNode node) 
     { try {
-       Selector selector = new SelectorImpl((Resource)node, ALPH.content, 
(RDFNode) null);
-        StmtIterator iter = model.listStatements(selector);
+
+       NodeIterator iter = model.listObjectsOfProperty((Resource)node, 
ALPH.content);
        if (iter.hasNext()) {
-           Statement stmt = iter.next();
-           //return stmt.getInt();
-           // XXX how do you get the span??
-           
+           Literal lit = (Literal)iter.next();
 
-           return null;
+           try {
+               SpanReader sr = new SpanReader();
+               SAXParser parser = 
SAXParserFactory.newInstance().newSAXParser();
+               parser.parse(new StringBufferInputStream(lit.getString()), sr);
+
+               String text="";
+               
+               ArrayList l = (ArrayList)sr.getSpans();
+               for (int i=0; i<l.size(); i++) 
+                   text += ((TextSpan)l.get(i)).getText();
+               return text;
+               
+           } catch (Exception e) {
+               pa("Exception!: "+e);
+               throw new Error("getspan has an Exception!");
+           } 
        }
-       else throw new Error("No available resources!");
+       else throw new Error("No available content!");
 
     } catch (RDFException e) {
        pa("Exception ocurred!: "+e);
Index: fenfire/org/fenfire/vocab/SPATIAL.java
diff -u fenfire/org/fenfire/vocab/SPATIAL.java:1.1 
fenfire/org/fenfire/vocab/SPATIAL.java:1.2
--- fenfire/org/fenfire/vocab/SPATIAL.java:1.1  Wed Mar 26 07:18:51 2003
+++ fenfire/org/fenfire/vocab/SPATIAL.java      Wed Mar 26 13:56:00 2003
@@ -5,10 +5,11 @@
 import com.hp.hpl.mesa.rdf.jena.common.*;
 
 
-/** *Immutable!*
+/** You can just add to this vocabulary! 
+ * Immutable to erase or change content - just add more.
  */
 public class SPATIAL {
-public static final String rcsid = "$Id: SPATIAL.java,v 1.1 2003/03/26 
12:18:51 mudyc Exp $";
+public static final String rcsid = "$Id: SPATIAL.java,v 1.2 2003/03/26 
18:56:00 mudyc Exp $";
     protected static void pa(String s) { System.out.println("SPATIAL: "+s); }
     
     static public Property coordX;