Changes for awk blocks

index.html

@@ -84,6 +84,7 @@
     <script src="blocks/NFBlock.js"></script>
     <script src="blocks/xargsBlock.js"></script>
     <script src="blocks/conditionActionBlock.js"></script>
+    <script src="blocks/conditionBlock.js"></script>
     <!-- END OF BLOCK DEFINITION -->
     <script>
       document.addEventListener('DOMContentLoaded', () => {
@@ -456,6 +457,7 @@
               { kind: 'block', type: 'NR' },
               { kind: 'block', type: 'NF' },
               { kind: 'block', type: 'xargs' },
+              { kind: 'block', type: 'condition' },
               {
                 kind: 'category',
                 name: [MSG.TEXT_OUTPUT],

public/blocks/NFBlock.js

@@ -16,7 +16,11 @@ var NFBlock = {
   style: 'Field Processing',
   output: null,
   tooltip: '%{BKY_FIELD_NUMBER_TOOLTIP}',
-  helpUrl: '%{BKY_FIELD_NUMBER_HELPURL}' // URL to further information or documentation.
+  helpUrl: '%{BKY_FIELD_NUMBER_HELPURL}', // URL to further information or documentation.
+  generateCommand: function (block) {
+    var awkCommand = 'NF';
+    return awkCommand;
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([NFBlock]);

public/blocks/NRBlock.js

@@ -16,7 +16,10 @@ var NRBlock = {
   style: 'Field Processing',
   output: null,
   tooltip: '%{BKY_RECORD_NUMBER_TOOLTIP}',
-  helpUrl: '%{BKY_RECORD_NUMBER_HELPURL}' // URL to further information or documentation.
+  helpUrl: '%{BKY_RECORD_NUMBER_HELPURL}', // URL to further information or documentation.
+  generateCommand: function (block) {
+    return 'NR';
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([NRBlock]);

public/blocks/awkBlock.js

@@ -26,7 +26,10 @@ var awkBlock = {
   previousStatement: 'Action',
   nextStatement: 'Action',
   tooltip: '%{BKY_AWK_TOOLTIP}',
-  helpUrl: '%{BKY_AWK_HELPURL}' // URL to further information or documentation.
+  helpUrl: '%{BKY_AWK_HELPURL}', // URL to further information or documentation.
+  generateCommand: function (block) {
+    var awkInput_delimiter = block.getFieldValue('awkInput_delimiter');
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([awkBlock]);

public/blocks/columnBlock.js

@@ -16,7 +16,11 @@ var columnBlock = {
   output: null,
   style: 'Field Processing',
   tooltip: '%{BKY_COLUMN_TOOLTIP}',
-  helpUrl: '%{BKY_COLUMN_HELPURL}'
+  helpUrl: '%{BKY_COLUMN_HELPURL}',
+  generateCommand: function (block) {
+    var text = block.getFieldValue('TEXT');
+    return '$' + text;
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([columnBlock]);

public/blocks/conditionActionBlock.js

@@ -20,7 +20,20 @@ var conditionActionBlock = {
   nextStatement: null,
   style: 'Field Processing',
   tooltip: '%{BKY_CONDITION_ACTION_TOOLTIP}',
-  helpUrl: '%{BKY_CONDITION_ACTION_HELPURL}' // URL to further information or documentation.
+  helpUrl: '%{BKY_CONDITION_ACTION_HELPURL}', // URL to further information or documentation.
+  generateCommand: function (block) {
+    var cond = block.getInputTargetBlock('COND');
+    var condCommand = '';
+    if (cond !== null) {
+      condCommand = handleBlockByType(cond);
+    }
+    var action = block.getInputTargetBlock('DO');
+    actionCommand = '';
+    if (action !== null) {
+      actionCommand = handleBlockByType(action);
+    }
+    return condCommand + ' {' + actionCommand + '}';
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([conditionActionBlock]);

public/blocks/conditionBlock.js

@@ -0,0 +1,71 @@
+var conditionBlock = {
+  type: 'condition',
+  category: 'Field Processing',
+  message0: '%1', // First message line for left_part
+  args0: [
+    {
+      type: 'input_value',
+      name: 'left_part',
+      check: ['String', 'Number', 'Boolean'] // Allow both String and Number types
+    }
+  ],
+  message1: '%1', // Second message line for operator
+  args1: [
+    {
+      type: 'field_dropdown',
+      name: 'operator',
+      options: [
+        ['==', '=='],
+        ['!=', '!='],
+        ['<', '<'],
+        ['<=', '<='],
+        ['>', '>'],
+        ['>=', '>=']
+      ]
+    }
+  ],
+  message2: '%1', // Third message line for right_part
+  args2: [
+    {
+      type: 'input_value',
+      name: 'right_part',
+      check: ['String', 'Number', 'Boolean'] // Allow both String and Number types
+    }
+  ],
+  style: 'Field Processing',
+  previousStatement: null,
+  generateCommand: function (block) {
+    var awkCondition = '';
+    const leftPartBlock = block.getInputTargetBlock('left_part');
+    const rightPartBlock = block.getInputTargetBlock('right_part');
+
+    const operator = block.getFieldValue('operator');
+    var leftPart = '';
+    var rightPart = '';
+
+    // Retrieve the command for the left part block, if it exists
+    if (leftPartBlock !== null) {
+      leftPart = handleBlockByType(leftPartBlock);
+    }
+    if (leftPart === '') {
+      leftPart = leftPartBlock.getFieldValue('TEXT');
+    }
+    console.log('leftPartBlock:', leftPart);
+
+    // Retrieve the command for the right part block, if it exists
+    if (rightPartBlock !== null) {
+      rightPart = handleBlockByType(rightPartBlock);
+    }
+
+    console.log('leftPart:', leftPart);
+    console.log('operator:', operator);
+    console.log('rightPart:', rightPart);
+
+    // Combine the parts to form the AWK condition
+    awkCondition = leftPart + ' ' + operator + ' ' + rightPart;
+
+    return awkCondition;
+  }
+};
+
+Blockly.defineBlocksWithJsonArray([conditionBlock]);

public/blocks/sedBlock.js

@@ -49,7 +49,7 @@ var sedBlock = {
   tooltip: '%{BKY_SED_TOOLTIP}',
   helpUrl: '%{BKY_SED_HELPURL}', // URL to further information or documentation.
   generateCommand: function (block) {
-    let sedCommand = handleBlock(block); // Basic sed command
+    let sedCommand = handleBlockByType(block); // Basic sed command
 
     // Handle pattern and replacement
     let patternBlock = block.getInputTargetBlock('regPattern');