[z3-checkins] r33970 - in z3/deliverance/branches/packaged/deliverance: . test-data/guidesearch test-data/necoro

cabraham at codespeak.net cabraham at codespeak.net
Tue Oct 31 17:56:11 CET 2006


Author: cabraham
Date: Tue Oct 31 17:56:07 2006
New Revision: 33970

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/theme.html
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/theme.html
Modified:
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
Log:
fixed up tests for foreign character encodings

Modified: z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html	Tue Oct 31 17:56:07 2006
@@ -18,7 +18,7 @@
 
 function restChar(txtarea,maxlength) {
   len = txtarea.value.length;
-  if(len > maxlength) alert("max length "+maxlength+" ---------");
+  if(len > maxlength) alert("max length "+maxlength+" .........");
   txtarea.innerText = txtarea.value.substring(0, maxlength);
 }
 
@@ -39,7 +39,7 @@
 本网站面向访问日本的外国人旅行者,提供国家认定的观光口译导游搜索服务。<br>可以按地区、领域、语言及其他条件,在全国的观光口译导游中进行搜索,通过直接接触进行预约。</p>
   <ul>
 <li>
-<a href="http://www.guidesearch.jp/search/search.php?language=schinese">进入口译导游搜索</a>
+<a href="http://localhost/search/search.php?language=schinese">进入口译导游搜索</a>
   </li>
     </ul>
 </div>
@@ -53,8 +53,8 @@
 </form>
   </div>
     <div id="copy">
-  <a href="http://www.guidesearch.jp/about.php?language=schinese">关于我们  &gt;&gt;</a>
-  <a href="http://www.guidesearch.jp/priv.php?language=schinese">个人私隐政策  &gt;&gt;</a>
+  <a href="http://localhost/about.php?language=schinese">关于我们  &gt;&gt;</a>
+  <a href="http://localhost/priv.php?language=schinese">个人私隐政策  &gt;&gt;</a>
   <a href="http://www.mlit.go.jp/sogoseisaku/kanko/english/">国土交通省(english)</a>
     </div>
   </div>

