diff --git a/SAS/OTDB/sql/buildTemplateTree_func.sql b/SAS/OTDB/sql/buildTemplateTree_func.sql index 6d13a71625c4148b970018dee8de046e9a970455..ba23a4f870a869aa183e1b9e5f9f39a93c74371d 100644 --- a/SAS/OTDB/sql/buildTemplateTree_func.sql +++ b/SAS/OTDB/sql/buildTemplateTree_func.sql @@ -52,10 +52,11 @@ CREATE OR REPLACE FUNCTION instanciateVTparams(INT4, INT4, INT4) AND name NOT like \'#%\' LOOP IF vParam.par_type >= 300 THEN -- popup parameter? leave limits fiels empty. - dfltValue := substring(vParam.limits from \'[a-zA-Z0-9_.,]+;([a-zA-Z0-9_.,]+)\'); + dfltValue := substring(vParam.limits from \'[a-zA-Z0-9_.,<>]+;([a-zA-Z0-9_.,<>]+)\'); IF dfltValue IS NULL THEN dfltValue := \'\'; END IF; +--RAISE WARNING \'X:%,%\', vParam.name, dfltValue; INSERT INTO VICtemplate(treeID, parentID, originID, name, instances, limits) VALUES ($2, $3, vParam.paramID, vParam.name, 1, dfltValue); @@ -183,9 +184,9 @@ CREATE OR REPLACE FUNCTION instanciateVTsubTree(INT4, INT4, INT4) CREATE OR REPLACE FUNCTION instanciateVTtree(INT4, INT4, INT2) RETURNS INT4 AS ' DECLARE - vFunction CONSTANT INT2 := 1; - TTtemplate CONSTANT INT2 := 20; - TSidle CONSTANT INT2 := 0; + vFunction CONSTANT INT2 := 1; + TTtemplate CONSTANT INT2 := 20; + TSbeingspec CONSTANT INT2 := 100; vIsAuth BOOLEAN; vOrgNodeID VICtemplate.nodeID%TYPE; vNewNodeID VICtemplate.nodeID%TYPE; @@ -202,7 +203,7 @@ CREATE OR REPLACE FUNCTION instanciateVTtree(INT4, INT4, INT2) END IF; -- create a new tree(auth, ..., classif, treetype, campaign) - SELECT newTree($1, 0, 0, $3, TTtemplate, TSidle, 0) + SELECT newTree($1, 0, 0, $3, TTtemplate, TSbeingspec, 0) INTO vNewTreeID; IF vNewTreeID = 0 THEN RAISE EXCEPTION \'Tree can not be created\'; diff --git a/SAS/OTDB/sql/create_base_tables.sql b/SAS/OTDB/sql/create_base_tables.sql index bbd16c66ed8fcd6a0c68fde11559d23c5e3f9c87..deab64382a1dc70e49aeb66d40765b895b1a6c9e 100644 --- a/SAS/OTDB/sql/create_base_tables.sql +++ b/SAS/OTDB/sql/create_base_tables.sql @@ -111,6 +111,7 @@ INSERT INTO param_type VALUES (211, 'vdcpx'); INSERT INTO param_type VALUES (212, 'vtext'); INSERT INTO param_type VALUES (214, 'vtime'); INSERT INTO param_type VALUES (215, 'vdate'); +INSERT INTO param_type VALUES (300, 'pnode'); INSERT INTO param_type VALUES (301, 'pbool'); INSERT INTO param_type VALUES (302, 'pint'); INSERT INTO param_type VALUES (303, 'puint');