tek-cvs Mailing List for TEK

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/tek/tek/client/proxy/proxymain
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17943/proxymain

Modified Files:
	SocketHandler.java 
Log Message:
Now that we are using a buffered output stream, every operation to the
browser must either be a println() or followed by an explicit flush().



Index: SocketHandler.java
===================================================================
RCS file: /cvsroot/tek/tek/client/proxy/proxymain/SocketHandler.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73

--- SocketHandler.java	24 Jul 2006 02:11:36 -0000	1.72
+++ SocketHandler.java	24 Jul 2006 06:02:07 -0000	1.73
@@ -175,6 +175,7 @@
 	    // If proxy isn't registered, go through registration
 	    if (TEKProxy.clientProtocol.getRegistrationStatus() == Client.REGISTRATION_UNSTARTED) {
 		out.println("<SCRIPT>window.location='http://tek/'</SCRIPT>");
+		out.flush();
 		return;
 	    }
 
@@ -315,9 +316,11 @@
      */
     private void handleUncached(URL url, String connectionStatus,
 				InputStream in, URLConnection connection) {
-	if (connectionStatus.equals("malformed")) //wrong url
+	if (connectionStatus.equals("malformed")) { //wrong url
 	    out.println("<SCRIPT> alert(\"Page does not exist. Please check the URL "
-			 + "and try again.\");window.back(); </SCRIPT>");
+			+ "and try again.\");window.back(); </SCRIPT>");
+	    out.flush();
+	}
 	else if (!ProxyConstants.USE_DIRECT_CONNECTION
 		 || connectionStatus.equals("disconnected")) { //client not
 	    // connected
@@ -345,6 +348,7 @@
 				 "This link leads to an image.  Due to bandwidth\\n" + 
 				 "limitations, images are not yet supported in TEK."
 				 + "\"); window.close(); window.back(); </SCRIPT>");
+		    out.flush();
 		}
 	    } else {
 		out.println("<SCRIPT>var ans=confirm(\"Would you like to request this page: "
@@ -354,6 +358,7 @@
 			     + "&command=makeurlrequest\"; window.close();"
 			     + "window.back();; window.close()} else{window.close(); window.back()}"
 			     + "</SCRIPT>");
+		out.flush();
 	    }
 	} else if (connectionStatus.equals("connected") &&
 		   // the following test should be redundant, but
@@ -380,6 +385,7 @@
 		String line = "";
 		while ((line = reader.readLine()) != null) {
 		    out.println(line);
+		    out.flush();
 		}
 		reader.close();
 		in.close();
@@ -435,6 +441,7 @@
 	if (newResults) {
 	    // if new results, need to flash and replace
 	    out.print("<SCRIPT>window.location=\"http://tek/" + pageName + "\"</SCRIPT>");
+	    out.flush();
 	} else {
 	    // otherwise, can print directly
 	    printDocument(ProxyConstants.ProxyDirectory + ProxyConstants.PathSep
@@ -479,6 +486,7 @@
 		if (update == 1) {
 		    out.print("<SCRIPT> window.location=\"" + wholeURL
 			      + "\"</SCRIPT>");
+		    out.flush();
 
 		    // just print out the page as normal
 		} else {
@@ -543,6 +551,7 @@
 				      + ProxyConstants.PathSep
 				      + "queryloading.html");
 		out.print(contents);
+		out.flush();
 	    } catch (Exception e) {
 	    }
 	    // process results
@@ -729,6 +738,7 @@
 		.print("</TR></table><img src=\"black.gif\" width=775 height=1>"
 		       + "<table align=left border=0, cellspacing=0, cellpadding=2 width=775>");
 	}
+	out.flush();
     }
 
     /**
@@ -776,6 +786,7 @@
 		.print("</TR></table><img src=\"black.gif\" width=775 height=1>"
 		       + "<table  align=left border=0 cellspacing=0 cellpadding=2 width=775>");
 	}
+	out.flush();
     }
 
     /**
@@ -787,9 +798,11 @@
     private boolean printColor(boolean color) {
 	if (color) {
 	    out.print("style=\"background: #EBEBEB ;\"><TD width=2%></TD>");
+	    out.flush();
 	    return false;
 	} else {
 	    out.print("style=\"background: #F7F7F7 ;\"<TD width=2%></TD>");
+	    out.flush();
 	    return true;
 	}
     }
@@ -829,6 +842,7 @@
 				   .getDate(), query.getDate().getYear()) + " "
 		      + "</font></TD></TR>");
 	}
+	out.flush();
     }
 
     /**
@@ -857,6 +871,7 @@
 		.println("</table><img src=\"black.gif\" width=775 height=1><br>");
 	else if (count == 0)
 	    out.println("</table><br>");
+	out.flush();
 	return color;
     }
 
@@ -892,6 +907,7 @@
 		.println("</table><img src=\"black.gif\" width=775 height=1><br>");
 	else if (count == 0)
 	    out.println("</table><br>");
+	out.flush();
 	return color;
     }
 
@@ -932,6 +948,7 @@
 		.println("</table><img src=\"black.gif\" width=775 height=1><br>");
 	else if (count == 0)
 	    out.println("</table><br>");
+	out.flush();
 	return color;
     }
 
@@ -961,6 +978,7 @@
 		  + "</font></TD><TD width=4%>");
 	addOns(URLDecoder.decode(query.getName()), notTerm, "bas");
 
+	out.flush();
 	return color;
     }
 
@@ -998,6 +1016,7 @@
 	out.println("</table>");
 	if (size + urls.size() != 0)
 	    printSubmitToTEK(sending);
+	out.flush();
 	return color;
     }
 
@@ -1061,6 +1080,7 @@
 		    out.print(numofRes + " results </font></a></TD>");
 	    }
 	}
+	out.flush();
     }
 
     /**
@@ -1083,6 +1103,7 @@
 	    out.print("<TD width=14%><font face=\"verdana\" size=2>No results"
 		      + "</font></TD>");
 	}
+	out.flush();
     }
 
     /**
@@ -1110,6 +1131,7 @@
 		      + printHidden("command", "refinesearch")
 		      + "<INPUT type=\"submit\" value=\"Refine\"></FORM></TD>");
 
+	out.flush();
     }
 
     /**
@@ -1132,6 +1154,7 @@
 	    + "<INPUT type=\"submit\" value=\"Delete\"></FORM></TD>";
 
 	out.print(output);
+	out.flush();
     }
 
     /**
@@ -1204,6 +1227,7 @@
 			   + "</font></TD></TR>");
 
 	}
+	out.flush();
     }
 
     /** helper function for deletesearch for terms with multiple terms */
