[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/report NavigateChunk.java,1.6,1.7 IDRSHead.java,1.16,1.17 SelectChunk.java,1.1,1.2

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report
In directory sc8-pr-cvs1:/tmp/cvs-serv21774/dev/src/net/sourceforge/idrs/core/report

Modified Files:
	NavigateChunk.java IDRSHead.java SelectChunk.java 
Log Message:
Added ability for IDRS security implementation to assume that if a record is retrieved, the password is ok.  This will allow for proprietary password encryption models to be used

Index: NavigateChunk.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/NavigateChunk.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NavigateChunk.java	26 Mar 2003 23:03:22 -0000	1.6
--- NavigateChunk.java	19 Apr 2003 03:13:48 -0000	1.7
***************
*** 69,74 ****
  			db = (DB) head.dbs.get(it.next());		
  			if (db.getIsPaged()) {
! 				buff.append(db.getID()).append("_Reset=false").append('&');
! 				buff.append(db.getID()).append("_PageSize=").append(db.getNumRecs()).append('&');
  				
  				adjustedPos = adjustPosition(db);
--- 69,74 ----
  			db = (DB) head.dbs.get(it.next());		
  			if (db.getIsPaged()) {
! 				if (ignore != null ? ! ignore.contains(db.getID() + "_Reset") : true) buff.append(db.getID()).append("_Reset=false").append('&');
! 				if (ignore != null ? ! ignore.contains(db.getID() + "_PageSize") : true) buff.append(db.getID()).append("_PageSize=").append(db.getNumRecs()).append('&');
  				
  				adjustedPos = adjustPosition(db);
***************
*** 76,80 ****
  				returnLink = returnLink || ((adjustedPos >= 0) && (adjustedPos <= db.getNumberRows()));
  				
! 				buff.append(db.getID()).append("_FirstRecord=").append(adjustedPos).append('&');
  			}
  		}
--- 76,80 ----
  				returnLink = returnLink || ((adjustedPos >= 0) && (adjustedPos <= db.getNumberRows()));
  				
! 				if (ignore != null ? ! ignore.contains(db.getID() + "_FirstRecord") : true) buff.append(db.getID()).append("_FirstRecord=").append(adjustedPos).append('&');
  			}
  		}
***************
*** 101,105 ****
  			}
  			else {*/
! 			if ((ignore != null ? ! ignore.contains(param) : true) && paramName.indexOf("_Reset") == -1 && paramName.indexOf("_FirstRecord") == -1 && paramName.indexOf("_Reset") == -1) {
  				buff.append(paramName).append('=').append(URLEncoder.encode(param)).append('&');
  			}
--- 101,106 ----
  			}
  			else {*/
! 
! 			if ((ignore != null ? ! ignore.contains(paramName) : true) && paramName.indexOf("_Reset") == -1 && paramName.indexOf("_FirstRecord") == -1 && paramName.indexOf("_Reset") == -1) {
  				buff.append(paramName).append('=').append(URLEncoder.encode(param)).append('&');
  			}
***************
*** 138,142 ****
  			db = (DB) head.dbs.get(it.next());		
  			if (db.getIsPaged()) {
! 				if (ignore != null ? ! ignore.contains(db.getID() + "_Reset") : true) buff.append("<INPUT TYPE=\"HIDDEN\" NAME=\"").append(db.getID()).append("_Reset\" VALUE-\"false\">").append('\n');
  				if (ignore != null ? ! ignore.contains(db.getID() + "_PageSize") : true)buff.append("<INPUT TYPE=\"HIDDEN\" NAME=\"").append(db.getID()).append("_PageSize\" VALUE=\"").append(db.getNumRecs()).append("\">\n");
  				
--- 139,143 ----
  			db = (DB) head.dbs.get(it.next());		
  			if (db.getIsPaged()) {
! 				if (ignore != null ? ! ignore.contains(db.getID() + "_Reset") : true) buff.append("<INPUT TYPE=\"HIDDEN\" NAME=\"").append(db.getID()).append("_Reset\" VALUE=\"false\">").append('\n');
  				if (ignore != null ? ! ignore.contains(db.getID() + "_PageSize") : true)buff.append("<INPUT TYPE=\"HIDDEN\" NAME=\"").append(db.getID()).append("_PageSize\" VALUE=\"").append(db.getNumRecs()).append("\">\n");
  				

Index: IDRSHead.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** IDRSHead.java	26 Mar 2003 21:33:06 -0000	1.16
--- IDRSHead.java	19 Apr 2003 03:13:48 -0000	1.17
***************
*** 661,664 ****
--- 661,680 ----
    }
    
+   /**
+ 	*Tells the type of digest
+ 	*@param plain Plain Text String
+ 	*/
+    public byte[] getDigestBytes(String plain) throws Exception {
+ 	   if (! this.digest.equalsIgnoreCase("none")) {
+ 		 MessageDigest md = MessageDigest.getInstance(this.digest);
+ 		 md.update(plain.getBytes());
+ 		 byte[] digest = md.digest();
+ 		 return digest;
+ 	   }
+ 	   else {
+ 		   return plain.getBytes();
+ 	   }
+    }
+   
    
    /**

Index: SelectChunk.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/SelectChunk.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectChunk.java	22 Nov 2002 07:16:24 -0000	1.1
--- SelectChunk.java	19 Apr 2003 03:13:49 -0000	1.2
***************
*** 67,71 ****
  	protected LinkedList getList(IDRSHead idrs) throws Exception {
  		HashMap row;
! 		LinkedList table = (LinkedList) idrs.getRequest().getAttribute("SELECT_" + name);
  
  		if (table == null) {
--- 67,71 ----
  	protected LinkedList getList(IDRSHead idrs) throws Exception {
  		HashMap row;
! 		LinkedList table = (LinkedList) idrs.getRequest().getAttribute("SELECT_" + srcDB);
  
  		if (table == null) {
***************
*** 78,82 ****
  			}
  
! 			idrs.getRequest().setAttribute("SELECT_" + name,table);
  		}
  
--- 78,83 ----
  			}
  
! 
! 			idrs.getRequest().setAttribute("SELECT_" + srcDB,table);
  		}