Changeset 619 in quafit

Timestamp:

Feb 13, 2016, 10:45:20 PM (6 years ago)

Author:

alexey

Message:

Updates - fixed some bugs, simplified procedure of module generation and QuaFit? input file

Files:

• genapp_modifier/parser_gennap_modifier.pl (modified) (5 diffs)
• module_generator/parser_mod_sorted.pl (modified) (4 diffs)
• module_generator/quafit_test.json (added)
• module_generator/quatest.dat (added)
• module_generator/quatest_tags.dat (added)

genapp_modifier/parser_gennap_modifier.pl

@@ -5 +5 @@
 
 
-my $file = '/home/alexey/QuaFit/Commented/quatest_commented.dat';
+my $file = '/home/alexey/genapptest/quafit/module_generator/quatest_tags.dat';
 
 if ( !@ARGV )
@@ -35 +35 @@
 while (my $line = <$fh>) {
     my $line_copy = $line;
-    chomp $line;
-    #print OUT $line;
-    
-    if ($line =~ /:/ && $line !~ m/:$/)
+    #chomp $line;
+      
+    if ($line_copy =~ m/#TAG/)
     {
+        $line =~ s/#TAG//;
+        chomp $line;
+        
         my $id = (split(/[:]/, $line))[0];
         my $dval = (split(/[:]/, $line))[-1];
         
+        #print OUT "TAG: $id : $dval \n\n";
+
         $dval =~ s/\s+$//;
         $dval =~ s/^\s*(.*?)\s*$/$1/;  # remove whitespace from both ends
@@ -56 +60 @@
 
 
-        
         if ( length $id_key )
         {
@@ -62 +65 @@
             $label_key =~ tr/a-zA-Z0-9_(\/)[] //cd; 
             $label_key =~ s/^\s*(.*?)\s*$/$1/;
-            if ( $label_key =~ m/(1\/0)/ )
+            if ( $label_key =~ m/(1\/0)/ )
             {
                 $id_key =~ s/_10//ig;
                 if ($dval == 0 && !(exists $ref->{$id_key}))   # Solved problem with checkboxes!!
                 {
-                    print OUT $line_copy; 
+                    $line_copy =~ s/#TAG//;
+                    chomp $line_copy;
+                    $line_copy =~ s/\s+$//;
+                    print OUT $line_copy ."\n";
+                }
+                if ($dval == 1 && !(exists $ref->{$id_key}))   # Solved problem with checkboxes!!
+                {
+                    print OUT "$id:0\n"; 
                 }
                                     
@@ -97 +107 @@
 
 close OUT;
+close OUT1;
+
 
 print encode_json( $res );

module_generator/parser_mod_sorted.pl

@@ -5 +5 @@
 
 
-#my $file = 'qualast_cut.dat';
+#my $file = 'quatest_tags.dat';
 
 if ( !@ARGV )
@@ -19 +19 @@
 open(my $fh, '<', $file) or die "Can't read file '$file' [$!]\n";
 while (my $line = <$fh>) {
-    chomp $line;
-    if ($line =~ /:/ && $line !~ m/:$/)
+    #chomp $line;
+    if ($line =~ m/#TAG/)
     {
+        $line =~ s/#TAG//;
+        chomp $line;
+        
+    #if ($line =~ /:/ && $line !~ m/:$/)
+    #{
         ++$num;
         my $id = (split(/[:]/, $line))[0];
@@ -58 +63 @@
 print "\# this is a module file, any module specific info belongs here
 {
-   \"moduleid\" : \"quafit_module\",
+   \"moduleid\" : \"quafit_test\",
    \"label\"    : \"QuaFit\",
    \"help\"     : \"help_module\",
@@ -105 +110 @@
                      \"required\" : \"true\",
                      \"help\"     : \"\"
-                 }"    
+                 },"    
                 ;
-             if ( $a < $size)
-             {
-                print ",";
-             }
-        }
+ #            if ( $a < $size)
+ #            {
+ #               print ",";
+ #            }
+       }
         else
         {
-            print "
-                 { 
-                     \"role\"     : \"input\",  
+            print "
+                   { 
+                     \"role\"     : \"input\",  
                      \"id\"       : \"$id_key\",
                      \"label\"    : \"$label_key\",
                      \"type\"     : \"text\",  
                      \"default\"  : \"$value\",
-                     \"required\" : \"true\",
-                     \"help\"     : \"\"        
-                 }"    
-                ;
-             if ( $a < $size)
-             {
-                print ",";
-             }
+                     \"required\" : \"true\",
+                     \"help\"     : \"\"        
+                 },"    
+                ;
+ #            if ( $a < $size)
+ #            {
+ #               print ",";
+ #            }
         }
 }
+       print "
+                  { 
+                     \"role\"     : \"output\",  
+                     \"id\"       : \"outputfile\",
+                     \"label\"    : \"Quafit Output\",
+                     \"type\"     : \"file\"  
+                  }"    
+            ;
+
+
 print "
              ], \n
-   \"executable\"   : \"your_executable\",
+   \"executable\"   : \"parser_gennap_modifier.pl\",
    \"submitpolicy\" : \"all\"
 }\n"