[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gzz/mediaserver/MediaserverFiler.java gzz/v...
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] gzz gzz/mediaserver/MediaserverFiler.java gzz/v... |
Date: |
Tue, 01 Oct 2002 13:40:36 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 02/10/01 13:40:36
Modified files:
gzz/mediaserver: MediaserverFiler.java
gzz/view : pagespanview.py
test/gzz/impl : saving.test
Log message:
Show pages in client (doesn't look nice in cells)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/mediaserver/MediaserverFiler.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/pagespanview.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/impl/saving.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: gzz/gzz/mediaserver/MediaserverFiler.java
diff -c gzz/gzz/mediaserver/MediaserverFiler.java:1.9
gzz/gzz/mediaserver/MediaserverFiler.java:1.10
*** gzz/gzz/mediaserver/MediaserverFiler.java:1.9 Tue Oct 1 09:06:10 2002
--- gzz/gzz/mediaserver/MediaserverFiler.java Tue Oct 1 13:40:36 2002
***************
*** 167,172 ****
--- 167,174 ----
// now, create diff
Version.Diff diff = v.getDiffFrom(old);
+ if(!diff.applyTo(old).equals(v))
+ throw new Error("Diff is wrong (saved whole version instead)");
bos = new ByteArrayOutputStream();
bos.write(headerFrom.getBytes("US-ASCII"));
***************
*** 182,186 ****
--- 184,202 ----
// having added the diff, we can remove the version
ms.expungeDatum(current);
+
+ // try whether we can recreate the version
+
+ try {
+ 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);
+ t.printStackTrace();
+ throw new Error("Problem with re-loading: "+t);
+ }
}
}
Index: gzz/gzz/view/pagespanview.py
diff -c gzz/gzz/view/pagespanview.py:1.5 gzz/gzz/view/pagespanview.py:1.6
*** gzz/gzz/view/pagespanview.py:1.5 Tue Oct 1 10:04:18 2002
--- gzz/gzz/view/pagespanview.py Tue Oct 1 13:40:36 2002
***************
*** 212,219 ****
page * self.scaledsheetsize[0] + self.scale * pointx/72.0/6,
self.scale * pointy/72.0/6
)
class ContentView(gzz.view.CellContentView):
def place(self, cell, scene, coordsys, w, h, viewContext, scale):
view = CellPDFView(cell)
! view.placepapers(scene, coordsys)
--- 212,221 ----
page * self.scaledsheetsize[0] + self.scale * pointx/72.0/6,
self.scale * pointy/72.0/6
)
+ class KEY: pass
class ContentView(gzz.view.CellContentView):
def place(self, cell, scene, coordsys, w, h, viewContext, scale):
view = CellPDFView(cell)
! cs = scene.coordsys(coordsys, KEY, 0, -w/2.0, -h/2.0, w, h)
! view.placepapers(scene, cs)
Index: gzz/test/gzz/impl/saving.test
diff -c gzz/test/gzz/impl/saving.test:1.7 gzz/test/gzz/impl/saving.test:1.8
*** gzz/test/gzz/impl/saving.test:1.7 Tue Oct 1 12:56:37 2002
--- gzz/test/gzz/impl/saving.test Tue Oct 1 13:40:36 2002
***************
*** 109,115 ****
def testSavePageSpans():
! """Test saving page spans."""
# Create dummy pageimage scroll
id = serv.addDatum("", "application/pdf")
--- 109,122 ----
def testSavePageSpans():
! """
! Test saving and re-loading page spans.
!
! Exploits an implementation detail of PageImageScroll: it doesn't look
! at the actual block, just at the mstmpimg version of it. So we can
! create an empty block with content type application/pdf and expect the
! test to work.
! """
# Create dummy pageimage scroll
id = serv.addDatum("", "application/pdf")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz gzz/mediaserver/MediaserverFiler.java gzz/v...,
Benja Fallenstein <=