[Gzz-commits] gzz ./TODO gzz/mediaserver/MediaserverFiler.jav...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/03 15:48:29

Modified files:
        .              : TODO 
        gzz/mediaserver: MediaserverFiler.java 
        gzz/view       : xubuoy.py 

Log message:
        Last fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.238&tr2=1.239&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/mediaserver/MediaserverFiler.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/xubuoy.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.238 gzz/TODO:1.239
*** gzz/TODO:1.238      Thu Oct  3 15:30:31 2002
--- gzz/TODO    Thu Oct  3 15:48:29 2002
***************
*** 39,45 ****
            I've successfully used extedit to avoid this at one point today
            (to use extedit, remember to set the EDITOR environment variable).
            --
!           Hope all goes well with the demo! -b. ]
      tuukkah:
        - when a gl window is closed, call Binder.windowClosed()
        - unit tests for libcoords:
--- 39,53 ----
            I've successfully used extedit to avoid this at one point today
            (to use extedit, remember to set the EDITOR environment variable).
            --
!           Hope all goes well with the demo! -b. 
!           --
!           P.S. AAARGH-- just noted again the saving bug from earlier today ->
!           after creating a span, I couldn't save and after Ctrl-C not reload.
!           I can't really fix this today, ARGH! If you encounter this, you'll 
!           need to work around it somehow. Remember to back up your 
!           saved spaces :( 
!           --
!           I've tried to misfix, so let's hope you won't see it. -b. ]
      tuukkah:
        - when a gl window is closed, call Binder.windowClosed()
        - unit tests for libcoords:
Index: gzz/gzz/mediaserver/MediaserverFiler.java
diff -c gzz/gzz/mediaserver/MediaserverFiler.java:1.12 
gzz/gzz/mediaserver/MediaserverFiler.java:1.13
*** gzz/gzz/mediaserver/MediaserverFiler.java:1.12      Thu Oct  3 13:44:47 2002
--- gzz/gzz/mediaserver/MediaserverFiler.java   Thu Oct  3 15:48:29 2002
***************
*** 210,226 ****
              Version w = load(current, arr);
              if(!v.equals(w)) throw new Error("Versions didn't match");
          } catch(Throwable t) {
              bos = new ByteArrayOutputStream();
            fmt.writeVersion(bos, v);
!           ms.addDatum(bos.toByteArray(),
                          versionContentType, current);
              if(true) {
                  pa("============ CORRECT =============");
                  pa(new String(bos.toByteArray()));
                  pa("==================================");
              }
              t.printStackTrace();
!             throw new Error("Problem with re-loading: "+t);
          }
      }
  }
--- 210,231 ----
              Version w = load(current, arr);
              if(!v.equals(w)) throw new Error("Versions didn't match");
          } catch(Throwable t) {
+             // re-add
              bos = new ByteArrayOutputStream();
            fmt.writeVersion(bos, v);
!           Mediaserver.Id nid = ms.addDatum(bos.toByteArray(),
                          versionContentType, current);
+             if(!nid.equals(current))
+                 throw new Error("AAAAAAAAAAAAAAAAAAAAAAAAAAAAARGH!!!");
              if(true) {
                  pa("============ CORRECT =============");
                  pa(new String(bos.toByteArray()));
                  pa("==================================");
              }
              t.printStackTrace();
!             //throw new Error("Problem with re-loading: "+t);
!             // XXX not until demo is over-- client doesn't close
!             // if error is thrown
          }
      }
  }
Index: gzz/gzz/view/xubuoy.py
diff -c gzz/gzz/view/xubuoy.py:1.21 gzz/gzz/view/xubuoy.py:1.22
*** gzz/gzz/view/xubuoy.py:1.21 Thu Oct  3 15:30:31 2002
--- gzz/gzz/view/xubuoy.py      Thu Oct  3 15:48:29 2002
***************
*** 301,308 ****
--- 301,311 ----
              binder = self.win.getFallback().binder
              binder.marks.add(mark)
              binder.markedCells.add(self.cursor)
+             self.corner1 = None
              AbstractUpdateManager.chg()
          elif key == 'Ctrl-L' or key == 'Alt-L':
+             # don't handle if not a pagespan
+             if not ispdf(self.cursor): return 1
              # handle only if there is a selection
              if not self.corner1: return 1
              enf = self.getCurrentEnfilade()