[Gzz-commits] alph/org/nongnu/alph impl/FakeTextSpan.java imp...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/15 23:44:23

Modified files:
        org/nongnu/alph/impl: FakeTextSpan.java PageImageScroll.java 
        org/nongnu/alph/util: psimages.py 
        org/nongnu/alph/xml: SpanReader.java SpanSerializer.java 
                             serialization.test 

Log message:
        Serialize fake spans, too

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/FakeTextSpan.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/PageImageScroll.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/util/psimages.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanReader.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanSerializer.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/serialization.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/impl/FakeTextSpan.java
diff -u alph/org/nongnu/alph/impl/FakeTextSpan.java:1.2 
alph/org/nongnu/alph/impl/FakeTextSpan.java:1.3
--- alph/org/nongnu/alph/impl/FakeTextSpan.java:1.2     Sun Apr  6 04:24:06 2003
+++ alph/org/nongnu/alph/impl/FakeTextSpan.java Tue Apr 15 23:44:23 2003
@@ -38,17 +38,19 @@
  */
 
 public class FakeTextSpan implements TextSpan, java.io.Serializable {
-public static final String rcsid = "$Id: FakeTextSpan.java,v 1.2 2003/04/06 
08:24:06 tjl Exp $";
+public static final String rcsid = "$Id: FakeTextSpan.java,v 1.3 2003/04/16 
03:44:23 tjl Exp $";
 
     String text;
     transient FakeTextScrollBlock sb;
     transient char[] textarr;
 
     public FakeTextSpan(String s) {
+       /*
        String id = URN5Namespace.instance.getStormDataBlockId();
        id = id + "," + URIUtil.escapeUTF8(s);
 
-       sb = new FakeTextScrollBlock(/*s, id*/);
+       sb = new FakeTextScrollBlock(s, id);
+       */
        this.text = s;
     }
 
@@ -121,7 +123,10 @@
     }
 
     public ScrollBlock getScrollBlock() {
+       return null;
+       /*
        if(sb == null) sb = new FakeTextScrollBlock();
        return sb;
+       */
     }
 }
Index: alph/org/nongnu/alph/impl/PageImageScroll.java
diff -u alph/org/nongnu/alph/impl/PageImageScroll.java:1.2 
alph/org/nongnu/alph/impl/PageImageScroll.java:1.3
--- alph/org/nongnu/alph/impl/PageImageScroll.java:1.2  Sat Apr 12 02:29:53 2003
+++ alph/org/nongnu/alph/impl/PageImageScroll.java      Tue Apr 15 23:44:23 2003
@@ -40,7 +40,7 @@
 
 public class PageImageScroll
        implements ScrollBlockManager.MediaserverScrollBlock {
-String rcsid = "$Id: PageImageScroll.java,v 1.2 2003/04/12 06:29:53 tjl Exp $";
+String rcsid = "$Id: PageImageScroll.java,v 1.3 2003/04/16 03:44:23 tjl Exp $";
     public static boolean dbg = true;
     final static void p(String s) { if(dbg) System.out.println(s); }
     final static void pa(String s) { System.out.println(s); }
@@ -52,7 +52,7 @@
      */
     int RESOLUTION=170; // sigh
 
-    String DIR="../mstmpimg/"; // XXX Non-platform-independent!
+    String DIR="../tmpimg/"; // XXX Non-platform-independent!
 
     int pages;
     StormPool ms;
@@ -81,7 +81,12 @@
     /** Return the image file name for the given, 0-based page.
      */
     public String imageFilename(int page) {
-       return new String(DIR+getID()+"-"+RESOLUTION+"-"+(page+1));
+       String id = getID();
+       int ind;
+       while((ind = id.indexOf("/")) >= 0) {
+           id = id.substring(0,ind) + "__" + id.substring(ind+1);
+       }
+       return new String(DIR+id+"-"+RESOLUTION+"-"+(page+1));
     }
     /** The resolution of the images.
      */
Index: alph/org/nongnu/alph/util/psimages.py
diff -u alph/org/nongnu/alph/util/psimages.py:1.1 
alph/org/nongnu/alph/util/psimages.py:1.2
--- alph/org/nongnu/alph/util/psimages.py:1.1   Tue Apr 15 07:02:07 2003
+++ alph/org/nongnu/alph/util/psimages.py       Tue Apr 15 23:44:23 2003
@@ -21,8 +21,8 @@
        if l != "application/pdf" and l != "application/postscript":  
            print "Unknown - ignoring"
            continue
-
-       block = file[5:]
+       block = "urn:x-storm:1.0:"+l+"," + file[5:]
+       block = block.replace("/", "__")
        print "into ",block
 
        for res in resolutions:
Index: alph/org/nongnu/alph/xml/SpanReader.java
diff -u alph/org/nongnu/alph/xml/SpanReader.java:1.5 
alph/org/nongnu/alph/xml/SpanReader.java:1.6
--- alph/org/nongnu/alph/xml/SpanReader.java:1.5        Sun Apr  6 09:02:51 2003
+++ alph/org/nongnu/alph/xml/SpanReader.java    Tue Apr 15 23:44:23 2003
@@ -45,6 +45,9 @@
            int o = Integer.parseInt(attributes.getValue("o"));
            String t = attributes.getValue("t");
            spans.add(new org.nongnu.alph.impl.URN5TextSpan(b, o, t));
+       } else if(qName.equals("fts")) {
+           String t = attributes.getValue("t");
+           spans.add(new org.nongnu.alph.impl.FakeTextSpan(t));
        } else {
            throw new Error("Unknown element '"+localName+"'");
        }
