Changeset 8402

Timestamp:

2004-10-21T14:25:38+13:00 (20 years ago)

Author:

kjdon

Message:

fixed up the header page stuff with pagedimgplug - docs always have a toplevel section, with all tehimages underneath. if there is text in teh top section, then this becomes a header page, otherwise, this is an invisible page

Location:

trunk/gsdl/perllib

Files:

• mgbuildproc.pm (modified) (1 diff)
• mgppbuildproc.pm (modified) (1 diff)
• plugins/PagedImgPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/mgbuildproc.pm

@@ -216 +216 @@
     if (defined $gsdlthistype) {
     if ($gsdlthistype eq "Paged") {
-        $thistype = "Paged";
         $childtype = "Paged";
+        if ($doc_obj->get_text_length ($doc_obj->get_top_section())) {
+        $thistype = "Paged";
+        } else {
+        $thistype = "Invisible";
+        }
+        
         return ($thistype, $childtype);
     } elsif ($gsdlthistype eq "Hierarchy") {

trunk/gsdl/perllib/mgppbuildproc.pm

@@ -253 +253 @@
     if (defined $gsdlthistype) {
     if ($gsdlthistype eq "Paged") {
-        $thistype = "Paged";
         $childtype = "Paged";
+        if ($doc_obj->get_text_length ($doc_obj->get_top_section())) {
+        $thistype = "Paged";
+        } else {
+        $thistype = "Invisible";
+        }
+        
         return ($thistype, $childtype);
     } elsif ($gsdlthistype eq "Hierarchy") {

trunk/gsdl/perllib/plugins/PagedImgPlug.pm

@@ -573 +573 @@
     my $line = "";
     my $num = 0;
-    my $first = 1;
     while (defined ($line = <ITEMFILE>)) {
     next unless $line =~ /\w/;
@@ -588 +587 @@
         
         # create a new section for each image file
-        # the first image may go in the top section or in the first child section (if headerpage is true)
-        my $cursection;
-        if ($first) {
-        if ( $self->{'headerpage'}) {
-            $cursection = $doc_obj->insert_section($doc_obj->get_end_child($topsection));
-        } else {
-            $cursection = $topsection;
-        } 
-        $first=0;
-        } else {
-        $cursection = $doc_obj->insert_section($doc_obj->get_end_child($topsection));
-        }
+        my $cursection = $doc_obj->insert_section($doc_obj->get_end_child($topsection));
         # the page number becomes the Title
         $doc_obj->set_utf8_metadata_element($cursection, 'Title', $pagenum);
@@ -626 +614 @@
     close ITEMFILE;
 
+    # if we want a header page, we need to add some text into the top section, otherwise this section will become invisible
+    if ($self->{'headerpage'}) {
+    $doc_obj->add_text($topsection, &gsprintf::lookup_string("{BasPlug.dummy_text}"));
+    }
     $file =~ s/\.item//i;
     $doc_obj->set_OID ();