[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/report IDRSHead.java,1.17,1.18
Brought to you by:
bigman921
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:58
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/net/sourceforge/idrs/core/report Modified Files: IDRSHead.java Log Message: First pass at integration with Axis Index: IDRSHead.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** IDRSHead.java 19 Apr 2003 03:13:48 -0000 1.17 --- IDRSHead.java 22 Aug 2004 05:17:40 -0000 1.18 *************** *** 15,18 **** --- 15,21 ---- import net.sourceforge.idrs.jndi.*; import javax.naming.*; + + import org.w3c.dom.Element; + import java.lang.reflect.*; *************** *** 156,160 **** */ 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; --- 159,163 ---- */ 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,Element dom,String basePackage) throws Exception { this.context = servcontext; *************** *** 219,222 **** --- 222,229 ---- if (obj.setProps()) obj.setProps(request); + + if (dom != null) { + obj.importDOM(dom,basePackage); + } } *************** *** 254,259 **** if (varVals != null) { for (i=0;i<varVals.length;i++) { ! if (varVals[i].equalsIgnoreCase("UserID")) { varVals[i] = Integer.toString(userNum); } } --- 261,273 ---- if (varVals != null) { for (i=0;i<varVals.length;i++) { ! //if any of the values are null, then that means we are in XML mode ! if (varVals[i] == null) { ! varVals = new String[0]; ! break; ! } else { ! ! if (varVals[i].equalsIgnoreCase("UserID")) { varVals[i] = Integer.toString(userNum); + } } } *************** *** 766,769 **** --- 780,800 ---- } + + public List getRequiredDBs() throws Exception { + ArrayList ret = new ArrayList(); + for (int l=0,m=dbNames.length;l<m;l++) { + //retrieve a connection + //key = (String) keys.next(); + String key = dbNames[l]; + // System.out.println("KEY : " + key); + DB db = (DB) dbs.get(key); + if (! ret.contains(db.getDBName())) { + ret.add(db.getDBName()); + } + + } + + return ret; + } } |