Added: z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/theme.html	Tue Oct 31 17:56:07 2006
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<meta name='author' content='¹Û¹â¿ÚÒëµ¼ÓÎËÑË÷ϵͳ' />
+<meta name='copyright' content='ÉçÍÅ·¨ÈË¡¡ÈÕ±¾¹Û¹â¿ÚÒëЭ»á' />
+<meta name='description' content='¹Û¹â¿ÚÒëµ¼ÓÎËÑË÷ϵͳ' />
+<meta name='generator' content='GUIDE 0.5.0' />
+
+<title>¹Û¹â¿ÚÒëµ¼ÓÎËÑË÷ϵͳ</title>
+<script type='text/javascript'>
+<!--
+
+function restChar(txtarea,maxlength) {
+  len = txtarea.value.length;
+  if(len > maxlength) alert("max length "+maxlength+" .........");
+  txtarea.innerText = txtarea.value.substring(0, maxlength);
+}
+
+//-->
+</script>
+<link rel='stylesheet' type='text/css' media='all' href='http://www.guidesearch.jp/css/top_schinese.css' />
+
+<div id="wrapper">
+  <div id="mainpic">
+  <h1>¹Û¹â¿ÚÒëµ¼ÓÎËÑË÷ϵͳ</h1>
+  <div id="mainbox">
+  <p>ÔÚÈÕ±¾£¬¸ù¾Ý¿ÚÒëµ¼Ó稣¨1949Äê·¨ÂɵÚ210ºÅ£©£¬½öÏÞÓÚ¾­¿¼ÊÔÖ¤Ã÷¾«Í¨ÈÕ±¾Ïà¹ØÖªÊ¶Óë³ä·ÖµÄÍâÓï½»Á÷ÄÜÁ¦Õߣ¬·½¿É´ÓÊÂÓг¥µÄ¿ÚÒëµ¼Óι¤×÷£¬Òò´Ë£¬¿ÉÒÔÀûÓøßÖÊÁ¿µÄ¿ÚÒëµ¼ÓΡ£<br>
+±¾ÍøÕ¾ÃæÏò·ÃÎÊÈÕ±¾µÄÍâ¹úÈËÂÃÐÐÕߣ¬Ìṩ¹ú¼ÒÈ϶¨µÄ¹Û¹â¿ÚÒëµ¼ÓÎËÑË÷·þÎñ¡£<br>¿ÉÒÔ°´µØÇø¡¢ÁìÓò¡¢ÓïÑÔ¼°ÆäËûÌõ¼þ£¬ÔÚÈ«¹úµÄ¹Û¹â¿ÚÒëµ¼ÓÎÖнøÐÐËÑË÷£¬Í¨¹ýÖ±½Ó½Ó´¥½øÐÐÔ¤Ô¼¡£</p>
+  <ul>
+  <li><a href="./search/search.php?language=schinese">½øÈë¿ÚÒëµ¼ÓÎËÑË÷</a>
+  </li>
+    </ul>
+  </div>
+<div id="lang">    
+  <form name="top" action="/index.php" method="POST">
+    <select name="language">
+      <option value="japanese" >ÈÕÓï</option>
+      <option value="english">English</option>
+      <option value="korean">Korean</option>
+      <option value="schinese" selected>Simple Chinese</option>
+      <option value="tchinese">Traditional Chinese</option>
+    </select>
+    <input name="change_language" type="submit" value="Change" />
+  </form>
+  </div>
+    <div id="copy">
+  <a href="./about.php?language=schinese">¹ØÓÚÎÒÃÇ  >></a>
+  <a href="./priv.php?language=schinese">¸öÈË˽ÒþÕþ²ß  >></a>
+  <a href="http://www.mlit.go.jp/sogoseisaku/kanko/english/">¹úÍÁ½»Í¨Ê¡(english)</a>
+    </div>
+  </div>
+</div>
+
+<center>Special URL<br>Admin URL<a href="admin/index.php">Admin</a><br>User URL<a href="user/user.php">User</a><br></center><center>
+<br />Powered by&nbsp;GUIDE 0.5.0 &copy; 2006 <a href='http://www.jga21c.or.jp/' target='_blank'>The Guide-Interpreter Search System</a>
+</center>
+</body>
+</html>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html	Tue Oct 31 17:56:07 2006
@@ -33,9 +33,9 @@
 
 
 //-->
-</script><script src="http://www.necoro.com/photo/anime.js"></script><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+</script><script src="http://localhost/anime.js"></script><link rel="stylesheet" href="http://localhost/../css.css" type="text/css">
 <script language="JavaScript">
