From: <buc...@us...> - 2011-01-24 15:01:35
|
Revision: 205 http://devmon.svn.sourceforge.net/devmon/?rev=205&view=rev Author: buchanmilne Date: 2011-01-24 15:01:29 +0000 (Mon, 24 Jan 2011) Log Message: ----------- Move parsing of index operator to maintain alphabetical ordering of operators Modified Paths: -------------- trunk/modules/dm_templates.pm Modified: trunk/modules/dm_templates.pm =================================================================== --- trunk/modules/dm_templates.pm 2011-01-24 14:55:49 UTC (rev 204) +++ trunk/modules/dm_templates.pm 2011-01-24 15:01:29 UTC (rev 205) @@ -534,6 +534,14 @@ last CASE; }; + $func_type eq 'index' and do { + $temp =~ s/\s*\{\s*\S+?\s*\}|\s*,\s*//g; + do_log("INDEX transform uses only a single oid at " . + "$trans_file, line $l_num", 0) + and next LINE if $temp ne ''; + last CASE; + }; + $func_type eq 'math' and do { $temp =~ s/:\s*\d+\s*$//; $temp =~ s/\{\s*\S+?\s*\}|\s|\s\.\s|x|\+|\/|-|\^|%|\||&|\d+(\.\d*)?|\(|\)\s*//g; @@ -653,14 +661,6 @@ last CASE; }; - $func_type eq 'index' and do { - $temp =~ s/\s*\{\s*\S+?\s*\}|\s*,\s*//g; - do_log("INDEX transform uses only a single oid at " . - "$trans_file, line $l_num", 0) - and next LINE if $temp ne ''; - last CASE; - }; - do_log("Unknown function '$func_type' at $trans_file, line $l_num", 0); next LINE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |