[Ils-source] r1449 - in branches/1.6: . webapp/api/ccure/user/put

[scribe at crosswire.org]

Author: scribe
Date: 2016-04-26 04:30:52 -0700 (Tue, 26 Apr 2016)
New Revision: 1449

Modified:
   branches/1.6/
   branches/1.6/webapp/api/ccure/user/put/index.jsp
Log:
merged in changed for CCURE JAX integration to allow multiple field names for role and workgroup



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427,1429,1431,1434,1436
   + /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427,1429,1431,1434,1436,1441,1446-1448

Modified: branches/1.6/webapp/api/ccure/user/put/index.jsp
===================================================================
--- branches/1.6/webapp/api/ccure/user/put/index.jsp	2016-04-26 11:26:07 UTC (rev 1448)
+++ branches/1.6/webapp/api/ccure/user/put/index.jsp	2016-04-26 11:30:52 UTC (rev 1449)
@@ -43,6 +43,9 @@
 	}
 	// end standard service header -----------------------------------
 
+	UserProfile adminUser = ilsSession.getCurrentUserProfile();
+	ilsSession.setCachedCurrentUserProfile(adminUser);
+
 	String data = request.getParameter("data");
 	if (data != null) {
 	data = data.trim();
@@ -79,7 +82,7 @@
 logger.debug("char 2: " + data.charAt(2));
 */
 
-	eventsLogger.debug("CCURE user/put: data: " + data);
+	eventsLogger.info("CCURE user/put: data: " + data);
 	XMLBlock doc = null;
 	XMLBlock records[] = null;
 	++errCode;
@@ -141,8 +144,6 @@
 		++errCode;
 	if (userProfileID != -1 || loginID != null || userData != null) {
 
-		UserProfile adminUser = ilsSession.getCurrentUserProfile();
-
 		String statusMsg      = "";
 		SimpleDateFormat df   = new SimpleDateFormat("MM/dd/yyyy");
 		UserProfile current   = new UserProfile();
@@ -212,6 +213,9 @@
 
 		boolean createGroupOnDemand = true; //false; try { createGroupOnDemand = "true".equals(request.getParameter("createGroupOnDemand")); } catch (Exception e) {}
 		val = record.getValue("UDF__ROLE_");
+		if (val == null || val.length() == 0) val = record.getValue("UDF__CECIL_ROLE_");
+		if (val == null || val.length() == 0) val = record.getValue("UDF__JAXEX_ROLE_");
+		if (val == null || val.length() == 0) val = record.getValue("UDF__JIA_ROLE_");
 		String val2 = request.getParameter("roleUserData");
 		int requestedRole = -1;
 
@@ -249,6 +253,12 @@
 
 		++errCode;
 		val = record.getValue("UDF__COMPANY_");
+		if (val == null || val.length() == 0) val = record.getValue("UDF__COMPANY_1_");
+		if (val == null || val.length() == 0) val = record.getValue("UDF__VQQ_CO_");
+		if (val == null || val.length() == 0) val = record.getValue("UDF__CRG_CO_");
+		if (val == null || val.length() == 0) val = record.getValue("UDF__JIA_COMPANY_");
+		if (val == null || val.length() == 0) val = record.getValue("UDF__CECIL_COMPANY_");
+		if (val == null || val.length() == 0) val = record.getValue("UDF__JAXEX_COMPANY_");
 		val2 = request.getParameter("locationUserData");
 		int requestedLocation = -1;
 		if ((val != null && val.trim().length() > 0) || (val2 != null && val2.trim().length() > 0)) {