Index: trunk/ippMonitor/scripts/generate
===================================================================
--- trunk/ippMonitor/scripts/generate	(revision 28601)
+++ trunk/ippMonitor/scripts/generate	(revision 28654)
@@ -162,10 +162,10 @@
     }
 
+    foreach $opword (@opwords) {
+        &parse_opwords ($opword);
+    }
+
     foreach $imagedef (@imagedefs) {
         &parse_imagedef ($imagedef);
-    }
-
-    foreach $opword (@opwords) {
-        &parse_opwords ($opword);
     }
 
@@ -446,4 +446,5 @@
             next;
         }
+
     }
 }
@@ -625,4 +626,9 @@
     ($var, $name, $rule, $camera, $class) = split (" ", $value);
     $name   = &parse_fieldname ($name);
+    if (exists $ops{$name}) {
+	#if OPx was defined, replace it by its value
+	$name = $ops{$name};
+	$name =~ s/\s+//g;
+    }
     $camera = &parse_fieldname ($camera);
     $class  = &parse_fieldname ($class);