[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/report IDRSHead.java,1.12,1.13 GenTag.java
Brought to you by:
bigman921
Menu
▾
▴
[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/report IDRSHead.java,1.12,1.13 GenTag.java,1.3,1.4 IfResultsChunk.java,1.4,1.5 NavigateChunk.java,1.3,1.4 InputChunk.java,1.2,1.3 Line.java,1.5,1.6
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report
In directory sc8-pr-cvs1:/tmp/cvs-serv26777/dev/src/net/sourceforge/idrs/core/report
Modified Files:
IDRSHead.java GenTag.java IfResultsChunk.java
NavigateChunk.java InputChunk.java Line.java
Log Message:
1. Moved controller code into servlet
2. Added the ability for properties to be arrays of strings
3. Moved config file into it's own xml file
4. Added better compile errors for rml pages
5. removed all debug printings
Index: IDRSHead.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** IDRSHead.java 8 Jan 2003 06:01:30 -0000 1.12
--- IDRSHead.java 6 Feb 2003 20:13:44 -0000 1.13
***************
*** 23,26 ****
--- 23,27 ----
protected transient HashMap trans;
protected String[] objNames, dbNames;
+ protected transient ServletContext context;
***************
*** 146,150 ****
*/
public void init(HashMap conns, int userNum, int docID, String url, HttpSession session,
! HttpServletRequest request,HttpServletResponse response, Application app, IDRSScriptLanguage context,UserInfo userInfo,String digest) throws Exception {
this.digest = digest;
--- 147,152 ----
*/
public void init(HashMap conns, int userNum, int docID, String url, HttpSession session,
! HttpServletRequest request,HttpServletResponse response, Application app, IDRSScriptLanguage context,UserInfo userInfo,String digest,ServletContext servcontext) throws Exception {
! this.context = servcontext;
this.digest = digest;
***************
*** 227,231 ****
//key = (String) keys.next();
key = dbNames[l];
! System.out.println("KEY : " + key);
db = (DB) dbs.get(key);
if (conns != null) {
--- 229,233 ----
//key = (String) keys.next();
key = dbNames[l];
! // System.out.println("KEY : " + key);
db = (DB) dbs.get(key);
if (conns != null) {
***************
*** 393,397 ****
ObjectStore objstr = (ObjectStore) objects.get(obj);
if (objstr == null)
! throw new Exception("No Object defined : " + obj);
return objstr.getRef();
--- 395,399 ----
ObjectStore objstr = (ObjectStore) objects.get(obj);
if (objstr == null)
! return null;
return objstr.getRef();
***************
*** 656,662 ****
public void createError(String err) {
! System.out.println("Error 1: " + err);
request.setAttribute(ERR_NAME,err);
! System.out.println("Error 2: " + request.getAttribute(ERR_NAME));
}
--- 658,664 ----
public void createError(String err) {
! //System.out.println("Error 1: " + err);
request.setAttribute(ERR_NAME,err);
! // System.out.println("Error 2: " + request.getAttribute(ERR_NAME));
}
***************
*** 667,671 ****
*/
public boolean isError() {
! System.out.println("Error : " + request.getAttribute(ERR_NAME));
return request.getAttribute(ERR_NAME) != null;
}
--- 669,673 ----
*/
public boolean isError() {
! //System.out.println("Error : " + request.getAttribute(ERR_NAME));
return request.getAttribute(ERR_NAME) != null;
}
***************
*** 717,721 ****
}
!
--- 719,728 ----
}
! /**
! * Retrieves the servlet context
! */
! public ServletContext getServletContext() {
! return this.context;
! }
Index: GenTag.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/GenTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GenTag.java 8 Jan 2003 06:01:28 -0000 1.3
--- GenTag.java 6 Feb 2003 20:13:44 -0000 1.4
***************
*** 180,184 ****
sval = head.getRequest().getParameter(name);
if (sval == null) {
! System.out.println("Getting db value " + owner + "." + src + " : " + head.getFieldData(owner,src));
return (sval = head.getFieldData(owner,src)) != null ? sval : "";
}
--- 180,184 ----
sval = head.getRequest().getParameter(name);
if (sval == null) {
! // System.out.println("Getting db value " + owner + "." + src + " : " + head.getFieldData(owner,src));
return (sval = head.getFieldData(owner,src)) != null ? sval : "";
}
***************
*** 188,192 ****
}
else {
! System.out.println("Getting db value " + owner + "." + src + " : " + head.getFieldData(owner,src));
return (sval = head.getFieldData(owner,src)) != null ? sval : "";
}
--- 188,192 ----
}
else {
! // System.out.println("Getting db value " + owner + "." + src + " : " + head.getFieldData(owner,src));
return (sval = head.getFieldData(owner,src)) != null ? sval : "";
}
Index: IfResultsChunk.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IfResultsChunk.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IfResultsChunk.java 4 Mar 2002 23:05:34 -0000 1.4
--- IfResultsChunk.java 6 Feb 2003 20:13:44 -0000 1.5
***************
*** 160,168 ****
this.velines = lines;
setYes = true;
! System.out.println("Set Yes");
}
else {
this.vdlines = lines;
! System.out.println("Set No");
}
--- 160,168 ----
this.velines = lines;
setYes = true;
! //System.out.println("Set Yes");
}
else {
this.vdlines = lines;
! //System.out.println("Set No");
}
Index: NavigateChunk.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/NavigateChunk.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NavigateChunk.java 21 Sep 2002 16:14:46 -0000 1.3
--- NavigateChunk.java 6 Feb 2003 20:13:45 -0000 1.4
***************
*** 67,71 ****
adjustedPos = adjustPosition(db);
! System.out.println("Begining : " + adjustedPos);
returnLink = returnLink || ((adjustedPos >= 0) && (adjustedPos <= db.getNumberRows()));
--- 67,71 ----
adjustedPos = adjustPosition(db);
! //System.out.println("Begining : " + adjustedPos);
returnLink = returnLink || ((adjustedPos >= 0) && (adjustedPos <= db.getNumberRows()));
Index: InputChunk.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/InputChunk.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InputChunk.java 8 Jan 2003 06:01:30 -0000 1.2
--- InputChunk.java 6 Feb 2003 20:13:45 -0000 1.3
***************
*** 20,23 ****
--- 20,25 ----
public static final int INPUT_TEXTAREA = 4;
public static final int INPUT_HIDDEN = 5;
+ public static final int INPUT_FILE = 6;
+
String value;
***************
*** 45,48 ****
--- 47,51 ----
case INPUT_TEXT : getTextTag(nm,"TEXT",head,tag); break;
case INPUT_PASSWORD : getTextTag(nm,"PASSWORD",head,tag); break;
+ case INPUT_FILE : getTextTag(nm,"FILE",head,tag); break;
case INPUT_RADIO : getBoolTag(nm,"RADIO",head,tag); break;
case INPUT_CHECKBOX : getBoolTag(nm,"CHECKBOX",head,tag); break;
Index: Line.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/Line.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Line.java 22 Nov 2002 07:16:24 -0000 1.5
--- Line.java 6 Feb 2003 20:13:45 -0000 1.6
***************
*** 53,57 ****
//StringBuffer vals = new StringBuffer("");
Chunk ch;
! System.out.println("Number of chunks : " + chunks.length);
for (int i=0; i<chunks.length;i++) {
ch = chunks[i];
--- 53,57 ----
//StringBuffer vals = new StringBuffer("");
Chunk ch;
! //System.out.println("Number of chunks : " + chunks.length);
for (int i=0; i<chunks.length;i++) {
ch = chunks[i];
|
