Mercurial Hosting > luan
diff web/src/luan/modules/web/HttpServicer.java @ 313:1f6d828986b9
replace Http.request.servlet_path with Http.request.path;
rename Http.request.current_url to Http.request.url;
Web_server now loads welcome_file in init() for initialization;
fix cmd_line -e;
fix install for luan args;
git-svn-id: https://luan-java.googlecode.com/svn/trunk@314 21e917c8-12df-6dd8-5cb6-c86387c605b9
| author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
|---|---|
| date | Thu, 25 Dec 2014 06:14:59 +0000 |
| parents | b669cdaf54b7 |
| children | 78a6a71afbfd |
line wrap: on
line diff
--- a/web/src/luan/modules/web/HttpServicer.java Wed Dec 24 11:15:27 2014 +0000 +++ b/web/src/luan/modules/web/HttpServicer.java Thu Dec 25 06:14:59 2014 +0000 @@ -111,7 +111,7 @@ } @Override Iterator<String> names() { - return new EnumerationIterator(request.getParameterNames()); + return new EnumerationIterator<String>(request.getParameterNames()); } @Override protected String type() { @@ -127,7 +127,7 @@ } @Override Iterator<String> names() { - return new EnumerationIterator(request.getHeaderNames()); + return new EnumerationIterator<String>(request.getHeaderNames()); } @Override protected String type() { @@ -138,14 +138,19 @@ tbl.put( "method", new LuanProperty() { public Object get() { return request.getMethod(); } } ); +/* tbl.put( "servlet_path", new LuanProperty() { public Object get() { return request.getServletPath(); } } ); +*/ + tbl.put( "path", new LuanProperty() { public Object get() { + return request.getRequestURI(); + } } ); tbl.put( "server_name", new LuanProperty() { public Object get() { return request.getServerName(); } } ); - tbl.put( "current_url", new LuanProperty() { public Object get() { - return getCurrentURL(request); + tbl.put( "url", new LuanProperty() { public Object get() { + return getURL(request); } } ); tbl.put( "query_string", new LuanProperty() { public Object get() { return getQueryString(request); @@ -257,7 +262,7 @@ } @Override Iterator<String> names() { - return new EnumerationIterator(request.getSession().getAttributeNames()); + return new EnumerationIterator<String>(request.getSession().getAttributeNames()); } @Override public void put(Object key,Object val) { @@ -352,11 +357,11 @@ return queryBuf.toString(); } - public static String getCurrentURL(HttpServletRequest request) { - return getCurrentURL(request,0); + public static String getURL(HttpServletRequest request) { + return getURL(request,0); } - public static String getCurrentURL(HttpServletRequest request,int maxValueLen) { + public static String getURL(HttpServletRequest request,int maxValueLen) { // StringBuffer buf = HttpUtils.getRequestURL(request); StringBuffer buf = request.getRequestURL(); String qStr = getQueryString(request,maxValueLen);