Changeset 24934

Timestamp:

2012-01-11T10:05:58+13:00 (12 years ago)

Author:

davidb

Message:

Introduction of new Perl module to handle taking the JSON version of the traversed HTML tree and output it as an expeditee frame

Location:

gs3-extensions/html-to-expeditee/trunk/src

Files:

• perllib/ExpediteeFrameIO.pm (added)
• perllib/cgiactions/HtmlToExpediteeAction.pm (modified) (3 diffs)
• src/cgi-bin/html-to-expeditee.pl.in (modified) (4 diffs)
• src/js/html-to-expeditee.js (modified) (7 diffs)

gs3-extensions/html-to-expeditee/trunk/src/perllib/cgiactions/HtmlToExpediteeAction.pm

@@ -30 +30 @@
 use cgiactions::baseaction;
 
+use ExpediteeFrameIO;
 use JSON;
 
@@ -84 +85 @@
     my $exp_frame_tree = decode_json $json_str_utf8;
     
-
     my $output_dir = &util::filename_cat($collect_dir,$collect,"export");
 
@@ -92 +92 @@
     my $frame_filename = &util::filename_cat($output_dir,"$fn.exp");
 
-    if (open(FOUT,">$frame_filename")) {
-    binmode(FOUT,":utf8");
+    my $expeditee_frame_io = new ExpediteeFrameIO();
+    
+    $expeditee_frame_io->buildFrame($exp_frame_tree);
 
-    print FOUT $json_str_utf8;
-    close(FOUT);
+#    if (open(FOUT,">$frame_filename")) {
+#   binmode(FOUT,":utf8");
+
+#   print FOUT $json_str_utf8;
+#   close(FOUT);
+#   $gsdl_cgi->generate_message("html-to-expeditee saved frame $fn");
+#    }
+#    else {
+#   $gsdl_cgi->generate_error("Failed to open $frame_filename for output");
+#    }
+
+    if ($expeditee_frame_io->saveFrame($frame_filename)) {
     
     # write out next free frame num
-    
+    $expeditee_frame_io->saveNextFreeFrame($fn+1);
+
     $gsdl_cgi->generate_message("html-to-expeditee saved frame $fn");
     }

gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in

@@ -157 +157 @@
               url = "library.cgi";
               url += "?c="+collect +"&a=d&d=" + docOID;
-         }
-         else {
+          }
+          else {
               url = "dev";
               url += "?c="+collect +"&a=d&d=" + docOID;
               url += "&ed=1&dt=hierarchy";
-         }
-          
+              // url += "&excerptid=gs_content";
+          }
+          
+          /* load iframe with document drawn from Greenstone collection */
           iframe.src = url;
           
@@ -200 +202 @@
          });
 
-          var expFrameTree = htmlToExpeditee(iframeDoc.body);
+          var gsContent = iframeDoc.getElementById("gs_content");
+
+          /*
+          var gsContentPos = getElementPosition(gsContent); 
+          var pxl = gsContentPos.xl;
+          var pxr = gsContentPos.xr;
+          */
+
+          var expFrameTree = htmlToExpeditee(gsContent);
+
           var expFrame = JSON.stringify(expFrameTree);
           //alert(expFrame);
@@ -240 +251 @@
                   url += "?c="+collect +"&a=d&d=" + docOID;
                   url += "&ed=1&dt=hierarchy";
+                  // url += "&excerptid=gs_content";
               }
 
@@ -277 +289 @@
 {
 
-#    $ENV{'QUERY_STRING'} = "a=set-import-metadata&c=espresso-music&d=HASH012d6f72cde5dc48162f4a1d.1&metaname=annotation&metapos=0&metavalue=adfadfad";
-#    $ENV{'QUERYSTRING'} = "a=set-import-metadata&c=espresso-music&d=HASH012d6f72cde5dc48162f4a1d.1&metaname=annotation&metapos=0&metavalue=adfadfad";
+#    $ENV{'QUERY_STRING'} = "a=...";set-import-metadata&c=espresso-music&d=HASH012d6f72cde5dc48162f4a1d.1&metaname=annotation&metapos=0&metavalue=adfadfad";
 #    $ENV{'REQUEST_METHOD'} = "GET";
-
 
     my $gsdl_cgi = new gsdlCGI();

gs3-extensions/html-to-expeditee/trunk/src/src/js/html-to-expeditee.js

@@ -31 +31 @@
     return elem.clip.width;
     } else {
-    if (elem.style.pixelWidth) {
+    if (elem.style && elem.style.pixelWidth) {
         return elem.style.pixelWidth;
     } else {
@@ -44 +44 @@
     return elem.clip.height;
     } else {
-    if (elem.style.pixelHeight) {
+    if (elem.style && elem.style.pixelHeight) {
         return elem.style.pixelHeight;
     } else {
@@ -84 +84 @@
 
 
+function htmlToExpeditee(node) 
+{
+    var nodePos = getElementPosition(node); 
+    var pxl = nodePos.xl;
+    var pyt = nodePos.yt;
+    var pxr = nodePos.xr;
+    var pyb = nodePos.yb;
 
-function htmlToExpeditee(node,depth) 
+    return htmlToExpediteeRec(node, pxl,pyt, pxl,pyt,pxr,pyb, 0);
+}
+
+
+function htmlToExpediteeRec(node,baseX,baseY, pxl,pyt,pxr,pyb, depth) 
 {
     depth = (depth) ? depth : 0;
 
     //var expSyntax = "";
-    var jsonNode = {};
+    var jsonNode = null;
 
     if (node.nodeType == 3) { /* text node */
@@ -99 +110 @@
         //expSyntax += "Text item: " + node.nodeValue + "\n";
 
+            jsonNode = {};
+
         jsonNode.type = "text";
         jsonNode.text = node.nodeValue;
+
+        jsonNode.x = pxl;
+        jsonNode.y = pyt;
+
     }
     }
@@ -108 +125 @@
         /* need to dig out: text size, l/r/justified, font-face, type, colour */
 
-        var elemName = node.Name;
-    if (elemName != "SCRIPT") {
+        var elemName = node.nodeName.toLowerCase();
 
-        
+    if (!elemName.match(/script/)) {
+   
         var nodePos = getElementPosition(node); 
         var xl = nodePos.xl;
@@ -129 +146 @@
 */
 
-        var rect = { "xl":xl, "yt":yt, "xr":xr, "yb":yb };
-
+            jsonNode = {};
         jsonNode.type = "rect";
             jsonNode.elem = node.nodeName;
+
+        var rect = { "xl":xl, "yt":yt, "xr":xr, "yb":yb };
         jsonNode.rect = rect;
     
@@ -139 +157 @@
         var cnode = node.firstChild; 
         while (cnode != null) {
-        //expSyntax += htmlToExpeditee(cnode,depth+1);  
 
-            var jsonChildNode = htmlToExpeditee(cnode,depth+1);
-        jsonChildNodes.push(jsonChildNode);  
+            var jsonChildNode 
+            = htmlToExpediteeRec(cnode,baseX,baseY,xl,yt,xr,yb,depth+1);
+
+            if (jsonChildNode != null) {
+            jsonChildNodes.push(jsonChildNode);  
+            }
         
         cnode = cnode.nextSibling;