Changeset 25057

Timestamp:

2012-02-08T15:55:59+13:00 (12 years ago)

Author:

davidb

Message:

Next round of improvements to cross-walking Greenstone web pages to Expeditee frames

Location:

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

Files:

• perllib/ExpediteeFrameIO.pm (modified) (6 diffs)
• src/js/html-to-expeditee.js (modified) (1 diff)

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

@@ -170 +170 @@
     $self->_setBaseDefaultAttributes($attr);
 
-    $attr->{'d'} = "0 0 0"; # black color
+    if(defined $attr->{'d'}){
+
+    }
+    else {
+    $attr->{'d'} = "0 0 0"; # black color
+    }
+
 }
 
@@ -179 +185 @@
     my ($attr) = @_;
 
+
     $self->setPointDefaultAttributes($attr);
 
-    $attr->{'d'} = "80 80 80"; # green color for rect lines
-    $attr->{'h'} = "1.0";     # line thickness
+    if((defined $attr->{'d'}) && (defined $attr->{'h'})){
+
+    }
+    else {
+        $attr->{'d'} = "80 80 80"; # grey color for rect lines
+        $attr->{'h'} = "1.0";     # line thickness
+    }
 }
 
@@ -210 +222 @@
 
     $self->setTextDefaultAttributes(\%attr_copy);
-
     my $items = $self->{'items'};
 
@@ -349 +360 @@
 
     foreach my $item (@$items) {
+
     my $type = delete $item->{'_type'};
-    my $id   = delete $item->{'_id'};
-
-    print FOUT "S $type $id\n";
-    foreach my $a (keys %$item) {
-        print FOUT "$a ", $item->{$a}, "\n";
-    }
+    my $id = delete $item->{'_id'};
+
+    if(defined($type) && defined($id)) {
+
+         print FOUT "S $type $id\n";
+
+         foreach my $a (keys %$item) {
+             print FOUT "$a ", $item->{$a}, "\n";
+         }
     
-    print FOUT "\n";
-    }
+             print FOUT "\n";
+
+      }
+
+     }
 
     print FOUT "Z\n\n";
@@ -486 +504 @@
     $x += 4;
 
+    my $data = $html_node->{'data'};
+    $attr->{'D'} = $data if defined $data;
+ 
     $self->addText($x,$y,$text,$w,$attr);
     }
@@ -510 +531 @@
     if (open(FNOUT,">$filename")) {
     binmode(FNOUT,":utf8");
+
+    #writes frameset name concatenated with last frame number in the set to the frame.inf file. 
+        my $getFramesetName = $self->{'output_dir'};
+    print FNOUT "$getFramesetName$last_frame_number\n";
+
     
-    print FNOUT "$last_frame_number\n";
-
     close(FNOUT);
     $status = 1;

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

@@ -130 +130 @@
         jsonNode.xr = pxr;
         jsonNode.yb = pyb;
+
+        var parent = node.parentNode;
+        if (parent != null) {
+        var data = parent.attributes["data"];
+
+                if (data != null) {
+          jsonNode.data = data.value;
+            }
+        }
 
     }