Changeset 578 for trunk/src/org/expeditee/actions/Misc.java

Timestamp:

12/06/13 11:40:01 (11 years ago)

Author:

jts21

Message:

Add support for following links to JS parsing action, and make sure it won't get into an infinite loop of following links.
TODO: find a better way of avoiding infinite loops (one that allows multiple use of frames, but still stops infinite loops - look at how arrow following works)

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (2 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -1238 +1238 @@
         private static ScriptEngine se = sem.getEngineByMimeType("application/javascript");
         
-        private static String getScript(Frame frame) throws Exception {
-                
-                StringBuffer sb = new StringBuffer();
-                
-                List<Item> y_ordered_items = (List<Item>)frame.getNonAnnotationItems(true);
-                XGroupItem toplevel_xgroup = new XGroupItem(frame,y_ordered_items);
-                
-                // ... following on from Steps 1 and 2 in the Constructor in XGroupItem ...
-                
-                // Step 3: Reposition any 'out-of-flow' XGroupItems
-                toplevel_xgroup.repositionOutOfFlowGroups(toplevel_xgroup);
-                
-                // Step 4: Now add in the remaining (nested) XGroupItems
-                List<XGroupItem> grouped_item_list = toplevel_xgroup.getGroupedItemList();
-                toplevel_xgroup.mapInXGroupItemsRecursive(grouped_item_list);
-        
-                // Finally, retrieve linear list of all Items, (ordered, Y by X, allowing for overlap, nested-boxing, and arrow flow)
-                
-                List<Item> overlapping_y_ordered_items = toplevel_xgroup.getYXOverlappingItemList();    
-                
-                for(Item i : overlapping_y_ordered_items) {
-                        if(i instanceof Text) {
-                                sb.append(((Text)i).getText() + "\n");
-                        }
-                }
-                
-                System.out.println("*****\n" + sb.toString() + "\n*****");
-                return sb.toString();
+        private static class JSParser {
+                private List<Frame> seen = new LinkedList<Frame>();
+                private StringBuffer sb = new StringBuffer();
+                
+                public JSParser(Frame frame, boolean followLinks) throws Exception {
+                        parseScript(frame, followLinks);
+                }
+                
+                private void parseScript(Frame frame, boolean followLinks) throws Exception {
+                        
+                        if(frame == null) {
+                                return;
+                        }
+                        
+                        // make sure we don't get into an infinite loop
+                        // TODO: find a smarter way to do this that allows reusing frames but still stops infinite loops?
+                        seen.add(frame);
+                        
+                        // get all items on the frame
+                        List<Item> y_ordered_items = (List<Item>)frame.getItems();
+                        // remove the title item
+                        y_ordered_items.remove(frame.getTitleItem());
+                        
+                        XGroupItem toplevel_xgroup = new XGroupItem(frame,y_ordered_items);
+                        // ... following on from Steps 1 and 2 in the Constructor in XGroupItem ...
+                        
+                        // Step 3: Reposition any 'out-of-flow' XGroupItems
+                        toplevel_xgroup.repositionOutOfFlowGroups(toplevel_xgroup);
+                        
+                        // Step 4: Now add in the remaining (nested) XGroupItems
+                        List<XGroupItem> grouped_item_list = toplevel_xgroup.getGroupedItemList();
+                        toplevel_xgroup.mapInXGroupItemsRecursive(grouped_item_list);
+                
+                        // Finally, retrieve linear list of all Items, (ordered, Y by X, allowing for overlap, nested-boxing, and arrow flow)
+                        List<Item> overlapping_y_ordered_items = toplevel_xgroup.getYXOverlappingItemList();    
+                        
+                        // Loop through the items looking for code and links to new frames
+                        for(Item i : overlapping_y_ordered_items) {
+                                if(followLinks && i.hasLink()) {
+                                        Frame child = i.getChild();
+                                        if(child != null && !seen.contains(child)) {
+                                                this.parseScript(child, true);
+                                        }
+                                }
+                                if(i instanceof Text && !i.isAnnotation()) {
+                                        sb.append(((Text)i).getText() + "\n");
+                                }
+                        }
+                }
+                
+                public String getScript() {
+                        System.out.println("*****\n" + sb.toString() + "\n*****");
+                        return sb.toString();
+                }
         }
         
         public static void runJSFrame(Frame frame) throws Exception {
-                se.eval(getScript(frame));
+                se.eval(new JSParser(frame, true).getScript());
         }
         
@@ -1310 +1336 @@
                         FrameIO.SaveFrame(frame);
                 } else {
-                        se.eval(getScript(frame));
+                        runJSFrame(frame);
                 }
         }