Index: alph/org/nongnu/alph/xml/SpanSerializer.java
diff -u alph/org/nongnu/alph/xml/SpanSerializer.java:1.5 
alph/org/nongnu/alph/xml/SpanSerializer.java:1.6
--- alph/org/nongnu/alph/xml/SpanSerializer.java:1.5    Sun Apr 13 02:31:45 2003
+++ alph/org/nongnu/alph/xml/SpanSerializer.java        Tue Apr 15 23:44:23 2003
@@ -14,8 +14,14 @@
     public String namespace;
 
     public String span2xml(Span s0) {
-       if(s0 instanceof org.nongnu.alph.impl.URN5TextSpan) {
-           org.nongnu.alph.impl.URN5TextSpan t = 
(org.nongnu.alph.impl.URN5TextSpan)s0;
+       if(s0 instanceof org.nongnu.alph.impl.FakeTextSpan) {
+           org.nongnu.alph.impl.FakeTextSpan t = 
+               (org.nongnu.alph.impl.FakeTextSpan)s0;
+           return "<fts t=\""+
+                   XMLUtil.escapeXML(t.getText())+"\"/>";
+       } else if(s0 instanceof org.nongnu.alph.impl.URN5TextSpan) {
+           org.nongnu.alph.impl.URN5TextSpan t = 
+               (org.nongnu.alph.impl.URN5TextSpan)s0;
            return "<uts b=\""+t.getScrollId()+
                    "\" o=\""+t.offset()+
                    "\" t=\""+XMLUtil.escapeXML(t.getText())+"\"/>";
Index: alph/org/nongnu/alph/xml/serialization.test
diff -u alph/org/nongnu/alph/xml/serialization.test:1.5 
alph/org/nongnu/alph/xml/serialization.test:1.6
--- alph/org/nongnu/alph/xml/serialization.test:1.5     Sun Apr  6 06:55:59 2003
+++ alph/org/nongnu/alph/xml/serialization.test Tue Apr 15 23:44:23 2003
@@ -98,3 +98,18 @@
     failUnlessEqual(sp.getText(), "foo&bar")
 
     failUnlessEqual(SpanSerializer().span2xml(sp), str)
+
+def testFake():
+    """See that reading/writing fake spans works.
+    """
+    r = SpanReader()
+    str = """<fts t="foo&amp;bar"/>"""
+    parseString(str, r)
+
+    sp = r.getSpans()[0]
+    failUnlessEqual(sp.getScrollId(), "")
+    failUnlessEqual(sp.offset(), 0)
+    failUnlessEqual(sp.getText(), "foo&bar")
+
+    failUnlessEqual(SpanSerializer().span2xml(sp), str)
+