[Digir-cvs] java/org/calacademy/digir/presentation PresentationConfig.java,1.11,1.12 PresentationServlet.java,1.26,1.27 SearchRequest.java,1.6,1.7

[<pee...@us...>]

Update of /cvsroot/digir/java/org/calacademy/digir/presentation
In directory sc8-pr-cvs1:/tmp/cvs-serv12358

Modified Files:
	PresentationConfig.java PresentationServlet.java 
	SearchRequest.java 
Log Message:
Added support for maxUserSpecifiedTimeout.  modified console messaging.


Index: PresentationConfig.java
===================================================================
RCS file: /cvsroot/digir/java/org/calacademy/digir/presentation/PresentationConfig.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PresentationConfig.java	31 Jul 2003 13:41:16 -0000	1.11
--- PresentationConfig.java	2 Aug 2003 00:05:17 -0000	1.12
***************
*** 63,66 ****
--- 63,67 ----
  	private int _httpConnectionResponseTimeout;
  	private int _httpConnectionRetries;
+ 	private int _maxUserSpecifiedProviderTimeout;
  	private String _displayColor = "#663366";
  	private String _displayTitle;
***************
*** 151,154 ****
--- 152,159 ----
  						setProviderListRefreshInterval(XMLUtil.getIntValueFromNode(currentNode));
  					}
+ 					else if (nodeName.equals("maxUserSpecifiedProviderTimeout"))
+ 					{
+ 						setMaxUserSpecifiedProviderTimeout(XMLUtil.getIntValueFromNode(currentNode));
+ 					}
  					else if (nodeName.equals("color"))
  					{
***************
*** 490,493 ****
--- 495,509 ----
  	{
  		_providerListRefreshInterval = interval;
+ 	}
+ 
+ 
+ 	public int getMaxUserSpecifiedProviderTimeout()
+ 	{
+ 		return _maxUserSpecifiedProviderTimeout;
+ 	}
+ 
+ 	public void setMaxUserSpecifiedProviderTimeout(int to)
+ 	{
+ 		_maxUserSpecifiedProviderTimeout = to;
  	}
  

Index: PresentationServlet.java
===================================================================
RCS file: /cvsroot/digir/java/org/calacademy/digir/presentation/PresentationServlet.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** PresentationServlet.java	1 Aug 2003 04:27:49 -0000	1.26
--- PresentationServlet.java	2 Aug 2003 00:05:17 -0000	1.27
***************
*** 407,411 ****
        String jspFile = "/searchForm.jsp";
  		setCommonDisplayAttributes(request);
! 		int to = _config.getHttpConnectionResponseTimeout();
  		if (to < 1)
  		{
--- 407,411 ----
        String jspFile = "/searchForm.jsp";
  		setCommonDisplayAttributes(request);
! 		int to = _config.getMaxUserSpecifiedProviderTimeout();
  		if (to < 1)
  		{
***************
*** 840,843 ****
--- 840,844 ----
  			{
  				timeout = Integer.parseInt(timeoutStr);
+ 				System.out.println("User specified timeout is: " + timeout);
  			}
  			catch (NumberFormatException nfe)
***************
*** 846,850 ****
  			}
  		}
- System.out.println("the timeout is: " + timeout);
  
  		Document newDoc = null;
--- 847,850 ----
***************
*** 862,866 ****
  				freq = new InventoryRequest(request);
  			}
! 			System.out.println(freq.toString());
  			newDoc = freq.buildRequestDocument(
  					//_logger.getChildLogger("Request"),
--- 862,866 ----
  				freq = new InventoryRequest(request);
  			}
! 			//System.out.println(freq.toString());
  			newDoc = freq.buildRequestDocument(
  					//_logger.getChildLogger("Request"),
***************
*** 870,874 ****
  					_config.getXMLSchema()
  					);
! 			System.out.println("the NEW doc is: " + XMLUtil.getDocumentAsString(newDoc));
  
  
--- 870,874 ----
  					_config.getXMLSchema()
  					);
! 			System.out.println("User request is: " + XMLUtil.getDocumentAsString(newDoc));
  
  
***************
*** 1039,1042 ****
--- 1039,1043 ----
  
  //FIXME, peej start
+ 				System.out.println("Transforming results and streaming to user.\n");
  				TransformerFactory tFactory = TransformerFactory.newInstance();
  

Index: SearchRequest.java
===================================================================
RCS file: /cvsroot/digir/java/org/calacademy/digir/presentation/SearchRequest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SearchRequest.java	31 Jul 2003 13:55:39 -0000	1.6
--- SearchRequest.java	2 Aug 2003 00:05:17 -0000	1.7
***************
*** 168,180 ****
  
  Cookie[] cookies = request.getCookies();
- System.out.println("num cookies: " + cookies.length);
  Cookie cookie = null;
  String cName = null;
- try
- {
  	for (int i = 0; i<cookies.length; i++)
  	{
  		cookie = cookies[i];
- 		System.out.println(cookie.getName() + " : " + URLDecoder.decode(cookie.getValue(),"UTF-8"));
  		cName = cookie.getName();
  		if (cName.equals("fields"))
--- 168,176 ----
***************
*** 195,204 ****
  		}
  	}
- }
- catch (UnsupportedEncodingException uee)
- {
- 	System.out.println(uee.toString());
- }
- 
  
  
--- 191,194 ----