@@ -1255,6 +1279,7 @@
 			  + URLEncoder.encode(notTerm) + "\"> Previous result ("
 			  + numofRes + ")</a></TD></TR>");
 	}
+	out.flush();
     }
 
     /**
@@ -1287,6 +1312,7 @@
 	    }
 	    out.println("</CENTER>");
 	}
+	out.flush();
     }
 
     /* 4.25.02 cleaned html code. */
@@ -1377,6 +1403,7 @@
 
 	}
 
+	out.flush();
     } /*
        * @effects : in response to tek html tag <tekquerysummary>, prints out
        * the summary of a search query made my the client
@@ -1414,6 +1441,7 @@
 	String image = (String) searchFields.get(QueryFileHandler.IMG);
 	if (image != null && !image.equals("null") && !image.equals(""))
 	    out.println(getEntry("Image Option:", image));
+	out.flush();
     }
 
     // helper method for printQuerySummary that returns a string with the value
@@ -1453,6 +1481,7 @@
 		      + "'; </SCRIPT>");
 
 	}
+	out.flush();
     }
 
     /**
@@ -1578,6 +1607,7 @@
 			 + "&nbsp; &nbsp; &nbsp; &nbsp;"
 			 + "</font></td></tr></table>");
 	}
+	out.flush();
     }
 
     /**
@@ -1606,6 +1636,7 @@
 	    printLuceneResults(results, page,
 			       terms.replace(" AND ", " "), tnot);
 	    printPrevNext(terms, tnot, status, page, results.size());
+	    out.flush();
 	    return;
 
 	    //for a results page ordered by relevance
@@ -1621,6 +1652,7 @@
 				     .equals("normal")))) {
 		out.println("<SCRIPT>alert('Please enter search terms.');"
 			    + "window.back();" + "</SCRIPT>");
+		out.flush();
 		return;
 	    } else if (newTerms.equals("") && (url == null || url.equals(""))
 		       && (type.length() == 3 && type.equals("url"))) {
@@ -1629,11 +1661,13 @@
 			     + "  For example, http://news.bbc.co.uk/');"
 			     + "window.location.replace('http://tek/results.html?main=1');"
 			     + "</SCRIPT>");
+		out.flush();
 		return;
 	    }
 	    // goes to URL search
 	    if (newTerms.equals("") && tnot.equals("")) {
 		printURLSearchResults(url.trim());
+		out.flush();
 		return;
 	    }
 	    Vector results = Local.search(newTerms + notTerm);
@@ -1666,6 +1700,7 @@
 		    printNoResult("url", url, "");
 		    out.print(" <SCRIPT> document.other.url.value='" + url
 			      + "'; </SCRIPT>");
+		    out.flush();
 		    return;
 		}
 	    }
@@ -1692,7 +1727,7 @@
 	}
 	// goes directly to the page
 	out.print(output);
-
+	out.flush();
     }
 
     private boolean tryBothURL(String url) {
@@ -1778,6 +1813,7 @@
 	String resStr = "";
 	if (results.size() == 0) {
 	    printNoResult("bas", query, not);
+	    out.flush();
 	    return;
 	}
 	out
@@ -1809,6 +1845,7 @@
 		      + "</font></p></td></tr>");
 	}
 	out.println("</TABLE>");
+	out.flush();
     }
 
     /**
@@ -1957,6 +1994,7 @@
 	    if (size > 10)
 		out.println("</table><br>");
 	}
+	out.flush();
     }
 
     /**
@@ -2301,6 +2339,7 @@
 	    out.println("<BODY onLoad=\"document.form.main.focus()\">");
 	else
 	    out.println("<BODY onload=\"document.submitquery.tek.focus()\">");
+	out.flush();
     }
 
     /** @return the String form of a month * */
@@ -2342,6 +2381,7 @@
 			 + "<a href=\"http://tek/tekcommand.html?command=logout\"> "
 			 + "<img border=0 src=\"logout.gif\"></a></td></tr>");
 	}
+	out.flush();
     }
 
     /**





2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (11)	Oct (19)	Nov (60)	Dec (12)
2004	Jan (17)	Feb (8)	Mar	Apr	May (6)	Jun (17)	Jul (4)	Aug	Sep	Oct (1)	Nov	Dec
2005	Jan	Feb	Mar	Apr	May (25)	Jun (11)	Jul (43)	Aug (81)	Sep	Oct (21)	Nov (2)	Dec (45)
2006	Jan	Feb	Mar (1)	Apr (8)	May	Jun (6)	Jul (16)	Aug	Sep	Oct	Nov	Dec

tek-cvs Mailing List for TEK

tek-cvs — Logs of CVS commits to the TEK source tree.