Changeset 677

Timestamp:

1999-10-15T12:36:14+13:00 (25 years ago)

Author:

sjboddie

Message:

changes for new browsing support

Location:

trunk/gsdl/perllib

Files:

• classify/AZList.pm (modified) (4 diffs)
• classify/AZSectionList.pm (modified) (1 diff)
• classify/DateList.pm (modified) (4 diffs)
• classify/Hierarchy.pm (modified) (5 diffs)
• classify/List.pm (modified) (1 diff)
• classify/SectionList.pm (modified) (1 diff)
• mgbuilder.pm (modified) (1 diff)
• mgbuildproc.pm (modified) (4 diffs)

trunk/gsdl/perllib/classify/AZList.pm

@@ -99 +99 @@
 sub get_entry {
     my $self = shift (@_);
-    my ($title, $classifytype) = @_;
+    my ($title, $childtype, $thistype) = @_;
     
     # organise into classification structure
-    my %classifyinfo = ('classifytype'=>$classifytype,
+    my %classifyinfo = ('childtype'=>$childtype,
             'Title'=>$title,
             'contains'=>[]);
+    $classifyinfo{'thistype'} = $thistype 
+    if defined $thistype && $thistype =~ /\w/;
 
     return \%classifyinfo;
@@ -117 +119 @@
 
     # top level
-    my $classifyinfo = $self->get_entry ($self->{'title'}, "AZList");
+    my $childtype = "HList";
+    if (scalar (@$classlistref) <= 20) {$childtype = "VList";}
+    my $classifyinfo = $self->get_entry ($self->{'metaname'}, $childtype, "Invisible");
 
     # don't need to do any splitting if there are less than 20 classifications
@@ -154 +158 @@
 
     foreach $subclass (@tmparr) {
-    my $tempclassify = $self->get_entry($subclass, "AZList");
+    my $tempclassify = $self->get_entry($subclass, "VList");
     foreach $subsubOID (@{$classhash->{$subclass}}) {
         push (@{$tempclassify->{'contains'}}, {'OID'=>$subsubOID});
@@ -204 +208 @@
         @currentOIDs = ();
         $currentfirstletter = "";
+        $lastkey = $subsection;
         } else {
         @currentOIDs = @{$classhashref->{$subsection}};

trunk/gsdl/perllib/classify/AZSectionList.pm

@@ -224 +224 @@
         @currentOIDs = ();
         $currentfirstletter = "";
+        $lastkey = $subsection;
         } else {
         @currentOIDs = @{$classhashref->{$subsection}};

trunk/gsdl/perllib/classify/DateList.pm

@@ -79 +79 @@
 sub get_entry {
     my $self = shift (@_);
-    my ($title, $classifytype) = @_;
+    my ($title, $childtype, $thistype) = @_;
     
     # organise into classification structure
-    my %classifyinfo = ('classifytype'=>$classifytype,
+    my %classifyinfo = ('childtype'=>$childtype,
             'Title'=>$title,
             'contains'=>[]);
+    $classifyinfo{'thistype'} = $thistype 
+    if defined $thistype && $thistype =~ /\w/;
 
     return \%classifyinfo;
@@ -97 +99 @@
 
     # top level
-    my $classifyinfo = $self->get_entry ("Date", "DateList");
+    my $childtype = "HList";
+    if (scalar (@$classlistref) <= 20) {$childtype = "DateList";}
+    my $classifyinfo = $self->get_entry ("Date", $childtype, "Invisible");
 
     # don't need to do any splitting if there are less than 20 classifications
@@ -164 +168 @@
         @currentOIDs = ();
         $currentfirstletter = "";
+        $lastkey = $subsection;
         } else {
         @currentOIDs = @{$classhashref->{$subsection}};
@@ -175 +180 @@
     # add final sub-classification
     if (scalar (@currentOIDs) < $min) {
-    my ($newkey) = $lastkey =~ /^(.)/;
+    my ($newkey) = $lastkey =~ /^(\d\d\d\d)/;
     @currentOIDs = (@{$compactedhash->{$lastkey}}, @currentOIDs);
     delete $compactedhash->{$lastkey};

trunk/gsdl/perllib/classify/Hierarchy.pm

@@ -151 +151 @@
 }
 
-
 sub get_classify_info {
     my $self = shift (@_);
@@ -157 +156 @@
     my $list = $self->{'locatorlist'};
 
-    my $classifyinfo = $self->get_entry ($self->{'title'}, "Hierarchy");
+    my $classifyinfo = $self->get_entry ($self->{'title'}, "VList", "Invisible");
     foreach $OID (keys (%$list)) {
-    my $tempinfo = $self->get_OID_entry ($OID, $classifyinfo, $list->{$OID}->{'title'}, "Hierarchy");
+    my $tempinfo = $self->get_OID_entry ($OID, $classifyinfo, $list->{$OID}->{'title'}, "VList");
 
     if (defined $self->{'sortname'}) {
@@ -175 +174 @@
 }
 
-
 sub get_OID_entry {
     my $self = shift (@_);
@@ -205 +203 @@
 sub get_entry {
     my $self = shift (@_);
-    my ($title, $classifytype) = @_;
+    my ($title, $childtype, $thistype) = @_;
     
     # organise into classification structure
-    my %classifyinfo = ('classifytype'=>$classifytype,
+    my %classifyinfo = ('childtype'=>$childtype,
             'Title'=>$title,
             'contains'=>[]);
+    $classifyinfo{'thistype'} = $thistype 
+    if defined $thistype && $thistype =~ /\w/;
 
     return \%classifyinfo;
@@ -216 +216 @@
 
 
-
 1;

trunk/gsdl/perllib/classify/List.pm

@@ -156 +156 @@
 
     # organise into classification structure
-    my %classifyinfo = ('classifytype'=>'List',
+    my %classifyinfo = ('thistype'=>'Invisible',
+            'childtype'=>'VList',
             'Title'=>$self->{'title'},
             'contains'=>[]);

trunk/gsdl/perllib/classify/SectionList.pm

@@ -172 +172 @@
 
     # organise into classification structure
-    my %classifyinfo = ('classifytype'=>'List',
+    my %classifyinfo = ('thistype'=>'Invisible',
+            'childtype'=>'VList',
             'Title'=>$self->{'title'},
             'contains'=>[]);

trunk/gsdl/perllib/mgbuilder.pm

@@ -123 +123 @@
     }
 
-    # set the classifytype to use for displaying documents - if the doctype field hasn't 
-    # been set in the collect.cfg then the receptionist currently defaults to displaying
-    # documents as 'Book'
-    if (open (COLCFG, $colcfgname)) {
-    while (defined ($line = &cfgread::read_cfg_line('mgbuilder::COLCFG'))) {
-        if (scalar(@$line) == 2) {
-        my $key = shift (@$line);
-        if ($key eq "doctype") {
-            $self->{'classifytype'} = shift (@$line);
-        }
-        }
-    }
-    close (COLCFG);
-    }
-
     # load up the document processor for building
     # if a buildproc class has been created for this collection, use it

trunk/gsdl/perllib/mgbuildproc.pm

@@ -132 +132 @@
 }
 
+# use 'Paged' if document has no more than 2 levels
+# and each section at second level has a number for
+# Title metadata
+sub get_document_type {
+    my $self = shift (@_);
+    my ($doc_obj) = @_;
+
+    my $thistype = "VList";
+    my $childtype = "VList";
+    my $title;
+    my @tmp = ();
+    
+    my $section = $doc_obj->get_top_section ();
+    my $first = 1;
+    while (defined $section) {
+    @tmp = split /\./, $section;
+    if (scalar(@tmp) > 1) {
+        return ($thistype, $childtype);
+    }
+    if (!$first) {
+        $title = $doc_obj->get_metadata_element ($section, "Title");
+        if (defined $title && $title !~ /^\d+$/) {
+        return ($thistype, $childtype);
+        }
+    }
+    $first = 0;
+    $section = $doc_obj->get_next_section($section);
+    }
+    if ($doc_obj->get_text_length ($doc_obj->get_top_section())) {
+    $thistype = "Paged";
+    } else {
+    $thistype = "Invisible";
+    }
+    $childtype = "Paged";
+    return ($thistype, $childtype);
+}
+
 sub infodb {
     my $self = shift (@_);
@@ -146 +183 @@
     $self->{'num_docs'} += 1 unless ($doctype eq "classification");
 
+    # is this a paged or a hierarchical document
+    my ($thistype, $childtype) = $self->get_document_type ($doc_obj);
+
     my $section = $doc_obj->get_top_section ();
     my $doc_OID = $doc_obj->get_OID();
+    my $first = 1;
     while (defined $section) {
     # update a few statistics
@@ -192 +233 @@
     }
 
+    # output document display type
+    if ($first) {
+        print $handle "<thistype>$thistype\n";
+    }
+
     # output a list of children
     my $children = $doc_obj->get_children ($section);
     if (scalar(@$children) > 0) {
+        print $handle "<childtype>$childtype\n";
         print $handle "<contains>";
         my $firstchild = 1;
@@ -224 +271 @@
     print $handle '-' x 70, "\n";
 
-
+    $first = 0;
     $section = $doc_obj->get_next_section($section);
     }