[Treebase-guts] SF.net SVN: treebase:[442] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/BaseFormController.java

[<rv...@us...>]

Revision: 442
          http://treebase.svn.sourceforge.net/treebase/?rev=442&view=rev
Author:   rvos
Date:     2010-01-15 12:18:59 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
Changed the way the study id is fetched from the request inside isReviewerAccessGranted, turned on logging.

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-14 19:57:17 UTC (rev 441)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-15 12:18:59 UTC (rev 442)
@@ -183,33 +183,28 @@
 		Object xAccesCodeObject = pRequest.getSession().getAttribute(Constants.X_ACCESS_CODE);
 		if ( xAccesCodeObject != null ) {
 			String storedHashedStudyId = xAccesCodeObject.toString();
-			//LOGGER.info("x-access-code="+storedHashedStudyId);
-			if ( ! TreebaseUtil.isEmpty(storedHashedStudyId) ) {
-				Long studyId = ControllerUtil.getStudyId(pRequest);
-				//LOGGER.info("studyId="+studyId);
-				TreebaseIDString tbidstr = new TreebaseIDString(Study.class,studyId);
-				//LOGGER.info("TreebaseIDString="+tbidstr);
-				NamespacedGUID nsguid = tbidstr.getNamespacedGUID();
-				//LOGGER.info("NamespacedGUID="+nsguid);
-				String computedHashedStudyId = nsguid.getHashedIDString();
-				//LOGGER.info("computedHashedStudyId="+computedHashedStudyId);
-				if ( storedHashedStudyId.equals(computedHashedStudyId) ) {
-					reviewerAccessGranted = true;
-					saveMessage(pRequest,"You are in reviewer access mode.");
-					//LOGGER.info("x-access-code matches computed hashed study id");
-					//LOGGER.info("Reviewer access is granted");
-				}
-				else {
-					//LOGGER.info("x-access-code doesn't match computed hashed study id");
-					//LOGGER.info("access denied");
-				}
+			LOGGER.info("x-access-code="+storedHashedStudyId);
+			Long studyId = Long.parseLong(pRequest.getParameter("id"));
+			LOGGER.info("studyId="+studyId);
+			TreebaseIDString tbidstr = new TreebaseIDString(Study.class,studyId);
+			LOGGER.info("TreebaseIDString="+tbidstr);
+			NamespacedGUID nsguid = tbidstr.getNamespacedGUID();
+			LOGGER.info("NamespacedGUID="+nsguid);
+			String computedHashedStudyId = nsguid.getHashedIDString();
+			LOGGER.info("computedHashedStudyId="+computedHashedStudyId);
+			if ( storedHashedStudyId.equals(computedHashedStudyId) ) {
+				reviewerAccessGranted = true;
+				saveMessage(pRequest,"You are in reviewer access mode.");
+				LOGGER.info("x-access-code matches computed hashed study id");
+				LOGGER.info("Reviewer access is granted");
 			}
 			else {
-				//LOGGER.info("x-access-code is empty");
+				LOGGER.info("x-access-code doesn't match computed hashed study id");
+				LOGGER.info("access denied");
 			}
 		}
 		else {
-			//LOGGER.info("No x-access-code parameter supplied");
+			LOGGER.info("No x-access-code parameter supplied");
 		}
 		return reviewerAccessGranted;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.