From eac30db6329f05cc7cf2a35613497e357b4db3aa Mon Sep 17 00:00:00 2001
From: abranson <abranson@PCUWE01.cern.ch>
Date: Thu, 26 Apr 2012 00:31:26 +0200
Subject: Update for javax.script

---
 .../boot/SC/CreateNewNumberedVersionFromLast.xml   | 44 ++++++++--------------
 1 file changed, 16 insertions(+), 28 deletions(-)

(limited to 'resources/boot/SC/CreateNewNumberedVersionFromLast.xml')

diff --git a/resources/boot/SC/CreateNewNumberedVersionFromLast.xml b/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
index bb66f4c..321855a 100644
--- a/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
+++ b/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
@@ -3,37 +3,25 @@
 	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
 	<script language="javascript" name="CreateNewNumberedVersionFromLast"><![CDATA[
 
-		var job = bsf.lookupBean("job");
-		var item = bsf.lookupBean("item");
-		var agent = bsf.lookupBean("agent");
-		var errorBuffer = bsf.lookupBean("errors");
-
 		var viewName = job.getActPropString("ViewName");
 		
-		if (viewName.equals("")) {
-			errorBuffer.addError("ViewName not specified. Cannot create new version.");
-			errorBuffer.setFatal();
-		}
+		if (viewName.equals("")) 
+			throw "ViewName not specified. Cannot create new version.";
 			
-		if (!(errorBuffer.getFatal())) {
-			var lastView = -1;
-			var existingViews = item.getContents("/ViewPoint/"+viewName);
-			for (i=0; i<existingViews.length; i++) {
-				var thisView = parseInt(existingViews[i]);
-				if (thisView!=NaN && lastView < thisView) lastView = thisView;
-			}
-			lastView++;
-			try {
-				var existingLast = agent.unmarshall(item.queryData("/ViewPoint/"+viewName+"/last"));
-			} catch (e) {
-				errorBuffer.addError("No data found. You must submit at least one version before executing this activity.");
-				errorBuffer.setFatal();
-			}
-			if (!(errorBuffer.getFatal())) {
-				existingLast.setName(lastView);
-				agent.execute(item, "AddC2KObject", existingLast);
-			}
+		var lastView = -1;
+		var existingViews = item.getContents("/ViewPoint/"+viewName);
+		for (i=0; i<existingViews.length; i++) {
+			var thisView = parseInt(existingViews[i]);
+			if (thisView!=NaN && lastView < thisView) lastView = thisView;
 		}
-		errorBuffer;
+		lastView++;
+		try {
+			var existingLast = agent.unmarshall(item.queryData("/ViewPoint/"+viewName+"/last"));
+		} catch (e) {
+			throw "No data found. You must submit at least one version before executing this activity.";
+		}
+		existingLast.setName(lastView);
+		agent.execute(item, "AddC2KObject", existingLast);
+
 		]]></script>
 </cristalscript>
-- 
cgit v1.2.3