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

Timestamp:

2013-01-16T18:56:21+13:00 (11 years ago)

Author:

davidb

Message:

Can now correctly obtain colours and size of text when generating Expeditee frames. Also accounted for when the web browser being used is Firefox (FF uses "700" instead of the word "bold" for font-weight). The width of text items is also calculated and written to Expeditee. Parameters have also been provided so the user can decide whether they want the correct font information and text width used or to just use default values.

File:

• gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in (modified) (8 diffs)

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

@@ -62 +62 @@
 
         <input value="$site" name="site" id="site" type="hidden">
-        <input value="Go" id="go" 
-               class="ui-button ui-widget ui-state-default ui-corner-all" 
-               type="submit">
+        
+        <p>
+        <input type="checkbox" id="checkBoxBrowsing" name="generate_browsing" value="generate_browsing">Generate Browsing Frameset<br/>
+        </p>
+        
+        <p style="font-weight: bold;">Extra Expeditee Frame Output Options:</p>
+        <input type="checkbox" id="checkBoxFont" name="compute_font" value="compute_font">Compute Font<br/>
+        <input type="checkbox" id="checkBoxWidth" name="compute_width" value="compute_width">Compute Width<br/>
+        
+        <p><input value="Go" id="go" class="ui-button ui-widget ui-state-default ui-corner-all" type="submit"><p>
 
     </form>
@@ -70 +77 @@
       var docOIDs = [];
       var numDocOIDs;
-
+      var compute_font = false;
+      var compute_width = false;
+      var generate_browsing = false;    //whether to generate a matching browsing frameset
+      
       \$(function() {
       \$('#progress').progressbar();
@@ -89 +99 @@
               cl = "CL" + cl;
           }
-          
+          
+          compute_font = document.getElementById("checkBoxFont").checked;
+          compute_width = document.getElementById("checkBoxWidth").checked;
+          
+          generate_browsing = document.getElementById("checkBoxBrowsing").checked;
+          
           var gs2=$isGSDL2;
 
@@ -102 +117 @@
               url += "&excerptid=gs_content";
           }
+          
+          console.log("*** CHECKING URL: " + url);
 
           /* processing animation */
@@ -227 +244 @@
           if(frameNum === null){
             frameNum = iter;
-            console.log("no frameNum found, use iter: " + frameNum);
-          }else{
-            console.log("frameNum metadata found: " + frameNum);
           }
           
@@ -252 +266 @@
           }
 
-          var expFrameTree = htmlToExpeditee(gsContent);
+          var expFrameTree = htmlToExpeditee(gsContent,compute_font,compute_width);
 
           var expFrame = JSON.stringify(expFrameTree);
-          
-          console.log(expFrame);
-          
+          //console.log(expFrame);
           //alert(expFrame);
 
@@ -277 +289 @@
             params += "&assoc=" + assoc;
           }
+          
+          params += "&compute-font=" + compute_font;
 
           var clHtml = urlPostSync(url,params);
@@ -417 +431 @@
     my $collect = $gsdl_cgi->clean_param("collect");   
     my $cl = $gsdl_cgi->clean_param("cl"); 
-    
+        
     # Establish collect_dir using defining 'site' along the way if GS3