-<!--
+
 <!--
 function MM_reloadPage(init) {  //reloads the window if Nav4 resized
   if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
@@ -61,51 +61,51 @@
 <td rowspan="2" width="88" align="left">
 <table width="88" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="2" height="82"><a href="http://www.necoro.com/home.html"><script language="JavaScript"> //necoro random anime
+<td colspan="2" height="82"><a href="http://localhost/../home.html"><script language="JavaScript"> //necoro random anime
 			anime_1(Math.random())</script></a></td>
 </tr>
 <tr>
-<td colspan="2"><img name="left_02" src="http://www.necoro.com/leftnabi/images/left_02.jpg" width="88" height="1"></td>
+<td colspan="2"><img name="left_02" src="http://localhost/../leftnabi/images/left_02.jpg" width="88" height="1"></td>
 </tr>
 <tr>
-<td colspan="2"><a href="http://www.necoro.com/photo/index.html"><img name="left_03" src="http://www.necoro.com/leftnabi/images/left_03-over.jpg" width="88" height="73" border="0"></a></td>
+<td colspan="2"><a href="http://localhost/index.html"><img name="left_03" src="http://localhost/../leftnabi/images/left_03-over.jpg" width="88" height="73" border="0"></a></td>
 </tr>
 <tr>
-<td><img src="http://www.necoro.com/leftnabi/images/left_04.jpg" width="1" height="49"></td>
-<td> <a href="http://www.necoro.com/item/index.html" onmouseover="MM_swapImage('left_05','','../leftnabi/images/left_05-over.jpg',1)" onmouseout="MM_swapImage('left_05','','../leftnabi/images/left_05.jpg',1)"><img name="left_05" src="http://www.necoro.com/leftnabi/images/left_05.jpg" width="87" height="49" border="0"></a>
+<td><img src="http://localhost/../leftnabi/images/left_04.jpg" width="1" height="49"></td>
+<td> <a href="http://localhost/../item/index.html" onmouseover="MM_swapImage('left_05','','../leftnabi/images/left_05-over.jpg',1)" onmouseout="MM_swapImage('left_05','','../leftnabi/images/left_05.jpg',1)"><img name="left_05" src="http://localhost/../leftnabi/images/left_05.jpg" width="87" height="49" border="0"></a>
 </td>
 </tr>
 <tr>
-<td colspan="2"><a href="http://www.necoro.com/owners/index.html" onmouseover="MM_swapImage('left_06','','../leftnabi/images/left_06-over.jpg',1)" onmouseout="MM_swapImage('left_06','','../leftnabi/images/left_06.jpg',1)"><img name="left_06" src="http://www.necoro.com/leftnabi/images/left_06.jpg" width="88" height="47" border="0"></a></td>
+<td colspan="2"><a href="http://localhost/../owners/index.html" onmouseover="MM_swapImage('left_06','','../leftnabi/images/left_06-over.jpg',1)" onmouseout="MM_swapImage('left_06','','../leftnabi/images/left_06.jpg',1)"><img name="left_06" src="http://localhost/../leftnabi/images/left_06.jpg" width="88" height="47" border="0"></a></td>
 </tr>
 <tr>
-<td colspan="2"><a href="http://www.necoro.com/fanland/index.html" onmouseover="MM_swapImage('left_07','','../leftnabi/images/left_07-over.jpg',1)" onmouseout="MM_swapImage('left_07','','../leftnabi/images/left_07.jpg',1)"><img name="left_07" src="http://www.necoro.com/leftnabi/images/left_07.jpg" width="88" height="66" border="0"></a></td>
+<td colspan="2"><a href="http://localhost/../fanland/index.html" onmouseover="MM_swapImage('left_07','','../leftnabi/images/left_07-over.jpg',1)" onmouseout="MM_swapImage('left_07','','../leftnabi/images/left_07.jpg',1)"><img name="left_07" src="http://localhost/../leftnabi/images/left_07.jpg" width="88" height="66" border="0"></a></td>
 </tr>
 <tr>
-<td colspan="2"><img name="left_08" src="http://www.necoro.com/leftnabi/images/left_08.jpg" width="88" height="59" border="0"></td>
+<td colspan="2"><img name="left_08" src="http://localhost/../leftnabi/images/left_08.jpg" width="88" height="59" border="0"></td>
 </tr>
 <tr>
-<td colspan="2"><img name="left_09" src="http://www.necoro.com/leftnabi/images/left_09.jpg" width="88" height="62" border="0"></td>
+<td colspan="2"><img name="left_09" src="http://localhost/../leftnabi/images/left_09.jpg" width="88" height="62" border="0"></td>
 </tr>
 <tr>
-<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/left_10.jpg" width="1" height="100"></td>
-<td><img src="http://www.necoro.com/leftnabi/images/left_11.jpg" width="87" height="64"></td>
+<td rowspan="2"><img src="http://localhost/../leftnabi/images/left_10.jpg" width="1" height="100"></td>
+<td><img src="http://localhost/../leftnabi/images/left_11.jpg" width="87" height="64"></td>
 </tr>
 <tr>
-<td><img src="http://www.necoro.com/leftnabi/images/left_12.jpg" width="87" height="36"></td>
+<td><img src="http://localhost/../leftnabi/images/left_12.jpg" width="87" height="36"></td>
 </tr>
 </table>
 </td>
 <td> 
 <table width="452" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_01.jpg" width="50" height="49"></td>
-<td><img src="http://www.necoro.com/images/tstudio_02.jpg" width="260" height="30" alt="Photo studio"></td>
-<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_03.jpg" width="139" height="49"></td>
-<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_04.jpg" width="103" height="49" alt="omron"></td>
+<td rowspan="2"><img src="http://localhost/../leftnabi/images/top_01.jpg" width="50" height="49"></td>
+<td><img src="http://localhost/../images/tstudio_02.jpg" width="260" height="30" alt="Photo studio"></td>
+<td rowspan="2"><img src="http://localhost/../leftnabi/images/top_03.jpg" width="139" height="49"></td>
+<td rowspan="2"><img src="http://localhost/../leftnabi/images/top_04.jpg" width="103" height="49" alt="omron"></td>
 </tr>
 <tr>
-<td><img src="http://www.necoro.com/leftnabi/images/top_05.jpg" width="260" height="19"></td>
+<td><img src="http://localhost/../leftnabi/images/top_05.jpg" width="260" height="19"></td>
 </tr>
 </table>
 </td>
@@ -225,13 +225,13 @@
     </td>
 </tr>
 </table>
-<!-- #BeginLibraryItem "/Library/futtaj.lbi" --><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+<!-- #BeginLibraryItem "/Library/futtaj.lbi" --><link rel="stylesheet" href="http://localhost/../css.css" type="text/css">
 <table width="640" border="0" cellspacing="0" cellpadding="0"><tr>
 <td width="87">@</td>
     <td width="553" align="center" class="small"> 
-      <p><a href="javascript:history.back();"><img src="http://www.necoro.com/images/back.gif" border="0"></a><br><a href="http://www.necoro.com/home.html">ƒgƒbƒv</a>@b@<a href="http://www.necoro.com/photo/index.html">ƒXƒ^ƒWƒI</a>@b@<a href="http://www.necoro.com/item/index.html">ƒlƒRƒî•ñ</a>@b@<a href="http://www.necoro.com/owners/index.html">ƒI[ƒi[‚ÌŠF‚³‚Ü‚Ö</a> 
-@b@<a href="http://www.necoro.com/fanland/index.html">ƒtƒ@ƒ“ƒ‰ƒ“ƒh</a> </p>
-      <p><font size="3"><img src="http://www.necoro.com/images/markc-s2t.gif" width="9" height="9" border="0"></font>OMRON 
+      <p><a href="javascript:history.back();"><img src="http://localhost/../images/back.gif" border="0"></a><br><a href="http://localhost/../home.html">ƒgƒbƒv</a>@b@<a href="http://localhost/index.html">ƒXƒ^ƒWƒI</a>@b@<a href="http://localhost/../item/index.html">ƒlƒRƒî•ñ</a>@b@<a href="http://localhost/../owners/index.html">ƒI[ƒi[‚ÌŠF‚³‚Ü‚Ö</a> 
+@b@<a href="http://localhost/../fanland/index.html">ƒtƒ@ƒ“ƒ‰ƒ“ƒh</a> </p>
+      <p><font size="3"><img src="http://localhost/../images/markc-s2t.gif" width="9" height="9" border="0"></font>OMRON 
         Corporation </p>
     </td>
   </tr></table>

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/theme.html	Tue Oct 31 17:56:07 2006
@@ -0,0 +1,230 @@
+<html><!-- #BeginTemplate "/Templates/photo.dwt" -->
+<head>
+<!-- #BeginEditable "doctitle" --> 
+<title>ƒlƒRƒƒXƒ^ƒWƒI</title>
+<!-- #EndEditable --> 
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<script language="JavaScript">
+<!--
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.01
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && d.getElementById) x=d.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+
+
+//-->
+</script>
+<script src="anime.js"></script>
+<link rel="stylesheet" href="../css.css" type="text/css">
+<script language="JavaScript">
+
+<!--
+function MM_reloadPage(init) {  //reloads the window if Nav4 resized
+  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
+    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
+  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
+}
+MM_reloadPage(true);
+// -->
+
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+//-->
+</script>
+</head>
+<body bgcolor="#FFFFFF" text="#000000" onLoad="MM_preloadImages('../leftnabi/images/left_05.jpg','../leftnabi/images/left_05-over.jpg','../leftnabi/images/left_06.jpg','../leftnabi/images/left_06-over.jpg','../leftnabi/images/left_07.jpg','../leftnabi/images/left_07-over.jpg','images/vp_01-over.jpg')" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<table width="640" border="0" cellspacing="0" cellpadding="0">
+<tr valign="top"> 
+<td rowspan="2" width="88" align="left">
+<table width=88 border=0 cellpadding=0 cellspacing=0>
+<tr> 
+<td colspan=2 height="82"><a href="../home.html"><script language="JavaScript"> //necoro random anime
+			anime_1(Math.random())</script></a></td>
+</tr>
+<tr> 
+<td colspan=2><img name="left_02" src="../leftnabi/images/left_02.jpg" width=88 height=1></td>
+</tr>
+<tr> 
+<td colspan=2><a href="index.html"><img name="left_03" src="../leftnabi/images/left_03-over.jpg" width=88 height=73 border=0></a></td>
+</tr>
+<tr> 
+<td><img src="../leftnabi/images/left_04.jpg" width=1 height=49></td>
+<td> <a href="../item/index.html"
+				onMouseOver="MM_swapImage('left_05','','../leftnabi/images/left_05-over.jpg',1)"
+				onMouseOut="MM_swapImage('left_05','','../leftnabi/images/left_05.jpg',1)"><img name="left_05" src="../leftnabi/images/left_05.jpg" width=87 height=49 border=0></a></td>
+</tr>
+<tr> 
+<td colspan=2><a href="../owners/index.html"
+				onMouseOver="MM_swapImage('left_06','','../leftnabi/images/left_06-over.jpg',1)"
+				onMouseOut="MM_swapImage('left_06','','../leftnabi/images/left_06.jpg',1)"><img name="left_06" src="../leftnabi/images/left_06.jpg" width=88 height=47 border=0></a></td>
+</tr>
+<tr> 
+<td colspan=2><a href="../fanland/index.html"
+				onMouseOver="MM_swapImage('left_07','','../leftnabi/images/left_07-over.jpg',1)"
+				onMouseOut="MM_swapImage('left_07','','../leftnabi/images/left_07.jpg',1)"><img name="left_07" src="../leftnabi/images/left_07.jpg" width=88 height=66 border=0></a></td>
+</tr>
+<tr> 
+<td colspan=2><img name="left_08" src="../leftnabi/images/left_08.jpg" width=88 height=59 border=0></td>
+</tr>
+<tr> 
+<td colspan=2><img name="left_09" src="../leftnabi/images/left_09.jpg" width=88 height=62 border=0></td>
+</tr>
+<tr> 
+<td rowspan=2><img src="../leftnabi/images/left_10.jpg" width=1 height=100></td>
+<td><img src="../leftnabi/images/left_11.jpg" width=87 height=64></td>
+</tr>
+<tr> 
+<td><img src="../leftnabi/images/left_12.jpg" width=87 height=36></td>
+</tr>
+</table>
+</td>
+<td> 
+<table width=452 border=0 cellpadding=0 cellspacing=0>
+<tr> 
+<td rowspan=2><img src="../leftnabi/images/top_01.jpg" width=50 height=49></td>
+<td><img src="../images/tstudio_02.jpg" width=260 height=30 alt="Photo studio"></td>
+<td rowspan=2><img src="../leftnabi/images/top_03.jpg" width=139 height=49></td>
+<td rowspan=2><img src="../leftnabi/images/top_04.jpg" width=103 height=49 alt="omron"></td>
+</tr>
+<tr> 
+<td><img src="../leftnabi/images/top_05.jpg" width=260 height=19></td>
+</tr>
+</table>
+</td>
+</tr>
+<tr> 
+<td valign="top"> <!-- #BeginEditable "main" --> 
+      <script language="JavaScript">
+<!--
+function MM_openBrWindow(theURL,winName,features) { //v2.0
+  window.open(theURL,winName,features);
+}
+//-->
+</script>
+      <!-- ImageReady Preload Script (phototop.psd) -->
+      <img src="images/tseisiga.gif" width="300" height="61"> 
+      <DIV ALIGN="CENTER"> 
+        <SCRIPT LANGUAGE="JavaScript">
+<!--
+
+function newImage(arg) {
+	if (document.images) {
+		rslt = new Image();
+		rslt.src = arg;
+		return rslt;
+	}
+}
+
+function changeImages() {
+	if (document.images && (preloadFlag == true)) {
+		for (var i=0; i<changeImages.arguments.length; i+=2) {
+			document[changeImages.arguments[i]].src = changeImages.arguments[i+1];
+		}
+	}
+}
+
+var preloadFlag = false;
+function preloadImages() {
+	if (document.images) {
+		photo_index_01_over = newImage("images/photo_index_01-over.gif");
+		photo_index_04_over = newImage("images/photo_index_04-over.gif");
+		preloadFlag = true;
+	}
+}
+
+// -->
+</SCRIPT>
+        <!-- End Preload Script -->
+        <SCRIPT LANGUAGE="JavaScript">
+<!--
+    preloadImages();
+// -->
+</SCRIPT>
+        <!-- ImageReady Slices (phototop.psd) -->
+        <TABLE WIDTH=463 BORDER=0 CELLPADDING=0 CELLSPACING=0>
+          <TR> 
+            <TD> <A HREF="#" onClick="MM_openBrWindow('./swf/flash_index.html','flash','toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width=640,height=480')"
+				onMouseOver="changeImages('photo_index_01', 'images/photo_index_01-over.gif'); return true;"
+				onMouseOut="changeImages('photo_index_01', 'images/photo_index_01.gif'); return true;"><IMG NAME="photo_index_01" SRC="images/photo_index_01.gif" WIDTH=242 HEIGHT=77 BORDER=0></A></TD>
+            <TD ROWSPAN=2> <IMG SRC="images/photo_index_02.gif" WIDTH=221 HEIGHT=125></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=77></TD>
+          </TR>
+          <TR> 
+            <TD ROWSPAN=3> <A HREF="#" onClick="MM_openBrWindow('./swf/flash_index.html','flash','toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width=640,height=480')"
+				onMouseOver="changeImages('photo_index_01', 'images/photo_index_01-over.gif'); return true;"
+				onMouseOut="changeImages('photo_index_01', 'images/photo_index_01.gif'); return true;"> 
+              <IMG SRC="images/photo_index_03.jpg" WIDTH=242 HEIGHT=175 BORDER=0></A></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=48></TD>
+          </TR>
+          <TR> 
+            <TD> <A HREF="html_top.html"
+				onMouseOver="changeImages('photo_index_04', 'images/photo_index_04-over.gif'); return true;"
+				onMouseOut="changeImages('photo_index_04', 'images/photo_index_04.gif'); return true;"> 
+              <IMG NAME="photo_index_04" SRC="images/photo_index_04.gif" WIDTH=221 HEIGHT=72 BORDER=0></A></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=72></TD>
+          </TR>
+          <TR> 
+            <TD ROWSPAN=2> <A HREF="html_top.html"
+				onMouseOver="changeImages('photo_index_04', 'images/photo_index_04-over.gif'); return true;"
+				onMouseOut="changeImages('photo_index_04', 'images/photo_index_04.gif'); return true;"> 
+              <IMG SRC="images/photo_index_05.jpg" WIDTH=221 HEIGHT=111 BORDER=0></A></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=55></TD>
+          </TR>
+          <TR> 
+            <TD> <IMG SRC="images/photo_index_06.gif" WIDTH=242 HEIGHT=56></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=56></TD>
+          </TR>
+        </TABLE>
+        <!-- End ImageReady Slices -->
+        <P><A HREF="http://www.macromedia.com/jp/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"><IMG SRC="../images/flash_get.gif" WIDTH="88" HEIGHT="31" BORDER="0"></A><BR>
+          Flash”Å‚ð‚²——‚¢‚½‚¾‚­‚ɂ́A<BR>
+          Flash Plugin(ver.5ˆÈã)‚ª•K—v‚Å‚·B</P>
+        <P align="left"><img src="images/tdouga.gif" width="250" height="61"></P>
+        <table width=320 border=0 cellpadding=0 cellspacing=0>
+          <tr> 
+            <td> <a href="../theater/index.html"
+				onMouseOver="changeImages('vp_01', 'images/vp_01-over.jpg'); return true;"
+				onMouseOut="changeImages('vp_01', 'images/vp_01.jpg'); return true;"> 
+              <img name="vp_01" src="images/vp_01.jpg" width=202 height=32 border=0></a></td>
+            <td rowspan=2> <a href="../theater/index.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('vp_01','','images/vp_01-over.jpg',1)"><img src="images/vp_02.jpg" width=118 height=240 border="0"></a></td>
+          </tr>
+          <tr> 
+            <td> <a href="../theater/index.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('vp_01','','images/vp_01-over.jpg',1)"><img src="images/vp_03.jpg" width=202 height=208 border="0"></a></td>
+          </tr>
+        </table>
+        <P align="center">@</P>
+      </DIV>
+      <!-- #EndEditable --></td>
+</tr>
+</table>
+<!-- #BeginLibraryItem "/Library/futtaj.lbi" -->
+<link rel="stylesheet" href="../css.css" type="text/css">
+<table width="640" border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="87">@</td>
+    <td width="553" align="center" class="small"> 
+      <p><a href="javascript:history.back();"><img src="../images/back.gif" border="0"></a><br>
+<a href="../home.html">ƒgƒbƒv</a>@b@<a href="index.html">ƒXƒ^ƒWƒI</a>@b@<A HREF="../item/index.html">ƒlƒRƒî•ñ</A>@b@<a href="../owners/index.html">ƒI[ƒi[‚ÌŠF‚³‚Ü‚Ö</a> 
+@b@<a href="../fanland/index.html">ƒtƒ@ƒ“ƒ‰ƒ“ƒh</a> </p>
+      <p><font size="3"><img src="../images/markc-s2t.gif" width="9" height="9" border="0"></font>OMRON 
+        Corporation </p>
+    </td>
+  </tr>
+</table><!-- #EndLibraryItem --></body>
+<!-- #EndTemplate --></html>

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Tue Oct 31 17:56:07 2006
@@ -90,14 +90,14 @@
 
 
 def do_necoro(renderer_type, name):
-    wsgi_app = DeliveranceMiddleware(necoro_app, 'http://www.necoro.com/photo/index.html','necoro.xml', renderer_type)
+    wsgi_app = DeliveranceMiddleware(necoro_app, 'theme.html','necoro.xml', renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/zope.html')
     res2 = app.get('/expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
 def do_guidesearch(renderer_type, name):
-    wsgi_app = DeliveranceMiddleware(guidesearch_app, 'http://www.guidesearch.jp/index.php?language=schinese','guidesearch.xml', renderer_type)
+    wsgi_app = DeliveranceMiddleware(guidesearch_app, 'theme.html','guidesearch.xml', renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/zope.html')
     res2 = app.get('/expected.html?notheme')


More information about the z3-checkins mailing list