Skip to content

opibuilder: UpgradeUtil converts const://x($(M)) into =$(M) #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berryma4 merged 1 commit into from
Apr 11, 2014
Merged

opibuilder: UpgradeUtil converts const://x($(M)) into =$(M) #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions ...lugins/org.csstudio.opibuilder.test/src/org/csstudio/opibuilder/util/UpgradeUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
/*******************************************************************************
* Copyright (c) 2013 Oak Ridge National Laboratory.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
******************************************************************************/
package org.csstudio.opibuilder.util;

import static org.junit.Assert.assertEquals;

import org.junit.Test;

/** JUnit test of the {@link UpgradeUtil}
* @author Xihui Chen
* @author Kay Kasemir
*/
public class UpgradeUtilTest {



@Test
public void testConvertUtilityPVNameToPM() {
Expand All @@ -24,6 +33,7 @@ public void testConvertUtilityPVNameToPM() {
UpgradeUtil.convertUtilityPVNameToPM("loc://myPV(12,34,2.3,4.56)"));
assertEquals("loc://myPV",
UpgradeUtil.convertUtilityPVNameToPM("loc://myPV"));


//macro should not be converted
assertEquals("loc://my$(DID)PV(\"fred\")",
Expand Down Expand Up @@ -69,8 +79,14 @@ public void testConvertUtilityPVNameToPM() {

//regular pv
assertEquals("fred:current",
UpgradeUtil.convertUtilityPVNameToPM("fred:current"));
UpgradeUtil.convertUtilityPVNameToPM("fred:current"));

// Macros:
// Unclear how to convert constants, because strings would require quotes,
// but content of macro is not known.
// Bug discussion https://github.com/ControlSystemStudio/cs-studio/issues/412
// decided on unquoted
assertEquals("=$(M)",
UpgradeUtil.convertUtilityPVNameToPM("const://x($(M))"));
}

}
107 changes: 70 additions & 37 deletions ...cations/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/util/UpgradeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@
* Utility Class help to process the differences between version upgrade.
* @author Xihui Chen
*/
@SuppressWarnings("nls")
public final class UpgradeUtil {

/**
*The first version that supports PVManager.
*/
public static final Version VERSION_WITH_PVMANAGER = new Version(3,2,6);

private final static String doublePattern = "\\s*([-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?)\\s*"; //$NON-NLS-1$
private final static String doubleArrayPattern = doublePattern + "(," + doublePattern + ")+"; //$NON-NLS-1$ //$NON-NLS-2$
private final static String doublePattern = "\\s*([-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?)\\s*";
private final static String doubleArrayPattern = doublePattern + "(," + doublePattern + ")+";

/**Convert utility PV name to PVMangaer PV name.
* @param pvName
Expand All @@ -32,23 +33,23 @@ public final class UpgradeUtil {
public static String convertUtilityPVNameToPM(String pvName){

// convert loc://pvName(fred) to loc://pvName("fred")
if (pvName.startsWith("loc://")) { //$NON-NLS-1$
final int value_start = getFirstIndexHelper(pvName, 0); //$NON-NLS-1$
if (pvName.startsWith("loc://")) {
final int value_start = getFirstIndexHelper(pvName, 0);
if (value_start > 0) {
if(!pvName.matches(".+[^$]\\(.*\\)")) //$NON-NLS-1$
if(!pvName.matches(".+[^$]\\(.*\\)"))
return pvName;
final int value_end = pvName.lastIndexOf(')'); //$NON-NLS-1$
final int value_end = pvName.lastIndexOf(')');
if (value_end > 0) {
String value_text = pvName.substring(value_start + 1,
value_end);
if (!value_text.matches("\".*\"") && //$NON-NLS-1$
if (!value_text.matches("\".*\"") &&
!value_text.matches(doubleArrayPattern)) { // if it is not number array
try {
Double.parseDouble(value_text);
} catch (Exception e) {
return pvName.substring(0, value_start + 1)
+ "\"" + pvName.substring(value_start + 1, value_end) + //$NON-NLS-1$
"\"" + pvName.substring(value_end); //$NON-NLS-1$
+ "\"" + pvName.substring(value_start + 1, value_end) +
"\"" + pvName.substring(value_end);
}
}
}
Expand All @@ -57,36 +58,68 @@ public static String convertUtilityPVNameToPM(String pvName){
}


if(pvName.startsWith("const://")) {//$NON-NLS-1$
final int value_start = pvName.lastIndexOf('('); //$NON-NLS-1$
if (value_start > 0) {
final int value_end = pvName.lastIndexOf(')'); //$NON-NLS-1$
if (value_end > 0) {
String value_text = pvName.substring(value_start + 1,
value_end);
//convert const://myArray(12,34,56) to sim://const(12,23,56)
if(value_text.matches(doubleArrayPattern))
return "sim://const(" + value_text + ")"; //$NON-NLS-1$ //$NON-NLS-2$
if (pvName.startsWith("const://"))
{
// Old format example:
// const://$(DID)_name_$(DID)(123, 456, $(M), 789)")

// Find last bracket
final int value_end = pvName.lastIndexOf(')');
if (value_end <= 0)
return pvName;

// Find matching opening brace
int value_start = value_end;
int brackets = 1;
while (--value_start > 0)
{
if (pvName.charAt(value_start) == ')')
++brackets;
else if (pvName.charAt(value_start) == '(')
{
if (--brackets == 0)
break;
}
}
if (brackets != 0)
return pvName;

final String value_text = pvName.substring(value_start + 1, value_end);

// Return const://myArray(12,34,56) as sim://const(12,23,56)
if(value_text.matches(doubleArrayPattern))
return "sim://const(" + value_text + ")";

//const://myString(fred) to ="fred"
if (!value_text.matches("\".+\"")){ //$NON-NLS-1$
try {
Double.parseDouble(value_text);
} catch (Exception e) {
return "=\""+value_text+"\""; //$NON-NLS-1$ //$NON-NLS-2$
}
}
//const://mvPV(123) to =123
return "="+value_text; //$NON-NLS-1$
}
}
// Return const://text("Text") as ="Text"
if (value_text.matches("\".+\""))
return "=" + value_text;

// Return const://parsable_numer(1.23e-4) as =1.23e-4
try
{
Double.parseDouble(value_text);
return "=" + value_text;
}
catch (Exception e)
{
// Ignore
}

// Not obvious number, nor quoted string.
// Because of Bug discussion https://github.com/ControlSystemStudio/cs-studio/issues/412,
// assume value that is one macro "$(Macro)" contains a number
if (value_text.trim().startsWith("$("))
return "="+value_text;

// No idea what is inside value, so quote it
return "=\"" + value_text + "\"";
}

if(pvName.startsWith("\"") && pvName.endsWith("\""))//$NON-NLS-1$ //$NON-NLS-2$
return "="+pvName; //$NON-NLS-1$
if(pvName.startsWith("\"") && pvName.endsWith("\""))
return "="+pvName;

if(pvName.matches(doublePattern)){
return "="+pvName; //$NON-NLS-1$
return "="+pvName;
}

return pvName;
Expand All @@ -95,10 +128,10 @@ public static String convertUtilityPVNameToPM(String pvName){

private static int getFirstIndexHelper(String s, int from){
if(s== null || s.isEmpty()) return -1;
int i = s.indexOf('(', from); //$NON-NLS-1$
int i = s.indexOf('(', from);
if(i<=0) return i;
if(s.charAt(i-1) == '$'){ //$NON-NLS-1$
int newStart=s.indexOf(')', i); //$NON-NLS-1$
if(s.charAt(i-1) == '$'){
int newStart=s.indexOf(')', i);
if(newStart>=0)
return getFirstIndexHelper(s, newStart);
}
Expand Down